Mercurial > hg > release > icedtea6-1.12
changeset 3011:736ee5b3272b
Remove unused patches and those which need more testing in HEAD.
2013-07-10 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
Readd parts of patch removed without note in
an earlier backport and fix copyright headers to
apply (2011 instead of 2010).
2013-07-09 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/ecj/ant.patch,
* patches/openjdk/6990754-handle_renames.patch,
* patches/openjdk/6990754-use_native_memory_for_symboltable.patch,
* patches/openjdk/7008809-report_class_in_arraystoreexception.patch,
* patches/openjdk/7014851-unused_parallel_compaction_code.patch,
* patches/openjdk/7017732-move_static_fields_to_class.patch,
* patches/openjdk/7036747-elfstringtable.patch,
* patches/openjdk/7086585-flexible_field_injection.patch,
* patches/openjdk/7188114-alternate_command_line_parser.patch,
* patches/openjdk/7199143-OCSP_timeout.patch,
* patches/openjdk/8002070-remove_logger_stack_search.patch,
* patches/openjdk/8002070-remove_logger_stack_search_2.patch,
* patches/openjdk/8006120-server_jre.patch,
* patches/openjdk/8006536-remove_trailing_slashes.patch,
* patches/openjdk/8009463-space_and_final_backslash.patch,
* patches/openjdk/8010118-caller_sensitive.patch,
* patches/openjdk/8010213-set_socketoptions_windows.patch,
* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
* patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
* patches/openjdk/8011990-logger_test_urls.patch,
* patches/openjdk/8012243-serial_regression.patch,
* patches/openjdk/8013380-handle_renames.patch,
* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
* patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
* patches/openjdk/8014676-javadebugger_space_in_paths.patch,
* patches/openjdk/8014745-logger_stack_walk_switch.patch,
* patches/openjdk/8014968-OCSP_timeout_default.patch,
* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch,
* patches/security/20130618/8001330-checking_order_improvement-it6.patch,
* patches/security/20130618/hs_merge-01.patch,
* patches/security/20130618/hs_merge-02.patch,
* patches/security/20130618/hs_merge-03.patch,
* patches/security/20130618/hs_merge-04.patch,
* patches/sparc.patch:
Remove unused patches.
* Makefile.am:
(ICEDTEA_PATCHES): Remove patches which need more testing before
release.
* patches/ecj/override.patch: Drop recent addition. In accordance with
PR1397, we should avoid extending this patch in favour of either not
including @Override additions or setting source/target correctly.
* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
* patches/security/20130618/8001330-checking_order_improvement.patch:
Replace with Chris' patches, regenerated as unified diffs.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 10 Jul 2013 14:09:21 +0100 |
| parents | 079a280bf354 |
| children | 80e8d9771395 |
| files | ChangeLog Makefile.am patches/ecj/ant.patch patches/ecj/override.patch patches/openjdk/6990754-handle_renames.patch patches/openjdk/6990754-use_native_memory_for_symboltable.patch patches/openjdk/7008809-report_class_in_arraystoreexception.patch patches/openjdk/7014851-unused_parallel_compaction_code.patch patches/openjdk/7017732-move_static_fields_to_class.patch patches/openjdk/7036747-elfstringtable.patch patches/openjdk/7086585-flexible_field_injection.patch patches/openjdk/7188114-alternate_command_line_parser.patch patches/openjdk/7199143-OCSP_timeout.patch patches/openjdk/8002070-remove_logger_stack_search.patch patches/openjdk/8002070-remove_logger_stack_search_2.patch patches/openjdk/8006120-server_jre.patch patches/openjdk/8006536-remove_trailing_slashes.patch patches/openjdk/8009463-space_and_final_backslash.patch patches/openjdk/8010118-caller_sensitive.patch patches/openjdk/8010213-set_socketoptions_windows.patch patches/openjdk/8011139-revise_checking_getenclosingclass.patch patches/openjdk/8011154-awt_regression.patch patches/openjdk/8011154-awt_regresssion.patch patches/openjdk/8011313-OCSP_timeout_wrong_value.patch patches/openjdk/8011990-logger_test_urls.patch patches/openjdk/8012243-serial_regression.patch patches/openjdk/8013380-handle_renames.patch patches/openjdk/8013380-logger_stack_walk_glassfish.patch patches/openjdk/8014205-blank_swing_dialogs_windows.patch patches/openjdk/8014427-raster_regression.patch patches/openjdk/8014427-raster_regresssion.patch patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch patches/openjdk/8014676-javadebugger_space_in_paths.patch patches/openjdk/8014745-logger_stack_walk_switch.patch patches/openjdk/8014968-OCSP_timeout_default.patch patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch patches/security/20130618/7158805-nested_subroutine_rewriting.patch patches/security/20130618/8001330-checking_order_improvement-it6.patch patches/security/20130618/8001330-checking_order_improvement.patch patches/security/20130618/hs_merge-01.patch patches/security/20130618/hs_merge-02.patch patches/security/20130618/hs_merge-03.patch patches/security/20130618/hs_merge-04.patch patches/sparc.patch |
| diffstat | 44 files changed, 170 insertions(+), 37426 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 03 23:28:46 2013 -0400 +++ b/ChangeLog Wed Jul 10 14:09:21 2013 +0100 @@ -1,3 +1,58 @@ +2013-07-10 Andrew John Hughes <gnu.andrew@redhat.com> + + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Readd parts of patch removed without note in + an earlier backport and fix copyright headers to + apply (2011 instead of 2010). + +2013-07-09 Andrew John Hughes <gnu.andrew@redhat.com> + + * patches/ecj/ant.patch, + * patches/openjdk/6990754-handle_renames.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/7188114-alternate_command_line_parser.patch, + * patches/openjdk/7199143-OCSP_timeout.patch, + * patches/openjdk/8002070-remove_logger_stack_search.patch, + * patches/openjdk/8002070-remove_logger_stack_search_2.patch, + * patches/openjdk/8006120-server_jre.patch, + * patches/openjdk/8006536-remove_trailing_slashes.patch, + * patches/openjdk/8009463-space_and_final_backslash.patch, + * patches/openjdk/8010118-caller_sensitive.patch, + * patches/openjdk/8010213-set_socketoptions_windows.patch, + * patches/openjdk/8011139-revise_checking_getenclosingclass.patch, + * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch, + * patches/openjdk/8011990-logger_test_urls.patch, + * patches/openjdk/8012243-serial_regression.patch, + * patches/openjdk/8013380-handle_renames.patch, + * patches/openjdk/8013380-logger_stack_walk_glassfish.patch, + * patches/openjdk/8014205-blank_swing_dialogs_windows.patch, + * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch, + * patches/openjdk/8014676-javadebugger_space_in_paths.patch, + * patches/openjdk/8014745-logger_stack_walk_switch.patch, + * patches/openjdk/8014968-OCSP_timeout_default.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch, + * patches/security/20130618/8001330-checking_order_improvement-it6.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/sparc.patch: + Remove unused patches. + * Makefile.am: + (ICEDTEA_PATCHES): Remove patches which need more testing before + release. + * patches/ecj/override.patch: Drop recent addition. In accordance with + PR1397, we should avoid extending this patch in favour of either not + including @Override additions or setting source/target correctly. + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch: + Replace with Chris' patches, regenerated as unified diffs. + 2013-07-03 Omair Majid <omajid@redhat.com> * patches/openjdk/6541350-tz_display_names_l10n.patch, @@ -63,7 +118,9 @@ * NEWS: Update with backports. 2013-06-26 Chris Phillips <chrisphi@redhat.com> - * Makefile.am (SECURITY_PATCHES): Drop + + * Makefile.am: + (SECURITY_PATCHES): Drop patches/security/20130618/7158805-nested_subroutine_rewriting.patch patches/security/20130618/8001330-checking_order_improvement.patch patches/openjdk/7036747-elfstringtable.patch
--- a/Makefile.am Wed Jul 03 23:28:46 2013 -0400 +++ b/Makefile.am Wed Jul 10 14:09:21 2013 +0100 @@ -398,8 +398,8 @@ patches/security/20130618/diamond_fix.patch \ patches/security/20130618/handle_npe.patch \ patches/security/20130618/javac_issue.patch \ - patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \ - patches/security/20130618/8001330-checking_order_improvement-it6.patch \ + patches/security/20130618/7158805-nested_subroutine_rewriting.patch \ + patches/security/20130618/8001330-checking_order_improvement.patch \ patches/security/20130618/8000642-better_transportation_handling.patch \ patches/openjdk/6786028-wcag_bold_tags.patch \ patches/openjdk/6786682-wcag_lang.patch \ @@ -653,40 +653,20 @@ patches/object-factory-cl-internal.patch \ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ patches/openjdk/7171223-strict_aliasing.patch \ - patches/openjdk/7188114-alternate_command_line_parser.patch \ - patches/openjdk/7199143-OCSP_timeout.patch \ - patches/openjdk/8006120-server_jre.patch \ - patches/openjdk/8006536-remove_trailing_slashes.patch \ patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \ patches/openjdk/8009217-fix_test_compile.patch \ - patches/openjdk/8009463-space_and_final_backslash.patch \ patches/openjdk/8009610-blacklist_malware_certificate.patch \ - patches/openjdk/8010213-set_socketoptions_windows.patch \ patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \ - patches/openjdk/8011154-awt_regresssion.patch \ - patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \ + patches/openjdk/8011154-awt_regression.patch \ patches/openjdk/8011992-MlibOpsTest_failed.patch \ patches/openjdk/8012112-MlibOpsTest_fails.patch \ patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ patches/openjdk/8012933-appcontext_disposed_too_early.patch \ patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ - patches/openjdk/8014205-blank_swing_dialogs_windows.patch \ - patches/openjdk/8014427-raster_regresssion.patch \ - patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch \ - patches/openjdk/8014676-javadebugger_space_in_paths.patch \ - patches/openjdk/8014968-OCSP_timeout_default.patch \ - patches/openjdk/8002070-remove_logger_stack_search.patch \ - patches/openjdk/8002070-remove_logger_stack_search_2.patch \ - patches/openjdk/8010118-caller_sensitive.patch \ + patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8010727-empty_logger_name.patch \ patches/openjdk/8010939-logmanager_deadlock.patch \ - patches/openjdk/8011990-logger_test_urls.patch \ - patches/openjdk/8013380-logger_stack_walk_glassfish.patch \ - patches/openjdk/8013380-handle_renames.patch \ - patches/openjdk/8014745-logger_stack_walk_switch.patch \ - patches/openjdk/8012243-serial_regression.patch \ patches/openjdk/8014718-remove_logging_suntoolkit.patch \ - patches/openjdk/8011139-revise_checking_getenclosingclass.patch \ patches/openjdk/8009996-emitter_bean.patch \ patches/openjdk/6541350-tz_display_names_l10n.patch \ patches/openjdk/6821191-tz_display_names_l10n.patch \
--- a/patches/ecj/ant.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- iopenjdk/jaxws/make/Makefile 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500 -@@ -80,6 +80,7 @@ - endif - - ifdef ALT_BOOTDIR -+ ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH) - ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - endif - ---- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500 -@@ -109,6 +109,7 @@ - memoryMaximumSize="${javac.memoryMaximumSize}" - target="${javac.target}" - excludes="com/sun/tools/internal/txw2/**"> -+ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/> - <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> - <compilerarg line="${javac.version.opt}"/> - <compilerarg line="${javac.no.jdk.warnings}"/>
--- a/patches/ecj/override.patch Wed Jul 03 23:28:46 2013 -0400 +++ b/patches/ecj/override.patch Wed Jul 10 14:09:21 2013 +0100 @@ -300,17 +300,6 @@ public final void close() { open = false; synchronized (AbstractMidiDevice.this.traRecLock) { -diff -ruN openjdk-ecj.orig/jdk/src/share/classes/java/awt/image/BufferedImage.java openjdk-ecj/jdk/src/share/classes/java/awt/image/BufferedImage.java ---- openjdk-ecj.orig/jdk/src/share/classes/java/awt/image/BufferedImage.java 2013-07-01 13:03:32.946070591 -0400 -+++ openjdk-ecj/jdk/src/share/classes/java/awt/image/BufferedImage.java 2013-07-01 13:33:55.905426035 -0400 -@@ -810,7 +810,6 @@ - new PrivilegedAction<Boolean>() - { - -- @Override - public Boolean run() { - final ClassLoader std = System.class.getClassLoader(); - diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2011-01-07 21:33:03.000000000 +0000 +++ openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2012-06-13 17:39:06.625931390 +0100
--- a/patches/openjdk/6990754-handle_renames.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,925 +0,0 @@ -This handles the rename bits of the original 6990754 -diff -ruN openjdk.orig/hotspot/src/share/vm/oops/symbol.cpp openjdk/hotspot/src/share/vm/oops/symbol.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/symbol.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/hotspot/src/share/vm/oops/symbol.cpp 2013-06-25 14:49:37.268431428 -0400 -@@ -0,0 +1,231 @@ -+/* -+ * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ * -+ */ -+ -+ -+#include "precompiled.hpp" -+#include "oops/oop.inline.hpp" -+#include "oops/symbol.hpp" -+#include "runtime/os.hpp" -+#include "memory/allocation.inline.hpp" -+ -+Symbol::Symbol(const u1* name, int length) : _refcount(0), _length(length) { -+ _identity_hash = os::random(); -+ for (int i = 0; i < _length; i++) { -+ byte_at_put(i, name[i]); -+ } -+} -+ -+void* Symbol::operator new(size_t size, int len) { -+ return (void *) AllocateHeap(object_size(len) * HeapWordSize, "symbol"); -+} -+ -+// ------------------------------------------------------------------ -+// Symbol::equals -+// -+// Compares the symbol with a string of the given length. -+bool Symbol::equals(const char* str, int len) const { -+ int l = utf8_length(); -+ if (l != len) return false; -+ while (l-- > 0) { -+ if (str[l] != (char) byte_at(l)) -+ return false; -+ } -+ assert(l == -1, "we should be at the beginning"); -+ return true; -+} -+ -+ -+// ------------------------------------------------------------------ -+// Symbol::starts_with -+// -+// Tests if the symbol starts with the specified prefix of the given -+// length. -+bool Symbol::starts_with(const char* prefix, int len) const { -+ if (len > utf8_length()) return false; -+ while (len-- > 0) { -+ if (prefix[len] != (char) byte_at(len)) -+ return false; -+ } -+ assert(len == -1, "we should be at the beginning"); -+ return true; -+} -+ -+ -+// ------------------------------------------------------------------ -+// Symbol::index_of -+// -+// Finds if the given string is a substring of this symbol's utf8 bytes. -+// Return -1 on failure. Otherwise return the first index where str occurs. -+int Symbol::index_of_at(int i, const char* str, int len) const { -+ assert(i >= 0 && i <= utf8_length(), "oob"); -+ if (len <= 0) return 0; -+ char first_char = str[0]; -+ address bytes = (address) ((Symbol*)this)->base(); -+ address limit = bytes + utf8_length() - len; // inclusive limit -+ address scan = bytes + i; -+ if (scan > limit) -+ return -1; -+ for (;;) { -+ scan = (address) memchr(scan, first_char, (limit + 1 - scan)); -+ if (scan == NULL) -+ return -1; // not found -+ assert(scan >= bytes+i && scan <= limit, "scan oob"); -+ if (memcmp(scan, str, len) == 0) -+ return (int)(scan - bytes); -+ } -+} -+ -+ -+char* Symbol::as_C_string(char* buf, int size) const { -+ if (size > 0) { -+ int len = MIN2(size - 1, utf8_length()); -+ for (int i = 0; i < len; i++) { -+ buf[i] = byte_at(i); -+ } -+ buf[len] = '\0'; -+ } -+ return buf; -+} -+ -+char* Symbol::as_C_string() const { -+ int len = utf8_length(); -+ char* str = NEW_RESOURCE_ARRAY(char, len + 1); -+ return as_C_string(str, len + 1); -+} -+ -+char* Symbol::as_C_string_flexible_buffer(Thread* t, -+ char* buf, int size) const { -+ char* str; -+ int len = utf8_length(); -+ int buf_len = len + 1; -+ if (size < buf_len) { -+ str = NEW_RESOURCE_ARRAY(char, buf_len); -+ } else { -+ str = buf; -+ } -+ return as_C_string(str, buf_len); -+} -+ -+void Symbol::print_symbol_on(outputStream* st) const { -+ st = st ? st : tty; -+ int length = UTF8::unicode_length((const char*)bytes(), utf8_length()); -+ const char *ptr = (const char *)bytes(); -+ jchar value; -+ for (int index = 0; index < length; index++) { -+ ptr = UTF8::next(ptr, &value); -+ if (value >= 32 && value < 127 || value == '\'' || value == '\\') { -+ st->put(value); -+ } else { -+ st->print("\\u%04x", value); -+ } -+ } -+} -+ -+jchar* Symbol::as_unicode(int& length) const { -+ Symbol* this_ptr = (Symbol*)this; -+ length = UTF8::unicode_length((char*)this_ptr->bytes(), utf8_length()); -+ jchar* result = NEW_RESOURCE_ARRAY(jchar, length); -+ if (length > 0) { -+ UTF8::convert_to_unicode((char*)this_ptr->bytes(), result, length); -+ } -+ return result; -+} -+ -+const char* Symbol::as_klass_external_name(char* buf, int size) const { -+ if (size > 0) { -+ char* str = as_C_string(buf, size); -+ int length = (int)strlen(str); -+ // Turn all '/'s into '.'s (also for array klasses) -+ for (int index = 0; index < length; index++) { -+ if (str[index] == '/') { -+ str[index] = '.'; -+ } -+ } -+ return str; -+ } else { -+ return buf; -+ } -+} -+ -+const char* Symbol::as_klass_external_name() const { -+ char* str = as_C_string(); -+ int length = (int)strlen(str); -+ // Turn all '/'s into '.'s (also for array klasses) -+ for (int index = 0; index < length; index++) { -+ if (str[index] == '/') { -+ str[index] = '.'; -+ } -+ } -+ return str; -+} -+ -+ -+void Symbol::print_on(outputStream* st) const { -+ if (this == NULL) { -+ st->print_cr("NULL"); -+ } else { -+ st->print("Symbol: '"); -+ print_symbol_on(st); -+ st->print("'"); -+ st->print(" count %d", refcount()); -+ } -+} -+ -+// The print_value functions are present in all builds, to support the -+// disassembler and error reporting. -+void Symbol::print_value_on(outputStream* st) const { -+ if (this == NULL) { -+ st->print("NULL"); -+ } else { -+ st->print("'"); -+ for (int i = 0; i < utf8_length(); i++) { -+ st->print("%c", byte_at(i)); -+ } -+ st->print("'"); -+ } -+} -+ -+void Symbol::increment_refcount() { -+ // Only increment the refcount if positive. If negative either -+ // overflow has occurred or it is a permanent symbol in a read only -+ // shared archive. -+ if (_refcount >= 0) { -+ Atomic::inc(&_refcount); -+ NOT_PRODUCT(Atomic::inc(&_total_count);) -+ } -+} -+ -+void Symbol::decrement_refcount() { -+ if (_refcount >= 0) { -+ Atomic::dec(&_refcount); -+#ifdef ASSERT -+ if (_refcount < 0) { -+ print(); -+ assert(false, "reference count underflow for symbol"); -+ } -+#endif -+ } -+} -+ -+NOT_PRODUCT(int Symbol::_total_count = 0;) -diff -ruN openjdk.orig/hotspot/src/share/vm/oops/symbol.hpp openjdk/hotspot/src/share/vm/oops/symbol.hpp ---- openjdk.orig/hotspot/src/share/vm/oops/symbol.hpp 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/hotspot/src/share/vm/oops/symbol.hpp 2013-06-25 14:49:37.269431439 -0400 -@@ -0,0 +1,223 @@ -+/* -+ * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ * -+ */ -+ -+#ifndef SHARE_VM_OOPS_SYMBOL_HPP -+#define SHARE_VM_OOPS_SYMBOL_HPP -+ -+#include "utilities/utf8.hpp" -+#include "memory/allocation.hpp" -+ -+// A Symbol is a canonicalized string. -+// All Symbols reside in global SymbolTable and are reference counted. -+ -+// Reference counting -+// -+// All Symbols are allocated and added to the SymbolTable. -+// When a class is unloaded, the reference counts of the Symbol pointers in -+// the ConstantPool and in instanceKlass (see release_C_heap_structures) are -+// decremented. When the reference count for a Symbol goes to 0, the garbage -+// collector can free the Symbol and remove it from the SymbolTable. -+// -+// 0) Symbols need to be reference counted when a pointer to the Symbol is -+// saved in persistent storage. This does not include the pointer -+// in the SymbolTable bucket (the _literal field in HashtableEntry) -+// that points to the Symbol. All other stores of a Symbol* -+// to a field of a persistent variable (e.g., the _name filed in -+// FieldAccessInfo or _ptr in a CPSlot) is reference counted. -+// -+// 1) The lookup of a "name" in the SymbolTable either creates a Symbol F for -+// "name" and returns a pointer to F or finds a pre-existing Symbol F for -+// "name" and returns a pointer to it. In both cases the reference count for F -+// is incremented under the assumption that a pointer to F will be created from -+// the return value. Thus the increment of the reference count is on the lookup -+// and not on the assignment to the new Symbol*. That is -+// Symbol* G = lookup() -+// ^ increment on lookup() -+// and not -+// Symbol* G = lookup() -+// ^ increment on assignmnet -+// The reference count must be decremented manually when the copy of the -+// pointer G is destroyed. -+// -+// 2) For a local Symbol* A that is a copy of an existing Symbol* B, the -+// reference counting is elided when the scope of B is greater than the scope -+// of A. For example, in the code fragment -+// below "klass" is passed as a parameter to the method. Symbol* "kn" -+// is a copy of the name in "klass". -+// -+// Symbol* kn = klass->name(); -+// unsigned int d_hash = dictionary()->compute_hash(kn, class_loader); -+// -+// The scope of "klass" is greater than the scope of "kn" so the reference -+// counting for "kn" is elided. -+// -+// Symbol* copied from ConstantPool entries are good candidates for reference -+// counting elision. The ConstantPool entries for a class C exist until C is -+// unloaded. If a Symbol* is copied out of the ConstantPool into Symbol* X, -+// the Symbol* in the ConstantPool will in general out live X so the reference -+// counting on X can be elided. -+// -+// For cases where the scope of A is not greater than the scope of B, -+// the reference counting is explicitly done. See ciSymbol, -+// ResolutionErrorEntry and ClassVerifier for examples. -+// -+// 3) When a Symbol K is created for temporary use, generally for substrings of -+// an existing symbol or to create a new symbol, assign it to a -+// TempNewSymbol. The SymbolTable methods new_symbol(), lookup() -+// and probe() all potentially return a pointer to a new Symbol. -+// The allocation (or lookup) of K increments the reference count for K -+// and the destructor decrements the reference count. -+// -+// Another example of TempNewSymbol usage is parsed_name used in -+// ClassFileParser::parseClassFile() where parsed_name is used in the cleanup -+// after a failed attempt to load a class. Here parsed_name is a -+// TempNewSymbol (passed in as a parameter) so the reference count on its symbol -+// will be decremented when it goes out of scope. -+ -+class Symbol : public CHeapObj { -+ friend class VMStructs; -+ friend class SymbolTable; -+ friend class MoveSymbols; -+ private: -+ volatile int _refcount; -+ int _identity_hash; -+ unsigned short _length; // number of UTF8 characters in the symbol -+ jbyte _body[1]; -+ -+ enum { -+ // max_symbol_length is constrained by type of _length -+ max_symbol_length = (1 << 16) -1 -+ }; -+ -+ static int object_size(int length) { -+ size_t size = heap_word_size(sizeof(Symbol) + length); -+ return align_object_size(size); -+ } -+ -+ void byte_at_put(int index, int value) { -+ assert(index >=0 && index < _length, "symbol index overflow"); -+ _body[index] = value; -+ } -+ -+ Symbol(const u1* name, int length); -+ void* operator new(size_t size, int len); -+ -+ public: -+ // Low-level access (used with care, since not GC-safe) -+ const jbyte* base() const { return &_body[0]; } -+ -+ int object_size() { return object_size(utf8_length()); } -+ -+ // Returns the largest size symbol we can safely hold. -+ static int max_length() { -+ return max_symbol_length; -+ } -+ -+ int identity_hash() { -+ return _identity_hash; -+ } -+ -+ // Reference counting. See comments above this class for when to use. -+ int refcount() const { return _refcount; } -+ void increment_refcount(); -+ void decrement_refcount(); -+ -+ int byte_at(int index) const { -+ assert(index >=0 && index < _length, "symbol index overflow"); -+ return base()[index]; -+ } -+ -+ const jbyte* bytes() const { return base(); } -+ -+ int utf8_length() const { return _length; } -+ -+ // Compares the symbol with a string. -+ bool equals(const char* str, int len) const; -+ bool equals(const char* str) const { return equals(str, (int) strlen(str)); } -+ -+ // Tests if the symbol starts with the given prefix. -+ bool starts_with(const char* prefix, int len) const; -+ bool starts_with(const char* prefix) const { -+ return starts_with(prefix, (int) strlen(prefix)); -+ } -+ -+ // Tests if the symbol starts with the given prefix. -+ int index_of_at(int i, const char* str, int len) const; -+ int index_of_at(int i, const char* str) const { -+ return index_of_at(i, str, (int) strlen(str)); -+ } -+ -+ // Three-way compare for sorting; returns -1/0/1 if receiver is </==/> than arg -+ // note that the ordering is not alfabetical -+ inline int fast_compare(Symbol* other) const; -+ -+ // Returns receiver converted to null-terminated UTF-8 string; string is -+ // allocated in resource area, or in the char buffer provided by caller. -+ char* as_C_string() const; -+ char* as_C_string(char* buf, int size) const; -+ // Use buf if needed buffer length is <= size. -+ char* as_C_string_flexible_buffer(Thread* t, char* buf, int size) const; -+ -+ -+ // Returns a null terminated utf8 string in a resource array -+ char* as_utf8() const { return as_C_string(); } -+ char* as_utf8_flexible_buffer(Thread* t, char* buf, int size) const { -+ return as_C_string_flexible_buffer(t, buf, size); -+ } -+ -+ jchar* as_unicode(int& length) const; -+ -+ // Treating this symbol as a class name, returns the Java name for the class. -+ // String is allocated in resource area if buffer is not provided. -+ // See Klass::external_name() -+ const char* as_klass_external_name() const; -+ const char* as_klass_external_name(char* buf, int size) const; -+ -+ // Printing -+ void print_symbol_on(outputStream* st = NULL) const; -+ void print_on(outputStream* st) const; // First level print -+ void print_value_on(outputStream* st) const; // Second level print. -+ -+ // printing on default output stream -+ void print() { print_on(tty); } -+ void print_value() { print_value_on(tty); } -+ -+#ifndef PRODUCT -+ // Empty constructor to create a dummy symbol object on stack -+ // only for getting its vtable pointer. -+ Symbol() { } -+ -+ static int _total_count; -+#endif -+}; -+ -+// Note: this comparison is used for vtable sorting only; it doesn't matter -+// what order it defines, as long as it is a total, time-invariant order -+// Since Symbol*s are in C_HEAP, their relative order in memory never changes, -+// so use address comparison for speed -+int Symbol::fast_compare(Symbol* other) const { -+ return (((uintptr_t)this < (uintptr_t)other) ? -1 -+ : ((uintptr_t)this == (uintptr_t) other) ? 0 : 1); -+} -+#endif // SHARE_VM_OOPS_SYMBOL_HPP -diff -ruN openjdk.orig/hotspot/src/share/vm/oops/symbolOop.cpp openjdk/hotspot/src/share/vm/oops/symbolOop.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/symbolOop.cpp 2013-06-25 14:49:37.268431428 -0400 -+++ openjdk/hotspot/src/share/vm/oops/symbolOop.cpp 1969-12-31 19:00:00.000000000 -0500 -@@ -1,231 +0,0 @@ --/* -- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- * -- */ -- -- --#include "precompiled.hpp" --#include "oops/oop.inline.hpp" --#include "oops/symbol.hpp" --#include "runtime/os.hpp" --#include "memory/allocation.inline.hpp" -- --Symbol::Symbol(const u1* name, int length) : _refcount(0), _length(length) { -- _identity_hash = os::random(); -- for (int i = 0; i < _length; i++) { -- byte_at_put(i, name[i]); -- } --} -- --void* Symbol::operator new(size_t size, int len) { -- return (void *) AllocateHeap(object_size(len) * HeapWordSize, "symbol"); --} -- --// ------------------------------------------------------------------ --// Symbol::equals --// --// Compares the symbol with a string of the given length. --bool Symbol::equals(const char* str, int len) const { -- int l = utf8_length(); -- if (l != len) return false; -- while (l-- > 0) { -- if (str[l] != (char) byte_at(l)) -- return false; -- } -- assert(l == -1, "we should be at the beginning"); -- return true; --} -- -- --// ------------------------------------------------------------------ --// Symbol::starts_with --// --// Tests if the symbol starts with the specified prefix of the given --// length. --bool Symbol::starts_with(const char* prefix, int len) const { -- if (len > utf8_length()) return false; -- while (len-- > 0) { -- if (prefix[len] != (char) byte_at(len)) -- return false; -- } -- assert(len == -1, "we should be at the beginning"); -- return true; --} -- -- --// ------------------------------------------------------------------ --// Symbol::index_of --// --// Finds if the given string is a substring of this symbol's utf8 bytes. --// Return -1 on failure. Otherwise return the first index where str occurs. --int Symbol::index_of_at(int i, const char* str, int len) const { -- assert(i >= 0 && i <= utf8_length(), "oob"); -- if (len <= 0) return 0; -- char first_char = str[0]; -- address bytes = (address) ((Symbol*)this)->base(); -- address limit = bytes + utf8_length() - len; // inclusive limit -- address scan = bytes + i; -- if (scan > limit) -- return -1; -- for (;;) { -- scan = (address) memchr(scan, first_char, (limit + 1 - scan)); -- if (scan == NULL) -- return -1; // not found -- assert(scan >= bytes+i && scan <= limit, "scan oob"); -- if (memcmp(scan, str, len) == 0) -- return (int)(scan - bytes); -- } --} -- -- --char* Symbol::as_C_string(char* buf, int size) const { -- if (size > 0) { -- int len = MIN2(size - 1, utf8_length()); -- for (int i = 0; i < len; i++) { -- buf[i] = byte_at(i); -- } -- buf[len] = '\0'; -- } -- return buf; --} -- --char* Symbol::as_C_string() const { -- int len = utf8_length(); -- char* str = NEW_RESOURCE_ARRAY(char, len + 1); -- return as_C_string(str, len + 1); --} -- --char* Symbol::as_C_string_flexible_buffer(Thread* t, -- char* buf, int size) const { -- char* str; -- int len = utf8_length(); -- int buf_len = len + 1; -- if (size < buf_len) { -- str = NEW_RESOURCE_ARRAY(char, buf_len); -- } else { -- str = buf; -- } -- return as_C_string(str, buf_len); --} -- --void Symbol::print_symbol_on(outputStream* st) const { -- st = st ? st : tty; -- int length = UTF8::unicode_length((const char*)bytes(), utf8_length()); -- const char *ptr = (const char *)bytes(); -- jchar value; -- for (int index = 0; index < length; index++) { -- ptr = UTF8::next(ptr, &value); -- if (value >= 32 && value < 127 || value == '\'' || value == '\\') { -- st->put(value); -- } else { -- st->print("\\u%04x", value); -- } -- } --} -- --jchar* Symbol::as_unicode(int& length) const { -- Symbol* this_ptr = (Symbol*)this; -- length = UTF8::unicode_length((char*)this_ptr->bytes(), utf8_length()); -- jchar* result = NEW_RESOURCE_ARRAY(jchar, length); -- if (length > 0) { -- UTF8::convert_to_unicode((char*)this_ptr->bytes(), result, length); -- } -- return result; --} -- --const char* Symbol::as_klass_external_name(char* buf, int size) const { -- if (size > 0) { -- char* str = as_C_string(buf, size); -- int length = (int)strlen(str); -- // Turn all '/'s into '.'s (also for array klasses) -- for (int index = 0; index < length; index++) { -- if (str[index] == '/') { -- str[index] = '.'; -- } -- } -- return str; -- } else { -- return buf; -- } --} -- --const char* Symbol::as_klass_external_name() const { -- char* str = as_C_string(); -- int length = (int)strlen(str); -- // Turn all '/'s into '.'s (also for array klasses) -- for (int index = 0; index < length; index++) { -- if (str[index] == '/') { -- str[index] = '.'; -- } -- } -- return str; --} -- -- --void Symbol::print_on(outputStream* st) const { -- if (this == NULL) { -- st->print_cr("NULL"); -- } else { -- st->print("Symbol: '"); -- print_symbol_on(st); -- st->print("'"); -- st->print(" count %d", refcount()); -- } --} -- --// The print_value functions are present in all builds, to support the --// disassembler and error reporting. --void Symbol::print_value_on(outputStream* st) const { -- if (this == NULL) { -- st->print("NULL"); -- } else { -- st->print("'"); -- for (int i = 0; i < utf8_length(); i++) { -- st->print("%c", byte_at(i)); -- } -- st->print("'"); -- } --} -- --void Symbol::increment_refcount() { -- // Only increment the refcount if positive. If negative either -- // overflow has occurred or it is a permanent symbol in a read only -- // shared archive. -- if (_refcount >= 0) { -- Atomic::inc(&_refcount); -- NOT_PRODUCT(Atomic::inc(&_total_count);) -- } --} -- --void Symbol::decrement_refcount() { -- if (_refcount >= 0) { -- Atomic::dec(&_refcount); --#ifdef ASSERT -- if (_refcount < 0) { -- print(); -- assert(false, "reference count underflow for symbol"); -- } --#endif -- } --} -- --NOT_PRODUCT(int Symbol::_total_count = 0;) -diff -ruN openjdk.orig/hotspot/src/share/vm/oops/symbolOop.hpp openjdk/hotspot/src/share/vm/oops/symbolOop.hpp ---- openjdk.orig/hotspot/src/share/vm/oops/symbolOop.hpp 2013-06-25 14:49:37.269431439 -0400 -+++ openjdk/hotspot/src/share/vm/oops/symbolOop.hpp 1969-12-31 19:00:00.000000000 -0500 -@@ -1,223 +0,0 @@ --/* -- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- * -- */ -- --#ifndef SHARE_VM_OOPS_SYMBOL_HPP --#define SHARE_VM_OOPS_SYMBOL_HPP -- --#include "utilities/utf8.hpp" --#include "memory/allocation.hpp" -- --// A Symbol is a canonicalized string. --// All Symbols reside in global SymbolTable and are reference counted. -- --// Reference counting --// --// All Symbols are allocated and added to the SymbolTable. --// When a class is unloaded, the reference counts of the Symbol pointers in --// the ConstantPool and in instanceKlass (see release_C_heap_structures) are --// decremented. When the reference count for a Symbol goes to 0, the garbage --// collector can free the Symbol and remove it from the SymbolTable. --// --// 0) Symbols need to be reference counted when a pointer to the Symbol is --// saved in persistent storage. This does not include the pointer --// in the SymbolTable bucket (the _literal field in HashtableEntry) --// that points to the Symbol. All other stores of a Symbol* --// to a field of a persistent variable (e.g., the _name filed in --// FieldAccessInfo or _ptr in a CPSlot) is reference counted. --// --// 1) The lookup of a "name" in the SymbolTable either creates a Symbol F for --// "name" and returns a pointer to F or finds a pre-existing Symbol F for --// "name" and returns a pointer to it. In both cases the reference count for F --// is incremented under the assumption that a pointer to F will be created from --// the return value. Thus the increment of the reference count is on the lookup --// and not on the assignment to the new Symbol*. That is --// Symbol* G = lookup() --// ^ increment on lookup() --// and not --// Symbol* G = lookup() --// ^ increment on assignmnet --// The reference count must be decremented manually when the copy of the --// pointer G is destroyed. --// --// 2) For a local Symbol* A that is a copy of an existing Symbol* B, the --// reference counting is elided when the scope of B is greater than the scope --// of A. For example, in the code fragment --// below "klass" is passed as a parameter to the method. Symbol* "kn" --// is a copy of the name in "klass". --// --// Symbol* kn = klass->name(); --// unsigned int d_hash = dictionary()->compute_hash(kn, class_loader); --// --// The scope of "klass" is greater than the scope of "kn" so the reference --// counting for "kn" is elided. --// --// Symbol* copied from ConstantPool entries are good candidates for reference --// counting elision. The ConstantPool entries for a class C exist until C is --// unloaded. If a Symbol* is copied out of the ConstantPool into Symbol* X, --// the Symbol* in the ConstantPool will in general out live X so the reference --// counting on X can be elided. --// --// For cases where the scope of A is not greater than the scope of B, --// the reference counting is explicitly done. See ciSymbol, --// ResolutionErrorEntry and ClassVerifier for examples. --// --// 3) When a Symbol K is created for temporary use, generally for substrings of --// an existing symbol or to create a new symbol, assign it to a --// TempNewSymbol. The SymbolTable methods new_symbol(), lookup() --// and probe() all potentially return a pointer to a new Symbol. --// The allocation (or lookup) of K increments the reference count for K --// and the destructor decrements the reference count. --// --// Another example of TempNewSymbol usage is parsed_name used in --// ClassFileParser::parseClassFile() where parsed_name is used in the cleanup --// after a failed attempt to load a class. Here parsed_name is a --// TempNewSymbol (passed in as a parameter) so the reference count on its symbol --// will be decremented when it goes out of scope. -- --class Symbol : public CHeapObj { -- friend class VMStructs; -- friend class SymbolTable; -- friend class MoveSymbols; -- private: -- volatile int _refcount; -- int _identity_hash; -- unsigned short _length; // number of UTF8 characters in the symbol -- jbyte _body[1]; -- -- enum { -- // max_symbol_length is constrained by type of _length -- max_symbol_length = (1 << 16) -1 -- }; -- -- static int object_size(int length) { -- size_t size = heap_word_size(sizeof(Symbol) + length); -- return align_object_size(size); -- } -- -- void byte_at_put(int index, int value) { -- assert(index >=0 && index < _length, "symbol index overflow"); -- _body[index] = value; -- } -- -- Symbol(const u1* name, int length); -- void* operator new(size_t size, int len); -- -- public: -- // Low-level access (used with care, since not GC-safe) -- const jbyte* base() const { return &_body[0]; } -- -- int object_size() { return object_size(utf8_length()); } -- -- // Returns the largest size symbol we can safely hold. -- static int max_length() { -- return max_symbol_length; -- } -- -- int identity_hash() { -- return _identity_hash; -- } -- -- // Reference counting. See comments above this class for when to use. -- int refcount() const { return _refcount; } -- void increment_refcount(); -- void decrement_refcount(); -- -- int byte_at(int index) const { -- assert(index >=0 && index < _length, "symbol index overflow"); -- return base()[index]; -- } -- -- const jbyte* bytes() const { return base(); } -- -- int utf8_length() const { return _length; } -- -- // Compares the symbol with a string. -- bool equals(const char* str, int len) const; -- bool equals(const char* str) const { return equals(str, (int) strlen(str)); } -- -- // Tests if the symbol starts with the given prefix. -- bool starts_with(const char* prefix, int len) const; -- bool starts_with(const char* prefix) const { -- return starts_with(prefix, (int) strlen(prefix)); -- } -- -- // Tests if the symbol starts with the given prefix. -- int index_of_at(int i, const char* str, int len) const; -- int index_of_at(int i, const char* str) const { -- return index_of_at(i, str, (int) strlen(str)); -- } -- -- // Three-way compare for sorting; returns -1/0/1 if receiver is </==/> than arg -- // note that the ordering is not alfabetical -- inline int fast_compare(Symbol* other) const; -- -- // Returns receiver converted to null-terminated UTF-8 string; string is -- // allocated in resource area, or in the char buffer provided by caller. -- char* as_C_string() const; -- char* as_C_string(char* buf, int size) const; -- // Use buf if needed buffer length is <= size. -- char* as_C_string_flexible_buffer(Thread* t, char* buf, int size) const; -- -- -- // Returns a null terminated utf8 string in a resource array -- char* as_utf8() const { return as_C_string(); } -- char* as_utf8_flexible_buffer(Thread* t, char* buf, int size) const { -- return as_C_string_flexible_buffer(t, buf, size); -- } -- -- jchar* as_unicode(int& length) const; -- -- // Treating this symbol as a class name, returns the Java name for the class. -- // String is allocated in resource area if buffer is not provided. -- // See Klass::external_name() -- const char* as_klass_external_name() const; -- const char* as_klass_external_name(char* buf, int size) const; -- -- // Printing -- void print_symbol_on(outputStream* st = NULL) const; -- void print_on(outputStream* st) const; // First level print -- void print_value_on(outputStream* st) const; // Second level print. -- -- // printing on default output stream -- void print() { print_on(tty); } -- void print_value() { print_value_on(tty); } -- --#ifndef PRODUCT -- // Empty constructor to create a dummy symbol object on stack -- // only for getting its vtable pointer. -- Symbol() { } -- -- static int _total_count; --#endif --}; -- --// Note: this comparison is used for vtable sorting only; it doesn't matter --// what order it defines, as long as it is a total, time-invariant order --// Since Symbol*s are in C_HEAP, their relative order in memory never changes, --// so use address comparison for speed --int Symbol::fast_compare(Symbol* other) const { -- return (((uintptr_t)this < (uintptr_t)other) ? -1 -- : ((uintptr_t)this == (uintptr_t) other) ? 0 : 1); --} --#endif // SHARE_VM_OOPS_SYMBOL_HPP
--- a/patches/openjdk/6990754-use_native_memory_for_symboltable.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18949 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371745779 18000 -# Node ID afb96a923f7f2da64e711455257a024c100e8e2e -# Parent af33d9cd440e2851eaffb819d67f86b42c6a8030 -# PLEASE SEE the other 6990754 patch which handles renames more generally -6990754: Use native memory and reference counting to implement SymbolTable -Summary: move symbols from permgen into C heap and reference count them -Reviewed-by: never, acorn, jmasa, stefank - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java b/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java -@@ -428,6 +428,36 @@ - } - } - }, -+ new Command("symbol", "symbol address", false) { -+ public void doit(Tokens t) { -+ if (t.countTokens() != 1) { -+ usage(); -+ } else { -+ Address a = VM.getVM().getDebugger().parseAddress(t.nextToken()); -+ Symbol.create(a).printValueOn(out); -+ out.println(); -+ } -+ } -+ }, -+ new Command("symboltable", "symboltable name", false) { -+ public void doit(Tokens t) { -+ if (t.countTokens() != 1) { -+ usage(); -+ } else { -+ out.println(SymbolTable.getTheTable().probe(t.nextToken())); -+ } -+ } -+ }, -+ new Command("symboldump", "symboldump", false) { -+ public void doit(Tokens t) { -+ SymbolTable.getTheTable().symbolsDo(new SymbolTable.SymbolVisitor() { -+ public void visit(Symbol sym) { -+ sym.printValueOn(out); -+ out.println(); -+ } -+ }); -+ } -+ }, - new Command("flags", "flags [ flag ]", false) { - public void doit(Tokens t) { - int tokens = t.countTokens(); -@@ -629,17 +659,6 @@ - } - } - }, -- new Command("symbol", "symbol name", false) { -- public void doit(Tokens t) { -- if (t.countTokens() != 1) { -- usage(); -- } else { -- String symbol = t.nextToken(); -- Address a = lookup(symbol); -- out.println(symbol + " = " + a); -- } -- } -- }, - new Command("printstatics", "printstatics [ type ]", false) { - public void doit(Tokens t) { - if (t.countTokens() > 1) { -@@ -1262,6 +1281,9 @@ - this.err = err; - for (int i = 0; i < commandList.length; i++) { - Command c = commandList[i]; -+ if (commands.get(c.name) != null) { -+ throw new InternalError(c.name + " has multiple definitions"); -+ } - commands.put(c.name, c); - } - if (debugger.isAttached()) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java b/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java -@@ -89,6 +89,37 @@ - readVMLongConstants(); - } - -+ public Type lookupType(String cTypeName, boolean throwException) { -+ Type fieldType = super.lookupType(cTypeName, false); -+ if (fieldType == null && cTypeName.startsWith("const ")) { -+ fieldType = (BasicType)lookupType(cTypeName.substring(6), false); -+ } -+ if (fieldType == null && cTypeName.endsWith(" const")) { -+ fieldType = (BasicType)lookupType(cTypeName.substring(0, cTypeName.length() - 6), false); -+ } -+ if (fieldType == null) { -+ if (cTypeName.startsWith("GrowableArray<") && cTypeName.endsWith(">*")) { -+ String ttype = cTypeName.substring("GrowableArray<".length(), -+ cTypeName.length() - 2); -+ Type templateType = lookupType(ttype, false); -+ if (templateType == null && typeNameIsPointerType(ttype)) { -+ templateType = recursiveCreateBasicPointerType(ttype); -+ } -+ if (templateType == null) { -+ lookupOrFail(ttype); -+ } -+ fieldType = recursiveCreateBasicPointerType(cTypeName); -+ } -+ } -+ if (fieldType == null && typeNameIsPointerType(cTypeName)) { -+ fieldType = recursiveCreateBasicPointerType(cTypeName); -+ } -+ if (fieldType == null && throwException) { -+ super.lookupType(cTypeName, true); -+ } -+ return fieldType; -+ } -+ - private void readVMTypes() { - // Get the variables we need in order to traverse the VMTypeEntry[] - long typeEntryTypeNameOffset; -@@ -250,7 +281,7 @@ - BasicType containingType = lookupOrFail(typeName); - - // The field's Type must already be in the database -- no exceptions -- BasicType fieldType = lookupOrFail(typeString); -+ BasicType fieldType = (BasicType)lookupType(typeString); - - // Create field by type - createField(containingType, fieldName, fieldType, -@@ -442,10 +473,17 @@ - workarounds due to incomplete information in the VMStructs - database. */ - private BasicPointerType recursiveCreateBasicPointerType(String typeName) { -+ BasicPointerType result = (BasicPointerType)super.lookupType(typeName, false); -+ if (result != null) { -+ return result; -+ } - String targetTypeName = typeName.substring(0, typeName.lastIndexOf('*')).trim(); - Type targetType = null; - if (typeNameIsPointerType(targetTypeName)) { -- targetType = recursiveCreateBasicPointerType(targetTypeName); -+ targetType = lookupType(targetTypeName, false); -+ if (targetType == null) { -+ targetType = recursiveCreateBasicPointerType(targetTypeName); -+ } - } else { - targetType = lookupType(targetTypeName, false); - if (targetType == null) { -@@ -466,6 +504,20 @@ - BasicType basicTargetType = createBasicType(targetTypeName, false, true, true); - basicTargetType.setSize(1); - targetType = basicTargetType; -+ } else if (targetTypeName.startsWith("GrowableArray<")) { -+ BasicType basicTargetType = createBasicType(targetTypeName, false, false, false); -+ -+ // transfer fields from GenericGrowableArray to template instance -+ BasicType generic = lookupOrFail("GenericGrowableArray"); -+ basicTargetType.setSize(generic.getSize()); -+ Iterator fields = generic.getFields(); -+ while (fields.hasNext()) { -+ Field f = (Field)fields.next(); -+ basicTargetType.addField(internalCreateField(basicTargetType, f.getName(), -+ f.getType(), f.isStatic(), -+ f.getOffset(), null)); -+ } -+ targetType = basicTargetType; - } else { - if (DEBUG) { - System.err.println("WARNING: missing target type \"" + targetTypeName + "\" for pointer type \"" + typeName + "\""); -@@ -474,7 +526,10 @@ - } - } - } -- return new BasicPointerType(this, typeName, targetType); -+ result = new BasicPointerType(this, typeName, targetType); -+ result.setSize(UNINITIALIZED_SIZE); -+ addType(result); -+ return result; - } - - private boolean typeNameIsPointerType(String typeName) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java b/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java -@@ -112,7 +112,7 @@ - } - - // return Symbol (if unresolved) or Klass (if resolved) -- public Oop getKlass() { -+ public Object getKlass() { - if (Assert.ASSERTS_ENABLED) { - Assert.that(isKlassConstant(), "not a klass literal"); - } -@@ -121,11 +121,11 @@ - // decide based on the oop type. - ConstantPool cpool = method().getConstants(); - int cpIndex = index(); -- Oop oop = cpool.getObjAt(cpIndex); -- if (oop.isKlass()) { -- return (Klass) oop; -- } else if (oop.isSymbol()) { -- return (Symbol) oop; -+ ConstantPool.CPSlot oop = cpool.getSlotAt(cpIndex); -+ if (oop.isOop()) { -+ return (Klass) oop.getOop(); -+ } else if (oop.isMetaData()) { -+ return oop.getSymbol(); - } else { - throw new RuntimeException("should not reach here"); - } -@@ -165,12 +165,12 @@ - // tag change from 'unresolved' to 'string' does not happen atomically. - // We just look at the object at the corresponding index and - // decide based on the oop type. -- Oop obj = cpool.getObjAt(cpIndex); -- if (obj.isSymbol()) { -- Symbol sym = (Symbol) obj; -- return "<String \"" + sym.asString() + "\">"; -- } else if (obj.isInstance()) { -- return "<String \"" + OopUtilities.stringOopToString(obj) + "\">"; -+ ConstantPool.CPSlot obj = cpool.getSlotAt(cpIndex); -+ if (obj.isMetaData()) { -+ Symbol sym = obj.getSymbol(); -+ return "<String \"" + sym.asString() + "\">"; -+ } else if (obj.isOop()) { -+ return "<String \"" + OopUtilities.stringOopToString(obj.getOop()) + "\">"; - } else { - throw new RuntimeException("should not reach here"); - } -@@ -178,13 +178,13 @@ - // tag change from 'unresolved' to 'klass' does not happen atomically. - // We just look at the object at the corresponding index and - // decide based on the oop type. -- Oop obj = cpool.getObjAt(cpIndex); -- if (obj.isKlass()) { -- Klass k = (Klass) obj; -- return "<Class " + k.getName().asString() + "@" + k.getHandle() + ">"; -- } else if (obj.isSymbol()) { -- Symbol sym = (Symbol) obj; -- return "<Class " + sym.asString() + ">"; -+ ConstantPool.CPSlot obj = cpool.getSlotAt(cpIndex); -+ if (obj.isOop()) { -+ Klass k = (Klass) obj.getOop(); -+ return "<Class " + k.getName().asString() + "@" + k.getHandle() + ">"; -+ } else if (obj.isMetaData()) { -+ Symbol sym = obj.getSymbol(); -+ return "<Class " + sym.asString() + ">"; - } else { - throw new RuntimeException("should not reach here"); - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java b/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java -@@ -37,11 +37,11 @@ - } - - public Symbol getClassName() { -- Oop obj = method().getConstants().getObjAt(index()); -- if (obj instanceof Symbol) { -- return (Symbol)obj; -+ ConstantPool.CPSlot obj = method().getConstants().getSlotAt(index()); -+ if (obj.isMetaData()) { -+ return obj.getSymbol(); - } else { -- return ((Klass)obj).getName(); -+ return ((Klass)obj.getOop()).getName(); - } - } - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java b/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java -@@ -63,7 +63,7 @@ - } - - public Klass klass() { -- return (Klass) literal(); -+ return (Klass)VM.getVM().getObjectHeap().newOop(literalValue().addOffsetToAsOopHandle(0)); - } - - public DictionaryEntry(Address addr) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java b/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java -@@ -42,14 +42,14 @@ - - private static synchronized void initialize(TypeDataBase db) { - Type type = db.lookupType("LoaderConstraintEntry"); -- nameField = type.getOopField("_name"); -+ nameField = type.getAddressField("_name"); - numLoadersField = type.getCIntegerField("_num_loaders"); - maxLoadersField = type.getCIntegerField("_max_loaders"); - loadersField = type.getAddressField("_loaders"); - } - - // Fields -- private static sun.jvm.hotspot.types.OopField nameField; -+ private static AddressField nameField; - private static CIntegerField numLoadersField; - private static CIntegerField maxLoadersField; - private static AddressField loadersField; -@@ -57,7 +57,7 @@ - // Accessors - - public Symbol name() { -- return (Symbol) VM.getVM().getObjectHeap().newOop(nameField.getValue(addr)); -+ return Symbol.create(nameField.getValue(addr)); - } - - public int numLoaders() { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java b/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java -@@ -58,7 +58,7 @@ - } - - public Symbol klass() { -- return (Symbol) literal(); -+ return Symbol.create(literalValue()); - } - - /* covariant return type :-( -diff --git a/agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java b/agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java -@@ -70,11 +70,13 @@ - } - - public void stringsDo(StringVisitor visitor) { -+ ObjectHeap oh = VM.getVM().getObjectHeap(); - int numBuckets = tableSize(); - for (int i = 0; i < numBuckets; i++) { - for (HashtableEntry e = (HashtableEntry) bucket(i); e != null; - e = (HashtableEntry) e.next()) { -- visitor.visit((Instance) e.literal()); -+ Instance s = (Instance)oh.newOop(e.literalValue().addOffsetToAsOopHandle(0)); -+ visitor.visit(s); - } - } - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java b/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java -@@ -85,7 +85,7 @@ - long hashValue = hashSymbol(name); - for (HashtableEntry e = (HashtableEntry) bucket(hashToIndex(hashValue)); e != null; e = (HashtableEntry) e.next()) { - if (e.hash() == hashValue) { -- Symbol sym = (Symbol) e.literal(); -+ Symbol sym = Symbol.create(e.literalValue()); - if (sym.equals(name)) { - return sym; - } -@@ -103,7 +103,7 @@ - for (int i = 0; i < numBuckets; i++) { - for (HashtableEntry e = (HashtableEntry) bucket(i); e != null; - e = (HashtableEntry) e.next()) { -- visitor.visit((Symbol) e.literal()); -+ visitor.visit(Symbol.create(e.literalValue())); - } - } - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java -@@ -35,6 +35,38 @@ - // as described in the class file - - public class ConstantPool extends Oop implements ClassConstants { -+ -+ public class CPSlot { -+ private Address ptr; -+ -+ CPSlot(Address ptr) { -+ this.ptr = ptr; -+ } -+ CPSlot(Symbol sym) { -+ this.ptr = sym.getAddress().orWithMask(1); -+ } -+ -+ public boolean isOop() { -+ return (ptr.minus(null) & 1) == 0; -+ } -+ public boolean isMetaData() { -+ return (ptr.minus(null) & 1) == 1; -+ } -+ -+ public Symbol getSymbol() { -+ if (isMetaData()) { -+ return Symbol.create(ptr.xorWithMask(1)); -+ } -+ throw new InternalError("not a symbol"); -+ } -+ public Oop getOop() { -+ if (isOop()) { -+ return VM.getVM().getObjectHeap().newOop(ptr.addOffsetToAsOopHandle(0)); -+ } -+ throw new InternalError("not an oop"); -+ } -+ } -+ - // Used for debugging this code - private static final boolean DEBUG = false; - -@@ -110,12 +142,17 @@ - return new ConstantTag(getTags().getByteAt((int) index)); - } - -- public Oop getObjAt(long index){ -+ public CPSlot getSlotAt(long index) { -+ return new CPSlot(getHandle().getAddressAt(indexOffset(index))); -+ } -+ -+ public Oop getObjAtRaw(long index){ - return getHeap().newOop(getHandle().getOopHandleAt(indexOffset(index))); - } - - public Symbol getSymbolAt(long index) { -- return (Symbol) getObjAt(index); -+ CPSlot slot = getSlotAt(index); -+ return slot.getSymbol(); - } - - public int getIntAt(long index){ -@@ -187,7 +224,7 @@ - // returns null, if not resolved. - public Klass getKlassRefAt(int which) { - if( ! getTagAt(which).isKlass()) return null; -- return (Klass) getObjAt(which); -+ return (Klass) getObjAtRaw(which); - } - - // returns null, if not resolved. -@@ -477,7 +514,7 @@ - case JVM_CONSTANT_Class: { - dos.writeByte(cpConstType); - // Klass already resolved. ConstantPool constains klassOop. -- Klass refKls = (Klass) getObjAt(ci); -+ Klass refKls = (Klass) getObjAtRaw(ci); - String klassName = refKls.getName().asString(); - Short s = (Short) utf8ToIndex.get(klassName); - dos.writeShort(s.shortValue()); -@@ -498,7 +535,7 @@ - - case JVM_CONSTANT_String: { - dos.writeByte(cpConstType); -- String str = OopUtilities.stringOopToString(getObjAt(ci)); -+ String str = OopUtilities.stringOopToString(getObjAtRaw(ci)); - Short s = (Short) utf8ToIndex.get(str); - dos.writeShort(s.shortValue()); - if (DEBUG) debugMessage("CP[" + ci + "] = string " + s); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java b/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java -@@ -576,7 +576,7 @@ - ConstantPool cp = method().getConstants(); - int nameAndTypeIdx = cp.name_and_type_ref_index_at(idx); - int signatureIdx = cp.signature_ref_index_at(nameAndTypeIdx); -- symbolOop signature = cp.symbol_at(signatureIdx); -+ Symbol* signature = cp.symbol_at(signatureIdx); - tty.print("%s", signature.as_C_string()); - */ - } -@@ -616,7 +616,7 @@ - constantPoolOop cp = method().constants(); - int nameAndTypeIdx = cp.name_and_type_ref_index_at(idx); - int signatureIdx = cp.signature_ref_index_at(nameAndTypeIdx); -- symbolOop signature = cp.symbol_at(signatureIdx); -+ Symbol* signature = cp.symbol_at(signatureIdx); - tty.print("%s", signature.as_C_string()); - */ - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java -@@ -82,8 +82,8 @@ - classLoader = new OopField(type.getOopField("_class_loader"), Oop.getHeaderSize()); - protectionDomain = new OopField(type.getOopField("_protection_domain"), Oop.getHeaderSize()); - signers = new OopField(type.getOopField("_signers"), Oop.getHeaderSize()); -- sourceFileName = new OopField(type.getOopField("_source_file_name"), Oop.getHeaderSize()); -- sourceDebugExtension = new OopField(type.getOopField("_source_debug_extension"), Oop.getHeaderSize()); -+ sourceFileName = type.getAddressField("_source_file_name"); -+ sourceDebugExtension = type.getAddressField("_source_debug_extension"); - innerClasses = new OopField(type.getOopField("_inner_classes"), Oop.getHeaderSize()); - nonstaticFieldSize = new CIntField(type.getCIntegerField("_nonstatic_field_size"), Oop.getHeaderSize()); - staticFieldSize = new CIntField(type.getCIntegerField("_static_field_size"), Oop.getHeaderSize()); -@@ -94,7 +94,7 @@ - vtableLen = new CIntField(type.getCIntegerField("_vtable_len"), Oop.getHeaderSize()); - itableLen = new CIntField(type.getCIntegerField("_itable_len"), Oop.getHeaderSize()); - breakpoints = type.getAddressField("_breakpoints"); -- genericSignature = new OopField(type.getOopField("_generic_signature"), Oop.getHeaderSize()); -+ genericSignature = type.getAddressField("_generic_signature"); - majorVersion = new CIntField(type.getCIntegerField("_major_version"), Oop.getHeaderSize()); - minorVersion = new CIntField(type.getCIntegerField("_minor_version"), Oop.getHeaderSize()); - headerSize = alignObjectOffset(Oop.getHeaderSize() + type.getSize()); -@@ -135,8 +135,8 @@ - private static OopField classLoader; - private static OopField protectionDomain; - private static OopField signers; -- private static OopField sourceFileName; -- private static OopField sourceDebugExtension; -+ private static AddressField sourceFileName; -+ private static AddressField sourceDebugExtension; - private static OopField innerClasses; - private static CIntField nonstaticFieldSize; - private static CIntField staticFieldSize; -@@ -147,7 +147,7 @@ - private static CIntField vtableLen; - private static CIntField itableLen; - private static AddressField breakpoints; -- private static OopField genericSignature; -+ private static AddressField genericSignature; - private static CIntField majorVersion; - private static CIntField minorVersion; - -@@ -257,8 +257,8 @@ - public Oop getClassLoader() { return classLoader.getValue(this); } - public Oop getProtectionDomain() { return protectionDomain.getValue(this); } - public ObjArray getSigners() { return (ObjArray) signers.getValue(this); } -- public Symbol getSourceFileName() { return (Symbol) sourceFileName.getValue(this); } -- public Symbol getSourceDebugExtension(){ return (Symbol) sourceDebugExtension.getValue(this); } -+ public Symbol getSourceFileName() { return getSymbol(sourceFileName); } -+ public Symbol getSourceDebugExtension(){ return getSymbol(sourceDebugExtension); } - public TypeArray getInnerClasses() { return (TypeArray) innerClasses.getValue(this); } - public long getNonstaticFieldSize() { return nonstaticFieldSize.getValue(this); } - public long getStaticOopFieldCount() { return staticOopFieldCount.getValue(this); } -@@ -266,7 +266,7 @@ - public boolean getIsMarkedDependent() { return isMarkedDependent.getValue(this) != 0; } - public long getVtableLen() { return vtableLen.getValue(this); } - public long getItableLen() { return itableLen.getValue(this); } -- public Symbol getGenericSignature() { return (Symbol) genericSignature.getValue(this); } -+ public Symbol getGenericSignature() { return getSymbol(genericSignature); } - public long majorVersion() { return majorVersion.getValue(this); } - public long minorVersion() { return minorVersion.getValue(this); } - -@@ -307,12 +307,12 @@ - if (ioff != 0) { - // only look at classes that are already loaded - // since we are looking for the flags for our self. -- Oop classInfo = getConstants().getObjAt(ioff); -+ ConstantPool.CPSlot classInfo = getConstants().getSlotAt(ioff); - Symbol name = null; -- if (classInfo instanceof Klass) { -- name = ((Klass) classInfo).getName(); -- } else if (classInfo instanceof Symbol) { -- name = (Symbol) classInfo; -+ if (classInfo.isOop()) { -+ name = ((Klass) classInfo.getOop()).getName(); -+ } else if (classInfo.isMetaData()) { -+ name = classInfo.getSymbol(); - } else { - throw new RuntimeException("should not reach here"); - } -@@ -357,12 +357,12 @@ - // 'ioff' can be zero. - // refer to JVM spec. section 4.7.5. - if (ioff != 0) { -- Oop iclassInfo = getConstants().getObjAt(ioff); -+ ConstantPool.CPSlot iclassInfo = getConstants().getSlotAt(ioff); - Symbol innerName = null; -- if (iclassInfo instanceof Klass) { -- innerName = ((Klass) iclassInfo).getName(); -- } else if (iclassInfo instanceof Symbol) { -- innerName = (Symbol) iclassInfo; -+ if (iclassInfo.isOop()) { -+ innerName = ((Klass) iclassInfo.getOop()).getName(); -+ } else if (iclassInfo.isMetaData()) { -+ innerName = iclassInfo.getSymbol(); - } else { - throw new RuntimeException("should not reach here"); - } -@@ -386,12 +386,12 @@ - } - } - } else { -- Oop oclassInfo = getConstants().getObjAt(ooff); -+ ConstantPool.CPSlot oclassInfo = getConstants().getSlotAt(ooff); - Symbol outerName = null; -- if (oclassInfo instanceof Klass) { -- outerName = ((Klass) oclassInfo).getName(); -- } else if (oclassInfo instanceof Symbol) { -- outerName = (Symbol) oclassInfo; -+ if (oclassInfo.isOop()) { -+ outerName = ((Klass) oclassInfo.getOop()).getName(); -+ } else if (oclassInfo.isMetaData()) { -+ outerName = oclassInfo.getSymbol(); - } else { - throw new RuntimeException("should not reach here"); - } -@@ -449,7 +449,6 @@ - visitor.doOop(classLoader, true); - visitor.doOop(protectionDomain, true); - visitor.doOop(signers, true); -- visitor.doOop(sourceFileName, true); - visitor.doOop(innerClasses, true); - visitor.doCInt(nonstaticFieldSize, true); - visitor.doCInt(staticFieldSize, true); -@@ -466,7 +465,7 @@ - for (int index = 0; index < length; index += NEXT_OFFSET) { - short accessFlags = fields.getShortAt(index + ACCESS_FLAGS_OFFSET); - short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET); -- FieldType type = new FieldType((Symbol) getConstants().getObjAt(signatureIndex)); -+ FieldType type = new FieldType(getConstants().getSymbolAt(signatureIndex)); - AccessFlags access = new AccessFlags(accessFlags); - if (access.isStatic()) { - visitField(visitor, type, index); -@@ -489,7 +488,7 @@ - short accessFlags = fields.getShortAt(index + ACCESS_FLAGS_OFFSET); - short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET); - -- FieldType type = new FieldType((Symbol) getConstants().getObjAt(signatureIndex)); -+ FieldType type = new FieldType(getConstants().getSymbolAt(signatureIndex)); - AccessFlags access = new AccessFlags(accessFlags); - if (!access.isStatic()) { - visitField(visitor, type, index); -@@ -786,7 +785,7 @@ - private Field newField(int index) { - TypeArray fields = getFields(); - short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET); -- FieldType type = new FieldType((Symbol) getConstants().getObjAt(signatureIndex)); -+ FieldType type = new FieldType(getConstants().getSymbolAt(signatureIndex)); - if (type.isOop()) { - if (VM.getVM().isCompressedOopsEnabled()) { - return new NarrowOopField(this, index); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java b/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java -@@ -53,7 +53,7 @@ - javaMirror = new OopField(type.getOopField("_java_mirror"), Oop.getHeaderSize()); - superField = new OopField(type.getOopField("_super"), Oop.getHeaderSize()); - layoutHelper = new IntField(type.getJIntField("_layout_helper"), Oop.getHeaderSize()); -- name = new OopField(type.getOopField("_name"), Oop.getHeaderSize()); -+ name = type.getAddressField("_name"); - accessFlags = new CIntField(type.getCIntegerField("_access_flags"), Oop.getHeaderSize()); - subklass = new OopField(type.getOopField("_subklass"), Oop.getHeaderSize()); - nextSibling = new OopField(type.getOopField("_next_sibling"), Oop.getHeaderSize()); -@@ -83,18 +83,26 @@ - private static OopField javaMirror; - private static OopField superField; - private static IntField layoutHelper; -- private static OopField name; -+ private static AddressField name; - private static CIntField accessFlags; - private static OopField subklass; - private static OopField nextSibling; - private static CIntField allocCount; - -+ private Address getValue(AddressField field) { -+ return getHandle().getAddressAt(field.getOffset() + Oop.getHeaderSize()); -+ } -+ -+ protected Symbol getSymbol(AddressField field) { -+ return Symbol.create(getHandle().getAddressAt(field.getOffset() + Oop.getHeaderSize())); -+ } -+ - // Accessors for declared fields - public Instance getJavaMirror() { return (Instance) javaMirror.getValue(this); } - public Klass getSuper() { return (Klass) superField.getValue(this); } - public Klass getJavaSuper() { return null; } - public int getLayoutHelper() { return (int) layoutHelper.getValue(this); } -- public Symbol getName() { return (Symbol) name.getValue(this); } -+ public Symbol getName() { return getSymbol(name); } - public long getAccessFlags() { return accessFlags.getValue(this); } - // Convenience routine - public AccessFlags getAccessFlagsObj(){ return new AccessFlags(getAccessFlags()); } -@@ -162,7 +170,7 @@ - visitor.doOop(javaMirror, true); - visitor.doOop(superField, true); - visitor.doInt(layoutHelper, true); -- visitor.doOop(name, true); -+ // visitor.doOop(name, true); - visitor.doCInt(accessFlags, true); - visitor.doOop(subklass, true); - visitor.doOop(nextSibling, true); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java b/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java -@@ -196,11 +196,11 @@ - public Address getFromCompiledCodeEntryPoint() { return fromCompiledCodeEntryPointField.getValue(this); } - */ - // Accessors -- public Symbol getName() { return (Symbol) getConstants().getObjAt(getNameIndex()); } -- public Symbol getSignature() { return (Symbol) getConstants().getObjAt(getSignatureIndex()); } -+ public Symbol getName() { return getConstants().getSymbolAt(getNameIndex()); } -+ public Symbol getSignature() { return getConstants().getSymbolAt(getSignatureIndex()); } - public Symbol getGenericSignature() { - long index = getGenericSignatureIndex(); -- return (index != 0L) ? (Symbol) getConstants().getObjAt(index) : null; -+ return (index != 0L) ? getConstants().getSymbolAt(index) : null; - } - - // Method holder (the Klass holding this method) -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java b/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java -@@ -47,7 +47,6 @@ - DEBUG = System.getProperty("sun.jvm.hotspot.oops.ObjectHeap.DEBUG") != null; - } - -- private OopHandle symbolKlassHandle; - private OopHandle methodKlassHandle; - private OopHandle constMethodKlassHandle; - private OopHandle methodDataKlassHandle; -@@ -68,7 +67,6 @@ - private OopHandle arrayKlassKlassHandle; - private OopHandle compiledICHolderKlassHandle; - -- private SymbolKlass symbolKlassObj; - private MethodKlass methodKlassObj; - private ConstMethodKlass constMethodKlassObj; - private MethodDataKlass methodDataKlassObj; -@@ -93,9 +91,6 @@ - // Lookup the roots in the object hierarchy. - Type universeType = db.lookupType("Universe"); - -- symbolKlassHandle = universeType.getOopField("_symbolKlassObj").getValue(); -- symbolKlassObj = new SymbolKlass(symbolKlassHandle, this); -- - methodKlassHandle = universeType.getOopField("_methodKlassObj").getValue(); - methodKlassObj = new MethodKlass(methodKlassHandle, this); - -@@ -199,7 +194,6 @@ - public long getDoubleSize() { return doubleSize; } - - // Accessors for well-known system classes (from Universe) -- public SymbolKlass getSymbolKlassObj() { return symbolKlassObj; } - public MethodKlass getMethodKlassObj() { return methodKlassObj; } - public ConstMethodKlass getConstMethodKlassObj() { return constMethodKlassObj; } - public MethodDataKlass getMethodDataKlassObj() { return methodDataKlassObj; } -@@ -337,7 +331,6 @@ - // First check if handle is one of the root objects - if (handle.equals(methodKlassHandle)) return getMethodKlassObj(); - if (handle.equals(constMethodKlassHandle)) return getConstMethodKlassObj(); -- if (handle.equals(symbolKlassHandle)) return getSymbolKlassObj(); - if (handle.equals(constantPoolKlassHandle)) return getConstantPoolKlassObj(); - if (handle.equals(constantPoolCacheKlassHandle)) return getConstantPoolCacheKlassObj(); - if (handle.equals(instanceKlassKlassHandle)) return getInstanceKlassKlassObj(); -@@ -363,7 +356,6 @@ - if (klass != null) { - if (klass.equals(methodKlassHandle)) return new Method(handle, this); - if (klass.equals(constMethodKlassHandle)) return new ConstMethod(handle, this); -- if (klass.equals(symbolKlassHandle)) return new Symbol(handle, this); - if (klass.equals(constantPoolKlassHandle)) return new ConstantPool(handle, this); - if (klass.equals(constantPoolCacheKlassHandle)) return new ConstantPoolCache(handle, this); - if (!VM.getVM().isCore()) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java b/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java -@@ -34,7 +34,7 @@ - // A Symbol is a canonicalized string. - // All Symbols reside in global symbolTable. - --public class Symbol extends Oop { -+public class Symbol extends VMObject { - static { - VM.registerVMInitializedObserver(new Observer() { - public void update(Observable o, Object data) { -@@ -44,9 +44,10 @@ - } - - private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { -- Type type = db.lookupType("symbolOopDesc"); -- length = new CIntField(type.getCIntegerField("_length"), 0); -+ Type type = db.lookupType("Symbol"); -+ length = type.getCIntegerField("_length"); - baseOffset = type.getField("_body").getOffset(); -+ idHash = type.getCIntegerField("_identity_hash"); - } - - // Format: -@@ -55,8 +56,15 @@ - // [length] byte size of uft8 string - // ..body.. - -- Symbol(OopHandle handle, ObjectHeap heap) { -- super(handle, heap); -+ public static Symbol create(Address addr) { -+ if (addr == null) { -+ return null; -+ } -+ return new Symbol(addr); -+ } -+ -+ Symbol(Address addr) { -+ super(addr); - } - - public boolean isSymbol() { return true; } -@@ -64,15 +72,19 @@ - private static long baseOffset; // tells where the array part starts - - // Fields -- private static CIntField length; -+ private static CIntegerField length; - - // Accessors for declared fields -- public long getLength() { return length.getValue(this); } -+ public long getLength() { return length.getValue(this.addr); } - - public byte getByteAt(long index) { -- return getHandle().getJByteAt(baseOffset + index); -+ return addr.getJByteAt(baseOffset + index); - } - -+ private static CIntegerField idHash; -+ -+ public int identityHash() { return (int)idHash.getValue(this.addr); } -+ - public boolean equals(byte[] modUTF8Chars) { - int l = (int) getLength(); - if (l != modUTF8Chars.length) return false; -@@ -98,7 +110,9 @@ - // Decode the byte array and return the string. - try { - return readModifiedUTF8(asByteArray()); -- } catch(IOException e) { -+ } catch(Exception e) { -+ System.err.println(addr); -+ e.printStackTrace(); - return null; - } - } -@@ -111,28 +125,13 @@ - tty.print("#" + asString()); - } - -- public long getObjectSize() { -- return alignObjectSize(baseOffset + getLength()); -- } -- -- void iterateFields(OopVisitor visitor, boolean doVMFields) { -- super.iterateFields(visitor, doVMFields); -- if (doVMFields) { -- visitor.doCInt(length, true); -- int length = (int) getLength(); -- for (int index = 0; index < length; index++) { -- visitor.doByte(new ByteField(new IndexableFieldIdentifier(index), baseOffset + index, false), true); -- } -- } -- } -- - /** Note: this comparison is used for vtable sorting only; it - doesn't matter what order it defines, as long as it is a total, -- time-invariant order Since symbolOops are in permSpace, their -+ time-invariant order Since Symbol* are in C_HEAP, their - relative order in memory never changes, so use address - comparison for speed. */ - public int fastCompare(Symbol other) { -- return (int) getHandle().minus(other.getHandle()); -+ return (int) addr.minus(other.addr); - } - - private static String readModifiedUTF8(byte[] buf) throws IOException { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java b/agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java -deleted file mode 100644 ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java -+++ /dev/null -@@ -1,60 +0,0 @@ --/* -- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- * -- */ -- --package sun.jvm.hotspot.oops; -- --import java.io.*; --import java.util.*; --import sun.jvm.hotspot.debugger.*; --import sun.jvm.hotspot.runtime.*; --import sun.jvm.hotspot.types.*; -- --// A SymbolKlass is the klass for all Symbols -- --public class SymbolKlass extends Klass { -- static { -- VM.registerVMInitializedObserver(new Observer() { -- public void update(Observable o, Object data) { -- initialize(VM.getVM().getTypeDataBase()); -- } -- }); -- } -- -- private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { -- Type type = db.lookupType("symbolKlass"); -- headerSize = type.getSize() + Oop.getHeaderSize(); -- } -- -- SymbolKlass(OopHandle handle, ObjectHeap heap) { -- super(handle, heap); -- } -- -- private static long headerSize; -- -- public long getObjectSize() { return alignObjectSize(headerSize); } -- -- public void printValueOn(PrintStream tty) { -- tty.print("SymbolKlass"); -- } --} -diff --git a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java -@@ -229,7 +229,7 @@ - case JVM_CONSTANT_Class: { - dos.writeByte(cpConstType); - // Klass already resolved. ConstantPool constains klassOop. -- Klass refKls = (Klass) cpool.getObjAt(ci); -+ Klass refKls = (Klass) cpool.getObjAtRaw(ci); - String klassName = refKls.getName().asString(); - - Short s = (Short) utf8ToIndex.get(klassName); -@@ -255,7 +255,7 @@ - - case JVM_CONSTANT_String: { - dos.writeByte(cpConstType); -- String str = OopUtilities.stringOopToString(cpool.getObjAt(ci)); -+ String str = OopUtilities.stringOopToString(cpool.getObjAtRaw(ci)); - Short s = (Short) utf8ToIndex.get(str); - dos.writeShort(s.shortValue()); - if (DEBUG) debugMessage("CP[" + ci + "] = string " + s); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/types/Field.java b/agent/src/share/classes/sun/jvm/hotspot/types/Field.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/Field.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/Field.java -@@ -56,7 +56,7 @@ - </PRE> - - FIXME: among other things, this interface is not sufficient to -- describe fields which are themselves arrays (like symbolOop's -+ describe fields which are themselves arrays (like Symbol's - jbyte _body[1]). */ - public interface Field { - /** Get the name of this field */ -diff --git a/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java b/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java -@@ -530,7 +530,7 @@ - - case JVM_CONSTANT_Class: - buf.cell("JVM_CONSTANT_Class"); -- Klass klass = (Klass) cpool.getObjAt(index); -+ Klass klass = (Klass) cpool.getObjAtRaw(index); - if (klass instanceof InstanceKlass) { - buf.cell(genKlassLink((InstanceKlass) klass)); - } else { -@@ -555,7 +555,7 @@ - case JVM_CONSTANT_String: - buf.cell("JVM_CONSTANT_String"); - buf.cell("\"" + -- escapeHTMLSpecialChars(OopUtilities.stringOopToString(cpool.getObjAt(index))) + "\""); -+ escapeHTMLSpecialChars(OopUtilities.stringOopToString(cpool.getObjAtRaw(index))) + "\""); - break; - - case JVM_CONSTANT_Fieldref: -@@ -672,11 +672,11 @@ - buf.beginTag("ul"); - for (int exp = 0; exp < exceptions.length; exp++) { - short cpIndex = (short) exceptions[exp].getClassCPIndex(); -- Oop obj = cpool.getObjAt(cpIndex); -- if (obj instanceof Symbol) { -- buf.li(((Symbol)obj).asString().replace('/', '.')); -+ ConstantPool.CPSlot obj = cpool.getSlotAt(cpIndex); -+ if (obj.isMetaData()) { -+ buf.li((obj.getSymbol()).asString().replace('/', '.')); - } else { -- buf.li(genKlassLink((InstanceKlass)obj)); -+ buf.li(genKlassLink((InstanceKlass)obj.getOop())); - } - } - buf.endTag("ul"); -@@ -756,7 +756,7 @@ - } else if (instr instanceof BytecodeLoadConstant) { - BytecodeLoadConstant ldc = (BytecodeLoadConstant) instr; - if (ldc.isKlassConstant()) { -- Oop oop = ldc.getKlass(); -+ Object oop = ldc.getKlass(); - if (oop instanceof Klass) { - buf.append("<a href='"); - buf.append(genKlassHref((InstanceKlass) oop)); -@@ -803,13 +803,13 @@ - buf.cell(Integer.toString(exceptionTable.getIntAt(e + 1))); - buf.cell(Integer.toString(exceptionTable.getIntAt(e + 2))); - short cpIndex = (short) exceptionTable.getIntAt(e + 3); -- Oop obj = cpIndex == 0? null : cpool.getObjAt(cpIndex); -+ ConstantPool.CPSlot obj = cpIndex == 0? null : cpool.getSlotAt(cpIndex); - if (obj == null) { - buf.cell("Any"); -- } else if (obj instanceof Symbol) { -- buf.cell(((Symbol)obj).asString().replace('/', '.')); -+ } else if (obj.isMetaData()) { -+ buf.cell(obj.getSymbol().asString().replace('/', '.')); - } else { -- buf.cell(genKlassLink((InstanceKlass)obj)); -+ buf.cell(genKlassLink((InstanceKlass)obj.getOop())); - } - buf.endTag("tr"); - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java b/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java -@@ -40,7 +40,7 @@ - - private static synchronized void initialize(TypeDataBase db) { - // just to confirm that type exists -- Type type = db.lookupType("Hashtable"); -+ Type type = db.lookupType("Hashtable<intptr_t>"); - } - - // derived class may return Class<? extends HashtableEntry> -diff --git a/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java b/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java -@@ -41,16 +41,16 @@ - } - - private static synchronized void initialize(TypeDataBase db) { -- Type type = db.lookupType("HashtableEntry"); -- literalField = type.getOopField("_literal"); -+ Type type = db.lookupType("HashtableEntry<intptr_t>"); -+ literalField = type.getAddressField("_literal"); - } - - // Fields -- private static OopField literalField; -+ private static AddressField literalField; - - // Accessors -- public Oop literal() { -- return VM.getVM().getObjectHeap().newOop(literalField.getValue(addr)); -+ public Address literalValue() { -+ return literalField.getValue(addr); - } - - public HashtableEntry(Address addr) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java b/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java -@@ -740,7 +740,7 @@ - for (Iterator itr = fields.iterator(); itr.hasNext();) { - Field field = (Field) itr.next(); - Symbol name = symTbl.probe(field.getID().getName()); -- writeObjectID(name); -+ writeSymbolID(name); - char typeCode = (char) field.getSignature().getByteAt(0); - int kind = signatureToHprofKind(typeCode); - out.writeByte((byte)kind); -@@ -852,7 +852,7 @@ - private void writeSymbol(Symbol sym) throws IOException { - byte[] buf = sym.asString().getBytes("UTF-8"); - writeHeader(HPROF_UTF8, buf.length + OBJ_ID_SIZE); -- writeObjectID(sym); -+ writeSymbolID(sym); - out.write(buf); - } - -@@ -869,7 +869,7 @@ - out.writeInt(serialNum); - writeObjectID(clazz); - out.writeInt(DUMMY_STACK_TRACE_ID); -- writeObjectID(k.getName()); -+ writeSymbolID(k.getName()); - serialNum++; - } catch (IOException exp) { - throw new RuntimeException(exp); -@@ -901,6 +901,10 @@ - writeObjectID(address); - } - -+ private void writeSymbolID(Symbol sym) throws IOException { -+ writeObjectID(getAddressValue(sym.getAddress())); -+ } -+ - private void writeObjectID(long address) throws IOException { - if (OBJ_ID_SIZE == 4) { - out.writeInt((int) address); -diff --git a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp ---- openjdk/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp -+++ openjdk/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp -@@ -2541,7 +2541,7 @@ - in_sig_bt[i++] = bt; // Collect remaining bits of signature - out_sig_bt[total_c_args++] = bt; - if( bt == T_OBJECT) { -- symbolOop s = ss.as_symbol_or_null(); -+ Symbol* s = ss.as_symbol_or_null(); - if (s == vmSymbols::java_lang_String()) { - total_strings++; - out_sig_bt[total_c_args-1] = T_ADDRESS; -diff --git a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp ---- openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp -+++ openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp -@@ -1974,7 +1974,7 @@ - in_sig_bt[i++] = bt; // Collect remaining bits of signature - out_sig_bt[total_c_args++] = bt; - if( bt == T_OBJECT) { -- symbolOop s = ss.as_symbol_or_null(); -+ Symbol* s = ss.as_symbol_or_null(); // symbol is created - if (s == vmSymbols::java_lang_String()) { - total_strings++; - out_sig_bt[total_c_args-1] = T_ADDRESS; -diff --git a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp ---- openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp -+++ openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp -@@ -1980,7 +1980,7 @@ - in_sig_bt[i++] = bt; // Collect remaining bits of signature - out_sig_bt[total_c_args++] = bt; - if( bt == T_OBJECT) { -- symbolOop s = ss.as_symbol_or_null(); -+ Symbol* s = ss.as_symbol_or_null(); // symbol is created - if (s == vmSymbols::java_lang_String()) { - total_strings++; - out_sig_bt[total_c_args-1] = T_ADDRESS; -diff --git a/src/os/solaris/dtrace/generateJvmOffsets.cpp b/src/os/solaris/dtrace/generateJvmOffsets.cpp ---- openjdk/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp -+++ openjdk/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp -@@ -49,7 +49,7 @@ - #include "oops/klass.hpp" - #include "oops/methodOop.hpp" - #include "oops/oop.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/virtualspace.hpp" - #include "runtime/vmStructs.hpp" - #include "utilities/accessFlags.hpp" -@@ -215,8 +215,8 @@ - GEN_VALUE(AccessFlags_NATIVE, JVM_ACC_NATIVE); - GEN_VALUE(constMethodOopDesc_has_linenumber_table, constMethodOopDesc::_has_linenumber_table); - GEN_OFFS(AccessFlags, _flags); -- GEN_OFFS(symbolOopDesc, _length); -- GEN_OFFS(symbolOopDesc, _body); -+ GEN_OFFS(Symbol, _length); -+ GEN_OFFS(Symbol, _body); - printf("\n"); - - GEN_OFFS(methodOopDesc, _constMethod); -diff --git a/src/os/solaris/dtrace/jhelper.d b/src/os/solaris/dtrace/jhelper.d ---- openjdk/hotspot/src/os/solaris/dtrace/jhelper.d -+++ openjdk/hotspot/src/os/solaris/dtrace/jhelper.d -@@ -114,8 +114,8 @@ - copyin_offset(OFFSET_HeapBlockHeader_used); - copyin_offset(OFFSET_oopDesc_metadata); - -- copyin_offset(OFFSET_symbolOopDesc_length); -- copyin_offset(OFFSET_symbolOopDesc_body); -+ copyin_offset(OFFSET_Symbol_length); -+ copyin_offset(OFFSET_Symbol_body); - - copyin_offset(OFFSET_methodOopDesc_constMethod); - copyin_offset(OFFSET_methodOopDesc_constants); -@@ -366,13 +366,13 @@ - this->nameIndex * sizeof (pointer) + SIZE_constantPoolOopDesc); - - this->nameSymbolLength = copyin_uint16(this->nameSymbol + -- OFFSET_symbolOopDesc_length); -+ OFFSET_Symbol_length); - - this->signatureSymbol = copyin_ptr(this->constantPool + - this->signatureIndex * sizeof (pointer) + SIZE_constantPoolOopDesc); - - this->signatureSymbolLength = copyin_uint16(this->signatureSymbol + -- OFFSET_symbolOopDesc_length); -+ OFFSET_Symbol_length); - - this->klassPtr = copyin_ptr(this->constantPool + - OFFSET_constantPoolOopDesc_pool_holder); -@@ -381,7 +381,7 @@ - OFFSET_Klass_name + SIZE_oopDesc); - - this->klassSymbolLength = copyin_uint16(this->klassSymbol + -- OFFSET_symbolOopDesc_length); -+ OFFSET_Symbol_length); - - /* - * Enough for three strings, plus the '.', plus the trailing '\0'. -@@ -390,7 +390,7 @@ - this->nameSymbolLength + - this->signatureSymbolLength + 2 + 1); - -- copyinto(this->klassSymbol + OFFSET_symbolOopDesc_body, -+ copyinto(this->klassSymbol + OFFSET_Symbol_body, - this->klassSymbolLength, this->result); - - /* -@@ -398,11 +398,11 @@ - */ - this->result[this->klassSymbolLength] = '.'; - -- copyinto(this->nameSymbol + OFFSET_symbolOopDesc_body, -+ copyinto(this->nameSymbol + OFFSET_Symbol_body, - this->nameSymbolLength, - this->result + this->klassSymbolLength + 1); - -- copyinto(this->signatureSymbol + OFFSET_symbolOopDesc_body, -+ copyinto(this->signatureSymbol + OFFSET_Symbol_body, - this->signatureSymbolLength, - this->result + this->klassSymbolLength + - this->nameSymbolLength + 1); -diff --git a/src/os/solaris/dtrace/libjvm_db.c b/src/os/solaris/dtrace/libjvm_db.c ---- openjdk/hotspot/src/os/solaris/dtrace/libjvm_db.c -+++ openjdk/hotspot/src/os/solaris/dtrace/libjvm_db.c -@@ -524,10 +524,10 @@ - CHECK_FAIL(err); - err = read_pointer(J, constantPool + nameIndex * POINTER_SIZE + SIZE_constantPoolOopDesc, &nameSymbol); - CHECK_FAIL(err); -- err = ps_pread(J->P, nameSymbol + OFFSET_symbolOopDesc_length, &nameSymbolLength, 2); -+ err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_length, &nameSymbolLength, 2); - CHECK_FAIL(err); - nameString = (char*)calloc(nameSymbolLength + 1, 1); -- err = ps_pread(J->P, nameSymbol + OFFSET_symbolOopDesc_body, nameString, nameSymbolLength); -+ err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_body, nameString, nameSymbolLength); - CHECK_FAIL(err); - - /* To get signature string */ -@@ -535,10 +535,10 @@ - CHECK_FAIL(err); - err = read_pointer(J, constantPool + signatureIndex * POINTER_SIZE + SIZE_constantPoolOopDesc, &signatureSymbol); - CHECK_FAIL(err); -- err = ps_pread(J->P, signatureSymbol + OFFSET_symbolOopDesc_length, &signatureSymbolLength, 2); -+ err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_length, &signatureSymbolLength, 2); - CHECK_FAIL(err); - signatureString = (char*)calloc(signatureSymbolLength + 1, 1); -- err = ps_pread(J->P, signatureSymbol + OFFSET_symbolOopDesc_body, signatureString, signatureSymbolLength); -+ err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_body, signatureString, signatureSymbolLength); - CHECK_FAIL(err); - - /* To get klass string */ -@@ -546,10 +546,10 @@ - CHECK_FAIL(err); - err = read_pointer(J, klassPtr + OFFSET_Klass_name + SIZE_oopDesc, &klassSymbol); - CHECK_FAIL(err); -- err = ps_pread(J->P, klassSymbol + OFFSET_symbolOopDesc_length, &klassSymbolLength, 2); -+ err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_length, &klassSymbolLength, 2); - CHECK_FAIL(err); - klassString = (char*)calloc(klassSymbolLength + 1, 1); -- err = ps_pread(J->P, klassSymbol + OFFSET_symbolOopDesc_body, klassString, klassSymbolLength); -+ err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_body, klassString, klassSymbolLength); - CHECK_FAIL(err); - - result[0] = '\0'; -diff --git a/src/os/solaris/vm/dtraceJSDT_solaris.cpp b/src/os/solaris/vm/dtraceJSDT_solaris.cpp ---- openjdk/hotspot/src/os/solaris/vm/dtraceJSDT_solaris.cpp -+++ openjdk/hotspot/src/os/solaris/vm/dtraceJSDT_solaris.cpp -@@ -142,7 +142,7 @@ - ++strcount; - for(int prbc = 0; prbc < provider->probe_count; ++prbc) { - JVM_DTraceProbe* p = &(provider->probes[prbc]); -- symbolOop sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); -+ Symbol* sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); - // function + name + one per argument - strcount += 2 + ArgumentCount(sig).size(); - } -@@ -178,7 +178,7 @@ - stroffs[curstr++] = string_index; - string_index += strlen(name) + 1; - -- symbolOop sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); -+ Symbol* sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); - SignatureStream ss(sig); - for ( ; !ss.at_return_type(); ss.next()) { - BasicType bt = ss.type(); -@@ -227,7 +227,7 @@ - uint32_t argscount = 0; - for(int prbc = 0; prbc < provider->probe_count; ++prbc) { - JVM_DTraceProbe* p = &(provider->probes[prbc]); -- symbolOop sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); -+ Symbol* sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); - argscount += ArgumentCount(sig).size(); - } - secoffs[argoffs_sec] = align_size_up(offset, alignment_for[ARG_OFFSETS]); -@@ -298,7 +298,7 @@ - strcpy(str, name); - str += strlen(name) + 1; - -- symbolOop sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); -+ Symbol* sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); - SignatureStream ss(sig); - for ( ; !ss.at_return_type(); ss.next()) { - BasicType bt = ss.type(); -@@ -433,7 +433,7 @@ - uint8_t* par = (uint8_t*)(dof + sec->dofs_offset); - for (int prbc = 0; prbc < provider->probe_count; ++prbc) { - JVM_DTraceProbe* p = &(provider->probes[prbc]); -- symbolOop sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); -+ Symbol* sig = JNIHandles::resolve_jmethod_id(p->method)->signature(); - uint8_t count = (uint8_t)ArgumentCount(sig).size(); - for (uint8_t i = 0; i < count; ++i) { - *par++ = i; -diff --git a/src/share/vm/ci/ciClassList.hpp b/src/share/vm/ci/ciClassList.hpp ---- openjdk/hotspot/src/share/vm/ci/ciClassList.hpp -+++ openjdk/hotspot/src/share/vm/ci/ciClassList.hpp -@@ -60,7 +60,6 @@ - class ciKlass; - class ciInstanceKlass; - class ciMethodKlass; --class ciSymbolKlass; - class ciArrayKlass; - class ciObjArrayKlass; - class ciTypeArrayKlass; -@@ -112,7 +111,6 @@ - friend class ciKlass; \ - friend class ciInstanceKlass; \ - friend class ciMethodKlass; \ --friend class ciSymbolKlass; \ - friend class ciArrayKlass; \ - friend class ciObjArrayKlass; \ - friend class ciTypeArrayKlass; \ -diff --git a/src/share/vm/ci/ciEnv.cpp b/src/share/vm/ci/ciEnv.cpp ---- openjdk/hotspot/src/share/vm/ci/ciEnv.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciEnv.cpp -@@ -68,7 +68,6 @@ - - ciObject* ciEnv::_null_object_instance; - ciMethodKlass* ciEnv::_method_klass_instance; --ciSymbolKlass* ciEnv::_symbol_klass_instance; - ciKlassKlass* ciEnv::_klass_klass_instance; - ciInstanceKlassKlass* ciEnv::_instance_klass_klass_instance; - ciTypeArrayKlassKlass* ciEnv::_type_array_klass_klass_instance; -@@ -202,6 +201,7 @@ - - ciEnv::~ciEnv() { - CompilerThread* current_thread = CompilerThread::current(); -+ _factory->remove_symbols(); - current_thread->set_env(NULL); - } - -@@ -234,7 +234,7 @@ - - // ------------------------------------------------------------------ - // helper for lazy exception creation --ciInstance* ciEnv::get_or_create_exception(jobject& handle, symbolHandle name) { -+ciInstance* ciEnv::get_or_create_exception(jobject& handle, Symbol* name) { - VM_ENTRY_MARK; - if (handle == NULL) { - // Cf. universe.cpp, creation of Universe::_null_ptr_exception_instance. -@@ -261,7 +261,7 @@ - if (_ArrayIndexOutOfBoundsException_instance == NULL) { - _ArrayIndexOutOfBoundsException_instance - = get_or_create_exception(_ArrayIndexOutOfBoundsException_handle, -- vmSymbolHandles::java_lang_ArrayIndexOutOfBoundsException()); -+ vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); - } - return _ArrayIndexOutOfBoundsException_instance; - } -@@ -269,7 +269,7 @@ - if (_ArrayStoreException_instance == NULL) { - _ArrayStoreException_instance - = get_or_create_exception(_ArrayStoreException_handle, -- vmSymbolHandles::java_lang_ArrayStoreException()); -+ vmSymbols::java_lang_ArrayStoreException()); - } - return _ArrayStoreException_instance; - } -@@ -277,7 +277,7 @@ - if (_ClassCastException_instance == NULL) { - _ClassCastException_instance - = get_or_create_exception(_ClassCastException_handle, -- vmSymbolHandles::java_lang_ClassCastException()); -+ vmSymbols::java_lang_ClassCastException()); - } - return _ClassCastException_instance; - } -@@ -377,14 +377,16 @@ - EXCEPTION_CONTEXT; - - // Now we need to check the SystemDictionary -- symbolHandle sym(THREAD, name->get_symbolOop()); -+ Symbol* sym = name->get_symbol(); - if (sym->byte_at(0) == 'L' && - sym->byte_at(sym->utf8_length()-1) == ';') { - // This is a name from a signature. Strip off the trimmings. -- sym = oopFactory::new_symbol_handle(sym->as_utf8()+1, -- sym->utf8_length()-2, -- KILL_COMPILE_ON_FATAL_(_unloaded_ciinstance_klass)); -- name = get_object(sym())->as_symbol(); -+ // Call recursive to keep scope of strippedsym. -+ TempNewSymbol strippedsym = SymbolTable::new_symbol(sym->as_utf8()+1, -+ sym->utf8_length()-2, -+ KILL_COMPILE_ON_FATAL_(_unloaded_ciinstance_klass)); -+ ciSymbol* strippedname = get_symbol(strippedsym); -+ return get_klass_by_name_impl(accessing_klass, strippedname, require_local); - } - - // Check for prior unloaded klass. The SystemDictionary's answers -@@ -430,13 +432,14 @@ - (sym->byte_at(1) == '[' || sym->byte_at(1) == 'L')) { - // We have an unloaded array. - // Build it on the fly if the element class exists. -- symbolOop elem_sym = oopFactory::new_symbol(sym->as_utf8()+1, -- sym->utf8_length()-1, -- KILL_COMPILE_ON_FATAL_(fail_type)); -+ TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1, -+ sym->utf8_length()-1, -+ KILL_COMPILE_ON_FATAL_(fail_type)); -+ - // Get element ciKlass recursively. - ciKlass* elem_klass = - get_klass_by_name_impl(accessing_klass, -- get_object(elem_sym)->as_symbol(), -+ get_symbol(elem_sym), - require_local); - if (elem_klass != NULL && elem_klass->is_loaded()) { - // Now make an array for it -@@ -475,7 +478,7 @@ - ciInstanceKlass* accessor) { - EXCEPTION_CONTEXT; - KlassHandle klass (THREAD, constantPoolOopDesc::klass_at_if_loaded(cpool, index)); -- symbolHandle klass_name; -+ Symbol* klass_name = NULL; - if (klass.is_null()) { - // The klass has not been inserted into the constant pool. - // Try to look it up by name. -@@ -490,10 +493,10 @@ - // very recently. - klass = KlassHandle(THREAD, cpool->resolved_klass_at(index)); - } else if (tag.is_symbol()) { -- klass_name = symbolHandle(THREAD, cpool->symbol_at(index)); -+ klass_name = cpool->symbol_at(index); - } else { - assert(cpool->tag_at(index).is_unresolved_klass(), "wrong tag"); -- klass_name = symbolHandle(THREAD, cpool->unresolved_klass_at(index)); -+ klass_name = cpool->unresolved_klass_at(index); - } - } - } -@@ -501,7 +504,7 @@ - if (klass.is_null()) { - // Not found in constant pool. Use the name to do the lookup. - ciKlass* k = get_klass_by_name_impl(accessor, -- get_object(klass_name())->as_symbol(), -+ get_symbol(klass_name), - false); - // Calculate accessibility the hard way. - if (!k->is_loaded()) { -@@ -519,7 +522,7 @@ - - // Check for prior unloaded klass. The SystemDictionary's answers - // can vary over time but the compiler needs consistency. -- ciSymbol* name = get_object(klass()->klass_part()->name())->as_symbol(); -+ ciSymbol* name = get_symbol(klass()->klass_part()->name()); - ciKlass* unloaded_klass = check_get_unloaded_klass(accessor, name); - if (unloaded_klass != NULL) { - is_accessible = false; -@@ -605,7 +608,7 @@ - return ciConstant(T_OBJECT, ciobj); - } else if (tag.is_method_type()) { - // must execute Java code to link this CP entry into cache[i].f1 -- ciSymbol* signature = get_object(cpool->method_type_signature_at(index))->as_symbol(); -+ ciSymbol* signature = get_symbol(cpool->method_type_signature_at(index)); - ciObject* ciobj = get_unloaded_method_type_constant(signature); - return ciConstant(T_OBJECT, ciobj); - } else if (tag.is_method_handle()) { -@@ -613,8 +616,8 @@ - int ref_kind = cpool->method_handle_ref_kind_at(index); - int callee_index = cpool->method_handle_klass_index_at(index); - ciKlass* callee = get_klass_by_index_impl(cpool, callee_index, ignore_will_link, accessor); -- ciSymbol* name = get_object(cpool->method_handle_name_ref_at(index))->as_symbol(); -- ciSymbol* signature = get_object(cpool->method_handle_signature_ref_at(index))->as_symbol(); -+ ciSymbol* name = get_symbol(cpool->method_handle_name_ref_at(index)); -+ ciSymbol* signature = get_symbol(cpool->method_handle_signature_ref_at(index)); - ciObject* ciobj = get_unloaded_method_handle_constant(callee, name, signature, ref_kind); - return ciConstant(T_OBJECT, ciobj); - } else { -@@ -674,33 +677,31 @@ - // name, signature, and bytecode. - methodOop ciEnv::lookup_method(instanceKlass* accessor, - instanceKlass* holder, -- symbolOop name, -- symbolOop sig, -+ Symbol* name, -+ Symbol* sig, - Bytecodes::Code bc) { - EXCEPTION_CONTEXT; - KlassHandle h_accessor(THREAD, accessor); - KlassHandle h_holder(THREAD, holder); -- symbolHandle h_name(THREAD, name); -- symbolHandle h_sig(THREAD, sig); - LinkResolver::check_klass_accessability(h_accessor, h_holder, KILL_COMPILE_ON_FATAL_(NULL)); - methodHandle dest_method; - switch (bc) { - case Bytecodes::_invokestatic: - dest_method = -- LinkResolver::resolve_static_call_or_null(h_holder, h_name, h_sig, h_accessor); -+ LinkResolver::resolve_static_call_or_null(h_holder, name, sig, h_accessor); - break; - case Bytecodes::_invokespecial: - dest_method = -- LinkResolver::resolve_special_call_or_null(h_holder, h_name, h_sig, h_accessor); -+ LinkResolver::resolve_special_call_or_null(h_holder, name, sig, h_accessor); - break; - case Bytecodes::_invokeinterface: - dest_method = -- LinkResolver::linktime_resolve_interface_method_or_null(h_holder, h_name, h_sig, -+ LinkResolver::linktime_resolve_interface_method_or_null(h_holder, name, sig, - h_accessor, true); - break; - case Bytecodes::_invokevirtual: - dest_method = -- LinkResolver::linktime_resolve_virtual_method_or_null(h_holder, h_name, h_sig, -+ LinkResolver::linktime_resolve_virtual_method_or_null(h_holder, name, sig, - h_accessor, true); - break; - default: ShouldNotReachHere(); -@@ -721,8 +722,8 @@ - ciInstanceKlass* declared_holder = get_instance_klass_for_declared_method_holder(holder); - - // Get the method's name and signature. -- symbolOop name_sym = cpool->name_ref_at(index); -- symbolOop sig_sym = cpool->signature_ref_at(index); -+ Symbol* name_sym = cpool->name_ref_at(index); -+ Symbol* sig_sym = cpool->signature_ref_at(index); - - if (holder_is_accessible) { // Our declared holder is loaded. - instanceKlass* lookup = declared_holder->get_instanceKlass(); -@@ -738,8 +739,8 @@ - // lookup. - - return get_unloaded_method(declared_holder, -- get_object(name_sym)->as_symbol(), -- get_object(sig_sym)->as_symbol()); -+ get_symbol(name_sym), -+ get_symbol(sig_sym)); - } - - -@@ -759,7 +760,7 @@ - // compiler, but it is simpler to stop the code path here with an unlinked method. - if (!is_resolved) { - ciInstanceKlass* mh_klass = get_object(SystemDictionary::MethodHandle_klass())->as_instance_klass(); -- ciSymbol* sig_sym = get_object(cpool->signature_ref_at(index))->as_symbol(); -+ ciSymbol* sig_sym = get_symbol(cpool->signature_ref_at(index)); - return get_unloaded_method(mh_klass, ciSymbol::invokeExact_name(), sig_sym); - } - -diff --git a/src/share/vm/ci/ciEnv.hpp b/src/share/vm/ci/ciEnv.hpp ---- openjdk/hotspot/src/share/vm/ci/ciEnv.hpp -+++ openjdk/hotspot/src/share/vm/ci/ciEnv.hpp -@@ -79,7 +79,6 @@ - // Distinguished instances of certain ciObjects.. - static ciObject* _null_object_instance; - static ciMethodKlass* _method_klass_instance; -- static ciSymbolKlass* _symbol_klass_instance; - static ciKlassKlass* _klass_klass_instance; - static ciInstanceKlassKlass* _instance_klass_klass_instance; - static ciTypeArrayKlassKlass* _type_array_klass_klass_instance; -@@ -160,8 +159,8 @@ - klassOop resolved_klassOop); - methodOop lookup_method(instanceKlass* accessor, - instanceKlass* holder, -- symbolOop name, -- symbolOop sig, -+ Symbol* name, -+ Symbol* sig, - Bytecodes::Code bc); - - // Get a ciObject from the object factory. Ensures uniqueness -@@ -174,9 +173,18 @@ - } - } - -+ ciSymbol* get_symbol(Symbol* o) { -+ if (o == NULL) { -+ ShouldNotReachHere(); -+ return NULL; -+ } else { -+ return _factory->get_symbol(o); -+ } -+ } -+ - ciMethod* get_method_from_handle(jobject method); - -- ciInstance* get_or_create_exception(jobject& handle, symbolHandle name); -+ ciInstance* get_or_create_exception(jobject& handle, Symbol* name); - - // Get a ciMethod representing either an unfound method or - // a method with an unloaded holder. Ensures uniqueness of -diff --git a/src/share/vm/ci/ciField.cpp b/src/share/vm/ci/ciField.cpp ---- openjdk/hotspot/src/share/vm/ci/ciField.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciField.cpp -@@ -79,15 +79,15 @@ - constantPoolHandle cpool(thread, klass->get_instanceKlass()->constants()); - - // Get the field's name, signature, and type. -- symbolHandle name (thread, cpool->name_ref_at(index)); -- _name = ciEnv::current(thread)->get_object(name())->as_symbol(); -+ Symbol* name = cpool->name_ref_at(index); -+ _name = ciEnv::current(thread)->get_symbol(name); - - int nt_index = cpool->name_and_type_ref_index_at(index); - int sig_index = cpool->signature_ref_index_at(nt_index); -- symbolHandle signature (thread, cpool->symbol_at(sig_index)); -- _signature = ciEnv::current(thread)->get_object(signature())->as_symbol(); -+ Symbol* signature = cpool->symbol_at(sig_index); -+ _signature = ciEnv::current(thread)->get_symbol(signature); - -- BasicType field_type = FieldType::basic_type(signature()); -+ BasicType field_type = FieldType::basic_type(signature); - - // If the field is a pointer type, get the klass of the - // field. -@@ -100,7 +100,7 @@ - _type = ciType::make(field_type); - } - -- _name = (ciSymbol*)ciEnv::current(thread)->get_object(name()); -+ _name = (ciSymbol*)ciEnv::current(thread)->get_symbol(name); - - // Get the field's declared holder. - // -@@ -130,7 +130,7 @@ - // Perform the field lookup. - fieldDescriptor field_desc; - klassOop canonical_holder = -- loaded_decl_holder->find_field(name(), signature(), &field_desc); -+ loaded_decl_holder->find_field(name, signature, &field_desc); - if (canonical_holder == NULL) { - // Field lookup failed. Will be detected by will_link. - _holder = declared_holder; -@@ -150,8 +150,8 @@ - - // Get the field's name, signature, and type. - ciEnv* env = CURRENT_ENV; -- _name = env->get_object(fd->name())->as_symbol(); -- _signature = env->get_object(fd->signature())->as_symbol(); -+ _name = env->get_symbol(fd->name()); -+ _signature = env->get_symbol(fd->signature()); - - BasicType field_type = fd->field_type(); - -diff --git a/src/share/vm/ci/ciInstanceKlass.cpp b/src/share/vm/ci/ciInstanceKlass.cpp ---- openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp -@@ -382,7 +382,7 @@ - VM_ENTRY_MARK; - instanceKlass* k = get_instanceKlass(); - fieldDescriptor fd; -- klassOop def = k->find_field(name->get_symbolOop(), signature->get_symbolOop(), is_static, &fd); -+ klassOop def = k->find_field(name->get_symbol(), signature->get_symbol(), is_static, &fd); - if (def == NULL) { - return NULL; - } -@@ -543,8 +543,8 @@ - ciMethod* ciInstanceKlass::find_method(ciSymbol* name, ciSymbol* signature) { - VM_ENTRY_MARK; - instanceKlass* k = get_instanceKlass(); -- symbolOop name_sym = name->get_symbolOop(); -- symbolOop sig_sym= signature->get_symbolOop(); -+ Symbol* name_sym = name->get_symbol(); -+ Symbol* sig_sym= signature->get_symbol(); - - methodOop m = k->find_method(name_sym, sig_sym); - if (m == NULL) return NULL; -diff --git a/src/share/vm/ci/ciKlass.cpp b/src/share/vm/ci/ciKlass.cpp ---- openjdk/hotspot/src/share/vm/ci/ciKlass.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciKlass.cpp -@@ -39,9 +39,9 @@ - assert(get_oop()->is_klass(), "wrong type"); - Klass* k = get_Klass(); - _layout_helper = k->layout_helper(); -- symbolOop klass_name = k->name(); -+ Symbol* klass_name = k->name(); - assert(klass_name != NULL, "wrong ciKlass constructor"); -- _name = CURRENT_ENV->get_object(klass_name)->as_symbol(); -+ _name = CURRENT_ENV->get_symbol(klass_name); - } - - // ------------------------------------------------------------------ -diff --git a/src/share/vm/ci/ciMethod.cpp b/src/share/vm/ci/ciMethod.cpp ---- openjdk/hotspot/src/share/vm/ci/ciMethod.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp -@@ -122,9 +122,9 @@ - - // generating _signature may allow GC and therefore move m. - // These fields are always filled in. -- _name = env->get_object(h_m()->name())->as_symbol(); -+ _name = env->get_symbol(h_m()->name()); - _holder = env->get_object(h_m()->method_holder())->as_instance_klass(); -- ciSymbol* sig_symbol = env->get_object(h_m()->signature())->as_symbol(); -+ ciSymbol* sig_symbol = env->get_symbol(h_m()->signature()); - _signature = new (env->arena()) ciSignature(_holder, sig_symbol); - _method_data = NULL; - // Take a snapshot of these values, so they will be commensurate with the MDO. -@@ -649,8 +649,8 @@ - KlassHandle caller_klass (THREAD, caller->get_klassOop()); - KlassHandle h_recv (THREAD, exact_receiver->get_klassOop()); - KlassHandle h_resolved (THREAD, holder()->get_klassOop()); -- symbolHandle h_name (THREAD, name()->get_symbolOop()); -- symbolHandle h_signature (THREAD, signature()->get_symbolOop()); -+ Symbol* h_name = name()->get_symbol(); -+ Symbol* h_signature = signature()->get_symbol(); - - methodHandle m; - // Only do exact lookup if receiver klass has been linked. Otherwise, -@@ -702,8 +702,8 @@ - - KlassHandle caller_klass (THREAD, caller->get_klassOop()); - KlassHandle h_recv (THREAD, receiver->get_klassOop()); -- symbolHandle h_name (THREAD, name()->get_symbolOop()); -- symbolHandle h_signature (THREAD, signature()->get_symbolOop()); -+ Symbol* h_name = name()->get_symbol(); -+ Symbol* h_signature = signature()->get_symbol(); - - vtable_index = LinkResolver::resolve_virtual_vtable_index(h_recv, h_recv, h_name, h_signature, caller_klass); - if (vtable_index == methodOopDesc::nonvirtual_vtable_index) { -diff --git a/src/share/vm/ci/ciObjArrayKlass.cpp b/src/share/vm/ci/ciObjArrayKlass.cpp ---- openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp -@@ -110,7 +110,7 @@ - EXCEPTION_CONTEXT; - int element_len = element_name->utf8_length(); - -- symbolOop base_name_sym = element_name->get_symbolOop(); -+ Symbol* base_name_sym = element_name->get_symbol(); - char* name; - - if (base_name_sym->byte_at(0) == '[' || -diff --git a/src/share/vm/ci/ciObject.hpp b/src/share/vm/ci/ciObject.hpp ---- openjdk/hotspot/src/share/vm/ci/ciObject.hpp -+++ openjdk/hotspot/src/share/vm/ci/ciObject.hpp -@@ -268,10 +268,6 @@ - assert(is_type_array_klass(), "bad cast"); - return (ciTypeArrayKlass*)this; - } -- ciSymbolKlass* as_symbol_klass() { -- assert(is_symbol_klass(), "bad cast"); -- return (ciSymbolKlass*)this; -- } - ciKlassKlass* as_klass_klass() { - assert(is_klass_klass(), "bad cast"); - return (ciKlassKlass*)this; -diff --git a/src/share/vm/ci/ciObjectFactory.cpp b/src/share/vm/ci/ciObjectFactory.cpp ---- openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp -@@ -38,7 +38,6 @@ - #include "ci/ciObjArrayKlassKlass.hpp" - #include "ci/ciObjectFactory.hpp" - #include "ci/ciSymbol.hpp" --#include "ci/ciSymbolKlass.hpp" - #include "ci/ciTypeArray.hpp" - #include "ci/ciTypeArrayKlass.hpp" - #include "ci/ciTypeArrayKlassKlass.hpp" -@@ -98,6 +97,8 @@ - _unloaded_instances = new (arena) GrowableArray<ciInstance*>(arena, 4, 0, NULL); - _return_addresses = - new (arena) GrowableArray<ciReturnAddress*>(arena, 8, 0, NULL); -+ -+ _symbols = new (arena) GrowableArray<ciSymbol*>(arena, 100, 0, NULL); - } - - // ------------------------------------------------------------------ -@@ -127,19 +128,19 @@ - // Create the shared symbols, but not in _shared_ci_objects. - int i; - for (i = vmSymbols::FIRST_SID; i < vmSymbols::SID_LIMIT; i++) { -- symbolHandle sym_handle = vmSymbolHandles::symbol_handle_at((vmSymbols::SID) i); -- assert(vmSymbols::find_sid(sym_handle()) == i, "1-1 mapping"); -- ciSymbol* sym = new (_arena) ciSymbol(sym_handle, (vmSymbols::SID) i); -+ Symbol* vmsym = vmSymbols::symbol_at((vmSymbols::SID) i); -+ assert(vmSymbols::find_sid(vmsym) == i, "1-1 mapping"); -+ ciSymbol* sym = new (_arena) ciSymbol(vmsym, (vmSymbols::SID) i); - init_ident_of(sym); - _shared_ci_symbols[i] = sym; - } - #ifdef ASSERT - for (i = vmSymbols::FIRST_SID; i < vmSymbols::SID_LIMIT; i++) { -- symbolHandle sym_handle = vmSymbolHandles::symbol_handle_at((vmSymbols::SID) i); -+ Symbol* vmsym = vmSymbols::symbol_at((vmSymbols::SID) i); - ciSymbol* sym = vm_symbol_at((vmSymbols::SID) i); -- assert(sym->get_oop() == sym_handle(), "oop must match"); -+ assert(sym->get_symbol() == vmsym, "oop must match"); - } -- assert(ciSymbol::void_class_signature()->get_oop() == vmSymbols::void_class_signature(), "spot check"); -+ assert(ciSymbol::void_class_signature()->get_symbol() == vmSymbols::void_class_signature(), "spot check"); - #endif - } - -@@ -157,8 +158,6 @@ - init_ident_of(ciEnv::_null_object_instance); - ciEnv::_method_klass_instance = - get(Universe::methodKlassObj())->as_method_klass(); -- ciEnv::_symbol_klass_instance = -- get(Universe::symbolKlassObj())->as_symbol_klass(); - ciEnv::_klass_klass_instance = - get(Universe::klassKlassObj())->as_klass_klass(); - ciEnv::_instance_klass_klass_instance = -@@ -188,7 +187,7 @@ - } - } - -- ciEnv::_unloaded_cisymbol = (ciSymbol*) ciObjectFactory::get(vmSymbols::dummy_symbol_oop()); -+ ciEnv::_unloaded_cisymbol = ciObjectFactory::get_symbol(vmSymbols::dummy_symbol()); - // Create dummy instanceKlass and objArrayKlass object and assign them idents - ciEnv::_unloaded_ciinstance_klass = new (_arena) ciInstanceKlass(ciEnv::_unloaded_cisymbol, NULL, NULL); - init_ident_of(ciEnv::_unloaded_ciinstance_klass); -@@ -218,6 +217,30 @@ - _shared_ci_objects = _ci_objects; - } - -+ -+ciSymbol* ciObjectFactory::get_symbol(Symbol* key) { -+ vmSymbols::SID sid = vmSymbols::find_sid(key); -+ if (sid != vmSymbols::NO_SID) { -+ // do not pollute the main cache with it -+ return vm_symbol_at(sid); -+ } -+ -+ assert(vmSymbols::find_sid(key) == vmSymbols::NO_SID, ""); -+ ciSymbol* s = new (arena()) ciSymbol(key, vmSymbols::NO_SID); -+ _symbols->push(s); -+ return s; -+} -+ -+// Decrement the refcount when done on symbols referenced by this compilation. -+void ciObjectFactory::remove_symbols() { -+ for (int i = 0; i < _symbols->length(); i++) { -+ ciSymbol* s = _symbols->at(i); -+ s->get_symbol()->decrement_refcount(); -+ } -+ // Since _symbols is resource allocated we're not allowed to delete it -+ // but it'll go away just the same. -+} -+ - // ------------------------------------------------------------------ - // ciObjectFactory::get - // -@@ -255,15 +278,6 @@ - return bucket->object(); - } - -- // Check in the shared symbol area before putting it in the list. -- if (key->is_symbol()) { -- vmSymbols::SID sid = vmSymbols::find_sid((symbolOop)key); -- if (sid != vmSymbols::NO_SID) { -- // do not pollute the main cache with it -- return vm_symbol_at(sid); -- } -- } -- - // The ciObject does not yet exist. Create it and insert it - // into the cache. - Handle keyHandle(key); -@@ -297,11 +311,7 @@ - ciObject* ciObjectFactory::create_new_object(oop o) { - EXCEPTION_CONTEXT; - -- if (o->is_symbol()) { -- symbolHandle h_o(THREAD, (symbolOop)o); -- assert(vmSymbols::find_sid(h_o()) == vmSymbols::NO_SID, ""); -- return new (arena()) ciSymbol(h_o, vmSymbols::NO_SID); -- } else if (o->is_klass()) { -+ if (o->is_klass()) { - KlassHandle h_k(THREAD, (klassOop)o); - Klass* k = ((klassOop)o)->klass_part(); - if (k->oop_is_instance()) { -@@ -312,8 +322,6 @@ - return new (arena()) ciTypeArrayKlass(h_k); - } else if (k->oop_is_method()) { - return new (arena()) ciMethodKlass(h_k); -- } else if (k->oop_is_symbol()) { -- return new (arena()) ciSymbolKlass(h_k); - } else if (k->oop_is_klass()) { - if (k->oop_is_objArrayKlass()) { - return new (arena()) ciObjArrayKlassKlass(h_k); -@@ -426,22 +434,20 @@ - // unloaded instanceKlass. Deal with both. - if (name->byte_at(0) == '[') { - // Decompose the name.' -- jint dimension = 0; -- symbolOop element_name = NULL; -- BasicType element_type= FieldType::get_array_info(name->get_symbolOop(), -- &dimension, -- &element_name, -- THREAD); -+ FieldArrayInfo fd; -+ BasicType element_type = FieldType::get_array_info(name->get_symbol(), -+ fd, THREAD); - if (HAS_PENDING_EXCEPTION) { - CLEAR_PENDING_EXCEPTION; - CURRENT_THREAD_ENV->record_out_of_memory_failure(); - return ciEnv::_unloaded_ciobjarrayklass; - } -+ int dimension = fd.dimension(); - assert(element_type != T_ARRAY, "unsuccessful decomposition"); - ciKlass* element_klass = NULL; - if (element_type == T_OBJECT) { - ciEnv *env = CURRENT_THREAD_ENV; -- ciSymbol* ci_name = env->get_object(element_name)->as_symbol(); -+ ciSymbol* ci_name = env->get_symbol(fd.object_key()); - element_klass = - env->get_klass_by_name(accessing_klass, ci_name, false)->as_instance_klass(); - } else { -@@ -573,6 +579,10 @@ - obj->set_ident(_next_ident++); - } - -+void ciObjectFactory::init_ident_of(ciSymbol* obj) { -+ obj->set_ident(_next_ident++); -+} -+ - - // ------------------------------------------------------------------ - // ciObjectFactory::find -diff --git a/src/share/vm/ci/ciObjectFactory.hpp b/src/share/vm/ci/ciObjectFactory.hpp ---- openjdk/hotspot/src/share/vm/ci/ciObjectFactory.hpp -+++ openjdk/hotspot/src/share/vm/ci/ciObjectFactory.hpp -@@ -48,6 +48,7 @@ - GrowableArray<ciKlass*>* _unloaded_klasses; - GrowableArray<ciInstance*>* _unloaded_instances; - GrowableArray<ciReturnAddress*>* _return_addresses; -+ GrowableArray<ciSymbol*>* _symbols; // keep list of symbols created - int _next_ident; - - public: -@@ -76,6 +77,7 @@ - void insert_non_perm(NonPermObject* &where, oop key, ciObject* obj); - - void init_ident_of(ciObject* obj); -+ void init_ident_of(ciSymbol* obj); - - Arena* arena() { return _arena; } - -@@ -88,13 +90,15 @@ - - static void initialize(); - void init_shared_objects(); -+ void remove_symbols(); - - ciObjectFactory(Arena* arena, int expected_size); - -- - // Get the ciObject corresponding to some oop. - ciObject* get(oop key); - -+ ciSymbol* get_symbol(Symbol* key); -+ - // Get the ciSymbol corresponding to one of the vmSymbols. - static ciSymbol* vm_symbol_at(int index); - -diff --git a/src/share/vm/ci/ciSignature.cpp b/src/share/vm/ci/ciSignature.cpp ---- openjdk/hotspot/src/share/vm/ci/ciSignature.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciSignature.cpp -@@ -47,7 +47,8 @@ - - int size = 0; - int count = 0; -- symbolHandle sh (THREAD, symbol->get_symbolOop()); -+ ResourceMark rm(THREAD); -+ Symbol* sh = symbol->get_symbol(); - SignatureStream ss(sh); - for (; ; ss.next()) { - // Process one element of the signature -@@ -55,14 +56,14 @@ - if (!ss.is_object()) { - type = ciType::make(ss.type()); - } else { -- symbolOop name = ss.as_symbol(THREAD); -+ Symbol* name = ss.as_symbol(THREAD); - if (HAS_PENDING_EXCEPTION) { - type = ss.is_array() ? (ciType*)ciEnv::unloaded_ciobjarrayklass() - : (ciType*)ciEnv::unloaded_ciinstance_klass(); - env->record_out_of_memory_failure(); - CLEAR_PENDING_EXCEPTION; - } else { -- ciSymbol* klass_name = env->get_object(name)->as_symbol(); -+ ciSymbol* klass_name = env->get_symbol(name); - type = env->get_klass_by_name_impl(_accessing_klass, klass_name, false); - } - } -diff --git a/src/share/vm/ci/ciSignature.hpp b/src/share/vm/ci/ciSignature.hpp ---- openjdk/hotspot/src/share/vm/ci/ciSignature.hpp -+++ openjdk/hotspot/src/share/vm/ci/ciSignature.hpp -@@ -48,7 +48,7 @@ - - void get_all_klasses(); - -- symbolOop get_symbolOop() const { return _symbol->get_symbolOop(); } -+ Symbol* get_symbol() const { return _symbol->get_symbol(); } - - public: - ciSymbol* as_symbol() const { return _symbol; } -diff --git a/src/share/vm/ci/ciSymbol.cpp b/src/share/vm/ci/ciSymbol.cpp ---- openjdk/hotspot/src/share/vm/ci/ciSymbol.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciSymbol.cpp -@@ -30,23 +30,27 @@ - // ------------------------------------------------------------------ - // ciSymbol::ciSymbol - // --// Preallocated handle variant. Used with handles from vmSymboHandles. --ciSymbol::ciSymbol(symbolHandle h_s, vmSymbols::SID sid) -- : ciObject(h_s), _sid(sid) -+// Preallocated symbol variant. Used with symbols from vmSymbols. -+ciSymbol::ciSymbol(Symbol* s, vmSymbols::SID sid) -+ : _symbol(s), _sid(sid) - { -+ assert(_symbol != NULL, "adding null symbol"); -+ _symbol->increment_refcount(); // increment ref count - assert(sid_ok(), "must be in vmSymbols"); - } - - // Normal case for non-famous symbols. --ciSymbol::ciSymbol(symbolOop s) -- : ciObject(s), _sid(vmSymbols::NO_SID) -+ciSymbol::ciSymbol(Symbol* s) -+ : _symbol(s), _sid(vmSymbols::NO_SID) - { -+ assert(_symbol != NULL, "adding null symbol"); -+ _symbol->increment_refcount(); // increment ref count - assert(sid_ok(), "must not be in vmSymbols"); - } - - // ciSymbol - // --// This class represents a symbolOop in the HotSpot virtual -+// This class represents a Symbol* in the HotSpot virtual - // machine. - - // ------------------------------------------------------------------ -@@ -55,20 +59,20 @@ - // The text of the symbol as a null-terminated C string. - const char* ciSymbol::as_utf8() { - VM_QUICK_ENTRY_MARK; -- symbolOop s = get_symbolOop(); -+ Symbol* s = get_symbol(); - return s->as_utf8(); - } - - // ------------------------------------------------------------------ - // ciSymbol::base --jbyte* ciSymbol::base() { -- GUARDED_VM_ENTRY(return get_symbolOop()->base();) -+const jbyte* ciSymbol::base() { -+ GUARDED_VM_ENTRY(return get_symbol()->base();) - } - - // ------------------------------------------------------------------ - // ciSymbol::byte_at - int ciSymbol::byte_at(int i) { -- GUARDED_VM_ENTRY(return get_symbolOop()->byte_at(i);) -+ GUARDED_VM_ENTRY(return get_symbol()->byte_at(i);) - } - - // ------------------------------------------------------------------ -@@ -76,7 +80,7 @@ - // - // Tests if the symbol starts with the given prefix. - bool ciSymbol::starts_with(const char* prefix, int len) const { -- GUARDED_VM_ENTRY(return get_symbolOop()->starts_with(prefix, len);) -+ GUARDED_VM_ENTRY(return get_symbol()->starts_with(prefix, len);) - } - - // ------------------------------------------------------------------ -@@ -84,13 +88,13 @@ - // - // Determines where the symbol contains the given substring. - int ciSymbol::index_of_at(int i, const char* str, int len) const { -- GUARDED_VM_ENTRY(return get_symbolOop()->index_of_at(i, str, len);) -+ GUARDED_VM_ENTRY(return get_symbol()->index_of_at(i, str, len);) - } - - // ------------------------------------------------------------------ - // ciSymbol::utf8_length - int ciSymbol::utf8_length() { -- GUARDED_VM_ENTRY(return get_symbolOop()->utf8_length();) -+ GUARDED_VM_ENTRY(return get_symbol()->utf8_length();) - } - - // ------------------------------------------------------------------ -@@ -107,7 +111,7 @@ - // - // Print the value of this symbol on an outputStream - void ciSymbol::print_symbol_on(outputStream *st) { -- GUARDED_VM_ENTRY(get_symbolOop()->print_symbol_on(st);) -+ GUARDED_VM_ENTRY(get_symbol()->print_symbol_on(st);) - } - - // ------------------------------------------------------------------ -@@ -116,15 +120,13 @@ - // Make a ciSymbol from a C string (implementation). - ciSymbol* ciSymbol::make_impl(const char* s) { - EXCEPTION_CONTEXT; -- // For some reason, oopFactory::new_symbol doesn't declare its -- // char* argument as const. -- symbolOop sym = oopFactory::new_symbol((char*)s, (int)strlen(s), THREAD); -+ TempNewSymbol sym = SymbolTable::new_symbol(s, THREAD); - if (HAS_PENDING_EXCEPTION) { - CLEAR_PENDING_EXCEPTION; - CURRENT_THREAD_ENV->record_out_of_memory_failure(); - return ciEnv::_unloaded_cisymbol; - } -- return CURRENT_THREAD_ENV->get_object(sym)->as_symbol(); -+ return CURRENT_THREAD_ENV->get_symbol(sym); - } - - // ------------------------------------------------------------------ -diff --git a/src/share/vm/ci/ciSymbol.hpp b/src/share/vm/ci/ciSymbol.hpp ---- openjdk/hotspot/src/share/vm/ci/ciSymbol.hpp -+++ openjdk/hotspot/src/share/vm/ci/ciSymbol.hpp -@@ -28,15 +28,18 @@ - #include "ci/ciObject.hpp" - #include "ci/ciObjectFactory.hpp" - #include "classfile/vmSymbols.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - - // ciSymbol - // --// This class represents a symbolOop in the HotSpot virtual -+// This class represents a Symbol* in the HotSpot virtual - // machine. --class ciSymbol : public ciObject { -+class ciSymbol : public ResourceObj { -+ Symbol* _symbol; -+ uint _ident; -+ - CI_PACKAGE_ACCESS -- // These friends all make direct use of get_symbolOop: -+ // These friends all make direct use of get_symbol: - friend class ciEnv; - friend class ciInstanceKlass; - friend class ciSignature; -@@ -45,24 +48,28 @@ - - private: - const vmSymbols::SID _sid; -- DEBUG_ONLY( bool sid_ok() { return vmSymbols::find_sid(get_symbolOop()) == _sid; } ) -+ DEBUG_ONLY( bool sid_ok() { return vmSymbols::find_sid(get_symbol()) == _sid; } ) - -- ciSymbol(symbolOop s); // normal case, for symbols not mentioned in vmSymbols -- ciSymbol(symbolHandle s, vmSymbols::SID sid); // for use with vmSymbolHandles -+ ciSymbol(Symbol* s); // normal case, for symbols not mentioned in vmSymbols -+ ciSymbol(Symbol* s, vmSymbols::SID sid); // for use with vmSymbols - -- symbolOop get_symbolOop() const { return (symbolOop)get_oop(); } -+ Symbol* get_symbol() const { return _symbol; } - - const char* type_string() { return "ciSymbol"; } - - void print_impl(outputStream* st); - -- // This is public in symbolOop but private here, because the base can move: -- jbyte* base(); -+ // This is public in Symbol* but private here, because the base can move: -+ const jbyte* base(); - - // Make a ciSymbol from a C string (implementation). - static ciSymbol* make_impl(const char* s); - -+ void set_ident(uint id) { _ident = id; } - public: -+ // A number unique to this object. -+ uint ident() { return _ident; } -+ - // The enumeration ID from vmSymbols, or vmSymbols::NO_SID if none. - vmSymbols::SID sid() const { return _sid; } - -@@ -79,9 +86,6 @@ - // Determines where the symbol contains the given substring. - int index_of_at(int i, const char* str, int len) const; - -- // What kind of ciObject is this? -- bool is_symbol() { return true; } -- - void print_symbol_on(outputStream* st); - void print_symbol() { - print_symbol_on(tty); -@@ -96,6 +100,13 @@ - static ciSymbol* name() { return ciObjectFactory::vm_symbol_at(vmSymbols::VM_SYMBOL_ENUM_NAME(name)); } - VM_SYMBOLS_DO(CI_SYMBOL_DECLARE, CI_SYMBOL_DECLARE) - #undef CI_SYMBOL_DECLARE -+ -+ void print() { -+ _symbol->print(); -+ } -+ -+ // Are two ciSymbols equal? -+ bool equals(ciSymbol* obj) { return this->_symbol == obj->get_symbol(); } - }; - - #endif // SHARE_VM_CI_CISYMBOL_HPP -diff --git a/src/share/vm/ci/ciSymbolKlass.cpp b/src/share/vm/ci/ciSymbolKlass.cpp -deleted file mode 100644 ---- openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.cpp -+++ /dev/null -@@ -1,40 +0,0 @@ --/* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- * -- */ -- --#include "precompiled.hpp" --#include "ci/ciSymbolKlass.hpp" --#include "ci/ciUtilities.hpp" -- --// ciSymbolKlass --// --// This class represents a klassOop in the HotSpot virtual machine --// whose Klass part is a symbolKlass. -- --// ------------------------------------------------------------------ --// ciSymbolKlass::instance --// --// Return the distinguished instance of this class --ciSymbolKlass* ciSymbolKlass::make() { -- return CURRENT_ENV->_symbol_klass_instance; --} -diff --git a/src/share/vm/ci/ciSymbolKlass.hpp b/src/share/vm/ci/ciSymbolKlass.hpp -deleted file mode 100644 ---- openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.hpp -+++ /dev/null -@@ -1,60 +0,0 @@ --/* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- * -- */ -- --#ifndef SHARE_VM_CI_CISYMBOLKLASS_HPP --#define SHARE_VM_CI_CISYMBOLKLASS_HPP -- --#include "ci/ciKlass.hpp" --#include "ci/ciSymbol.hpp" -- --// ciSymbolKlass --// --// This class represents a klassOop in the HotSpot virtual machine --// whose Klass part in a symbolKlass. Although, in the VM --// Klass hierarchy, symbolKlass is a direct subclass of typeArrayKlass, --// we do not model this relationship in the ciObject hierarchy -- the --// subclassing is used to share implementation and is not of note --// to compiler writers. --class ciSymbolKlass : public ciKlass { -- CI_PACKAGE_ACCESS -- --protected: -- ciSymbolKlass(KlassHandle h_k) -- : ciKlass(h_k, ciSymbol::make("unique_symbolKlass")) { -- assert(get_Klass()->oop_is_symbol(), "wrong type"); -- } -- -- symbolKlass* get_symbolKlass() { return (symbolKlass*)get_Klass(); } -- -- const char* type_string() { return "ciSymbolKlass"; } -- --public: -- // What kind of ciObject is this? -- bool is_symbol_klass() { return true; } -- -- // Return the distinguished ciSymbolKlass instance. -- static ciSymbolKlass* make(); --}; -- --#endif // SHARE_VM_CI_CISYMBOLKLASS_HPP -diff --git a/src/share/vm/ci/compilerInterface.hpp b/src/share/vm/ci/compilerInterface.hpp ---- openjdk/hotspot/src/share/vm/ci/compilerInterface.hpp -+++ openjdk/hotspot/src/share/vm/ci/compilerInterface.hpp -@@ -49,7 +49,6 @@ - #include "ci/ciSignature.hpp" - #include "ci/ciStreams.hpp" - #include "ci/ciSymbol.hpp" --#include "ci/ciSymbolKlass.hpp" - #include "ci/ciTypeArray.hpp" - #include "ci/ciTypeArrayKlass.hpp" - #include "ci/ciTypeArrayKlassKlass.hpp" -diff --git a/src/share/vm/classfile/classFileError.cpp b/src/share/vm/classfile/classFileError.cpp ---- openjdk/hotspot/src/share/vm/classfile/classFileError.cpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileError.cpp -@@ -31,25 +31,25 @@ - - void ClassFileParser::classfile_parse_error(const char* msg, TRAPS) { - ResourceMark rm(THREAD); -- Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), -+ Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), - msg, _class_name->as_C_string()); - } - - void ClassFileParser::classfile_parse_error(const char* msg, int index, TRAPS) { - ResourceMark rm(THREAD); -- Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), -+ Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), - msg, index, _class_name->as_C_string()); - } - - void ClassFileParser::classfile_parse_error(const char* msg, const char *name, TRAPS) { - ResourceMark rm(THREAD); -- Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), -+ Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), - msg, name, _class_name->as_C_string()); - } - - void ClassFileParser::classfile_parse_error(const char* msg, int index, const char *name, TRAPS) { - ResourceMark rm(THREAD); -- Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), -+ Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), - msg, index, name, _class_name->as_C_string()); - } - -@@ -57,7 +57,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_ClassFormatError(), -+ vmSymbols::java_lang_ClassFormatError(), - "StackMapTable format error: %s", msg - ); - } -diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp ---- openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -@@ -42,7 +42,7 @@ - #include "oops/klassOop.hpp" - #include "oops/klassVtable.hpp" - #include "oops/methodOop.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvmtiExport.hpp" - #include "runtime/javaCalls.hpp" - #include "runtime/perfData.hpp" -@@ -268,14 +268,14 @@ - } - - unsigned int hash; -- symbolOop result = SymbolTable::lookup_only((char*)utf8_buffer, utf8_length, hash); -+ Symbol* result = SymbolTable::lookup_only((char*)utf8_buffer, utf8_length, hash); - if (result == NULL) { - names[names_count] = (char*)utf8_buffer; - lengths[names_count] = utf8_length; - indices[names_count] = index; - hashValues[names_count++] = hash; - if (names_count == SymbolTable::symbol_alloc_batch_size) { -- oopFactory::new_symbols(cp, names_count, names, lengths, indices, hashValues, CHECK); -+ SymbolTable::new_symbols(cp, names_count, names, lengths, indices, hashValues, CHECK); - names_count = 0; - } - } else { -@@ -292,7 +292,7 @@ - - // Allocate the remaining symbols - if (names_count > 0) { -- oopFactory::new_symbols(cp, names_count, names, lengths, indices, hashValues, CHECK); -+ SymbolTable::new_symbols(cp, names_count, names, lengths, indices, hashValues, CHECK); - } - - // Copy _current pointer of local copy back to stream(). -@@ -302,6 +302,23 @@ - cfs0->set_current(cfs1.current()); - } - -+// This class unreferences constant pool symbols if an error has occurred -+// while parsing the class before it is assigned into the class. -+// If it gets an error after that it is unloaded and the constant pool will -+// be cleaned up then. -+class ConstantPoolCleaner : public StackObj { -+ constantPoolHandle _cphandle; -+ bool _in_error; -+ public: -+ ConstantPoolCleaner(constantPoolHandle cp) : _cphandle(cp), _in_error(true) {} -+ ~ConstantPoolCleaner() { -+ if (_in_error && _cphandle.not_null()) { -+ _cphandle->unreference_symbols(); -+ } -+ } -+ void set_in_error(bool clean) { _in_error = clean; } -+}; -+ - bool inline valid_cp_range(int index, int length) { return (index > 0 && index < length); } - - constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) { -@@ -320,6 +337,7 @@ - constantPoolHandle cp (THREAD, constant_pool); - - cp->set_partially_loaded(); // Enables heap verify to work on partial constantPoolOops -+ ConstantPoolCleaner cp_in_error(cp); // set constant pool to be cleaned up. - - // parsing constant pool entries - parse_constant_pool_entries(cp, length, CHECK_(nullHandle)); -@@ -412,7 +430,7 @@ - cp->tag_at(string_index).is_utf8(), - "Invalid constant pool index %u in class file %s", - string_index, CHECK_(nullHandle)); -- symbolOop sym = cp->symbol_at(string_index); -+ Symbol* sym = cp->symbol_at(string_index); - cp->unresolved_string_at_put(index, sym); - } - break; -@@ -527,6 +545,7 @@ - } - - if (!_need_verify) { -+ cp_in_error.set_in_error(false); - return cp; - } - -@@ -536,7 +555,7 @@ - jbyte tag = cp->tag_at(index).value(); - switch (tag) { - case JVM_CONSTANT_UnresolvedClass: { -- symbolHandle class_name(THREAD, cp->unresolved_klass_at(index)); -+ Symbol* class_name = cp->unresolved_klass_at(index); - // check the name, even if _cp_patches will overwrite it - verify_legal_class_name(class_name, CHECK_(nullHandle)); - break; -@@ -545,8 +564,8 @@ - if (_need_verify && _major_version >= JAVA_7_VERSION) { - int sig_index = cp->signature_ref_index_at(index); - int name_index = cp->name_ref_index_at(index); -- symbolHandle name(THREAD, cp->symbol_at(name_index)); -- symbolHandle sig(THREAD, cp->symbol_at(sig_index)); -+ Symbol* name = cp->symbol_at(name_index); -+ Symbol* sig = cp->symbol_at(sig_index); - if (sig->byte_at(0) == JVM_SIGNATURE_FUNC) { - verify_legal_method_signature(name, sig, CHECK_(nullHandle)); - } else { -@@ -563,8 +582,8 @@ - int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index); - // already verified to be utf8 - int signature_ref_index = cp->signature_ref_index_at(name_and_type_ref_index); -- symbolHandle name(THREAD, cp->symbol_at(name_ref_index)); -- symbolHandle signature(THREAD, cp->symbol_at(signature_ref_index)); -+ Symbol* name = cp->symbol_at(name_ref_index); -+ Symbol* signature = cp->symbol_at(signature_ref_index); - if (tag == JVM_CONSTANT_Fieldref) { - verify_legal_field_name(name, CHECK_(nullHandle)); - if (_need_verify && _major_version >= JAVA_7_VERSION) { -@@ -591,11 +610,11 @@ - } - if (tag == JVM_CONSTANT_Methodref) { - // 4509014: If a class method name begins with '<', it must be "<init>". -- assert(!name.is_null(), "method name in constant pool is null"); -+ assert(name != NULL, "method name in constant pool is null"); - unsigned int name_len = name->utf8_length(); - assert(name_len > 0, "bad method name"); // already verified as legal name - if (name->byte_at(0) == '<') { -- if (name() != vmSymbols::object_initializer_name()) { -+ if (name != vmSymbols::object_initializer_name()) { - classfile_parse_error( - "Bad method name at constant pool index %u in class file %s", - name_ref_index, CHECK_(nullHandle)); -@@ -616,15 +635,15 @@ - { - int name_and_type_ref_index = cp->name_and_type_ref_index_at(ref_index); - int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index); -- symbolHandle name(THREAD, cp->symbol_at(name_ref_index)); -+ Symbol* name = cp->symbol_at(name_ref_index); - if (ref_kind == JVM_REF_newInvokeSpecial) { -- if (name() != vmSymbols::object_initializer_name()) { -+ if (name != vmSymbols::object_initializer_name()) { - classfile_parse_error( - "Bad constructor name at constant pool index %u in class file %s", - name_ref_index, CHECK_(nullHandle)); - } - } else { -- if (name() == vmSymbols::object_initializer_name()) { -+ if (name == vmSymbols::object_initializer_name()) { - classfile_parse_error( - "Bad method name at constant pool index %u in class file %s", - name_ref_index, CHECK_(nullHandle)); -@@ -637,14 +656,18 @@ - break; - } - case JVM_CONSTANT_MethodType: { -- symbolHandle no_name = vmSymbolHandles::type_name(); // place holder -- symbolHandle signature(THREAD, cp->method_type_signature_at(index)); -+ Symbol* no_name = vmSymbols::type_name(); // place holder -+ Symbol* signature = cp->method_type_signature_at(index); - verify_legal_method_signature(no_name, signature, CHECK_(nullHandle)); - break; - } -+ case JVM_CONSTANT_Utf8: { -+ assert(cp->symbol_at(index)->refcount() != 0, "count corrupted"); -+ } - } // end of switch - } // end of for - -+ cp_in_error.set_in_error(false); - return cp; - } - -@@ -666,8 +689,8 @@ - guarantee_property(java_lang_String::is_instance(patch()), - "Illegal class patch at %d in class file %s", - index, CHECK); -- symbolHandle name = java_lang_String::as_symbol(patch(), CHECK); -- cp->unresolved_klass_at_put(index, name()); -+ Symbol* name = java_lang_String::as_symbol(patch(), CHECK); -+ cp->unresolved_klass_at_put(index, name); - } - break; - -@@ -718,15 +741,15 @@ - - class NameSigHash: public ResourceObj { - public: -- symbolOop _name; // name -- symbolOop _sig; // signature -+ Symbol* _name; // name -+ Symbol* _sig; // signature - NameSigHash* _next; // Next entry in hash table - }; - - - #define HASH_ROW_SIZE 256 - --unsigned int hash(symbolOop name, symbolOop sig) { -+unsigned int hash(Symbol* name, Symbol* sig) { - unsigned int raw_hash = 0; - raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2); - raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize; -@@ -743,8 +766,8 @@ - // Return true if no duplicate is found. And name/sig is added as a new entry in table. - // The old format checker uses heap sort to find duplicates. - // NOTE: caller should guarantee that GC doesn't happen during the life cycle --// of table since we don't expect symbolOop's to move. --bool put_after_lookup(symbolOop name, symbolOop sig, NameSigHash** table) { -+// of table since we don't expect Symbol*'s to move. -+bool put_after_lookup(Symbol* name, Symbol* sig, NameSigHash** table) { - assert(name != NULL, "name in constant pool is NULL"); - - // First lookup for duplicates -@@ -774,7 +797,7 @@ - int length, - Handle class_loader, - Handle protection_domain, -- symbolHandle class_name, -+ Symbol* class_name, - TRAPS) { - ClassFileStream* cfs = stream(); - assert(length > 0, "only called for length>0"); -@@ -794,7 +817,7 @@ - if (cp->tag_at(interface_index).is_klass()) { - interf = KlassHandle(THREAD, cp->resolved_klass_at(interface_index)); - } else { -- symbolHandle unresolved_klass (THREAD, cp->klass_name_at(interface_index)); -+ Symbol* unresolved_klass = cp->klass_name_at(interface_index); - - // Don't need to check legal name because it's checked when parsing constant pool. - // But need to make sure it's not an array type. -@@ -831,7 +854,7 @@ - debug_only(No_Safepoint_Verifier nsv;) - for (index = 0; index < length; index++) { - klassOop k = (klassOop)interfaces->obj_at(index); -- symbolOop name = instanceKlass::cast(k)->name(); -+ Symbol* name = instanceKlass::cast(k)->name(); - // If no duplicates, add (name, NULL) in hashtable interface_names. - if (!put_after_lookup(name, NULL, interface_names)) { - dup = true; -@@ -909,7 +932,7 @@ - "Invalid field attribute index %u in class file %s", - attribute_name_index, - CHECK); -- symbolOop attribute_name = cp->symbol_at(attribute_name_index); -+ Symbol* attribute_name = cp->symbol_at(attribute_name_index); - if (is_static && attribute_name == vmSymbols::tag_constant_value()) { - // ignore if non-static - if (constantvalue_index != 0) { -@@ -1032,7 +1055,7 @@ - valid_cp_range(name_index, cp_size) && cp->tag_at(name_index).is_utf8(), - "Invalid constant pool index %u for field name in class file %s", - name_index, CHECK_(nullHandle)); -- symbolHandle name(THREAD, cp->symbol_at(name_index)); -+ Symbol* name = cp->symbol_at(name_index); - verify_legal_field_name(name, CHECK_(nullHandle)); - - u2 signature_index = cfs->get_u2_fast(); -@@ -1041,7 +1064,7 @@ - cp->tag_at(signature_index).is_utf8(), - "Invalid constant pool index %u for field signature in class file %s", - signature_index, CHECK_(nullHandle)); -- symbolHandle sig(THREAD, cp->symbol_at(signature_index)); -+ Symbol* sig = cp->symbol_at(signature_index); - verify_legal_field_signature(name, sig, CHECK_(nullHandle)); - - u2 constantvalue_index = 0; -@@ -1167,9 +1190,9 @@ - debug_only(No_Safepoint_Verifier nsv;) - for (int i = 0; i < length*instanceKlass::next_offset; i += instanceKlass::next_offset) { - int name_index = fields->ushort_at(i + instanceKlass::name_index_offset); -- symbolOop name = cp->symbol_at(name_index); -+ Symbol* name = cp->symbol_at(name_index); - int sig_index = fields->ushort_at(i + instanceKlass::signature_index_offset); -- symbolOop sig = cp->symbol_at(sig_index); -+ Symbol* sig = cp->symbol_at(sig_index); - // If no duplicates, add name/signature in hashtable names_and_sigs. - if (!put_after_lookup(name, sig, names_and_sigs)) { - dup = true; -@@ -1423,16 +1446,16 @@ - "Signature index %u in %s has bad constant type in class file %s", - descriptor_index, tbl_name, CHECK_NULL); - -- symbolHandle name(THREAD, cp->symbol_at(name_index)); -- symbolHandle sig(THREAD, cp->symbol_at(descriptor_index)); -+ Symbol* name = cp->symbol_at(name_index); -+ Symbol* sig = cp->symbol_at(descriptor_index); - verify_legal_field_name(name, CHECK_NULL); - u2 extra_slot = 0; - if (!isLVTT) { - verify_legal_field_signature(name, sig, CHECK_NULL); - - // 4894874: check special cases for double and long local variables -- if (sig() == vmSymbols::type_signature(T_DOUBLE) || -- sig() == vmSymbols::type_signature(T_LONG)) { -+ if (sig == vmSymbols::type_signature(T_DOUBLE) || -+ sig == vmSymbols::type_signature(T_LONG)) { - extra_slot = 1; - } - } -@@ -1540,7 +1563,7 @@ - } - - void ClassFileParser::throwIllegalSignature( -- const char* type, symbolHandle name, symbolHandle sig, TRAPS) { -+ const char* type, Symbol* name, Symbol* sig, TRAPS) { - ResourceMark rm(THREAD); - Exceptions::fthrow(THREAD_AND_LOCATION, - vmSymbols::java_lang_ClassFormatError(), -@@ -1581,7 +1604,7 @@ - cp->tag_at(name_index).is_utf8(), - "Illegal constant pool index %u for method name in class file %s", - name_index, CHECK_(nullHandle)); -- symbolHandle name(THREAD, cp->symbol_at(name_index)); -+ Symbol* name = cp->symbol_at(name_index); - verify_legal_method_name(name, CHECK_(nullHandle)); - - u2 signature_index = cfs->get_u2_fast(); -@@ -1590,7 +1613,7 @@ - cp->tag_at(signature_index).is_utf8(), - "Illegal constant pool index %u for method signature in class file %s", - signature_index, CHECK_(nullHandle)); -- symbolHandle signature(THREAD, cp->symbol_at(signature_index)); -+ Symbol* signature = cp->symbol_at(signature_index); - - AccessFlags access_flags; - if (name == vmSymbols::class_initializer_name()) { -@@ -1661,7 +1684,7 @@ - "Invalid method attribute name index %u in class file %s", - method_attribute_name_index, CHECK_(nullHandle)); - -- symbolOop method_attribute_name = cp->symbol_at(method_attribute_name_index); -+ Symbol* method_attribute_name = cp->symbol_at(method_attribute_name_index); - if (method_attribute_name == vmSymbols::tag_code()) { - // Parse Code attribute - if (_need_verify) { -@@ -2058,16 +2081,16 @@ - 0, - CHECK_(nullHandle)); - -- if (name() == vmSymbols::finalize_method_name() && -- signature() == vmSymbols::void_method_signature()) { -+ if (name == vmSymbols::finalize_method_name() && -+ signature == vmSymbols::void_method_signature()) { - if (m->is_empty_method()) { - _has_empty_finalizer = true; - } else { - _has_finalizer = true; - } - } -- if (name() == vmSymbols::object_initializer_name() && -- signature() == vmSymbols::void_method_signature() && -+ if (name == vmSymbols::object_initializer_name() && -+ signature == vmSymbols::void_method_signature() && - m->is_vanilla_constructor()) { - _has_vanilla_constructor = true; - } -@@ -2194,7 +2217,7 @@ - } - } - // Sort method array by ascending method name (for faster lookups & vtable construction) -- // Note that the ordering is not alphabetical, see symbolOopDesc::fast_compare -+ // Note that the ordering is not alphabetical, see Symbol::fast_compare - methodOopDesc::sort_methods(methods(), - methods_annotations(), - methods_parameter_annotations(), -@@ -2243,9 +2266,10 @@ - if (JvmtiExport::can_get_source_debug_extension()) { - // Optimistically assume that only 1 byte UTF format is used - // (common case) -- symbolOop sde_symbol = oopFactory::new_symbol((char*)sde_buffer, -- length, CHECK); -+ TempNewSymbol sde_symbol = SymbolTable::new_symbol((const char*)sde_buffer, length, CHECK); - k->set_source_debug_extension(sde_symbol); -+ // Note that set_source_debug_extension() increments the reference count -+ // for its copy of the Symbol*, so use a TempNewSymbol here. - } - // Got utf8 string, set stream position forward - cfs->skip_u1(length, CHECK); -@@ -2441,7 +2465,7 @@ - cp->tag_at(attribute_name_index).is_utf8(), - "Attribute name has bad constant pool index %u in class file %s", - attribute_name_index, CHECK); -- symbolOop tag = cp->symbol_at(attribute_name_index); -+ Symbol* tag = cp->symbol_at(attribute_name_index); - if (tag == vmSymbols::tag_source_file()) { - // Check for SourceFile tag - if (_need_verify) { -@@ -2608,7 +2632,7 @@ - case T_OBJECT: - { - #ifdef ASSERT -- symbolOop sym = oopFactory::new_symbol("Ljava/lang/String;", CHECK); -+ TempNewSymbol sym = SymbolTable::new_symbol("Ljava/lang/String;", CHECK); - assert(fd->signature() == sym, "just checking"); - #endif - oop string = fd->string_initial_value(CHECK); -@@ -2651,8 +2675,8 @@ - (*fields_ptr)()->ushort_at(i + instanceKlass::name_index_offset); - int sig_index = - (*fields_ptr)()->ushort_at(i + instanceKlass::signature_index_offset); -- symbolOop f_name = cp->symbol_at(name_index); -- symbolOop f_sig = cp->symbol_at(sig_index); -+ Symbol* f_name = cp->symbol_at(name_index); -+ Symbol* f_sig = cp->symbol_at(sig_index); - if (f_sig == vmSymbols::reference_signature() && reference_index == 0) { - // Save the index for reference signature for later use. - // The fake discovered field does not entries in the -@@ -2809,9 +2833,8 @@ - int name_index = fields->ushort_at(i + instanceKlass::name_index_offset); - int sig_index = fields->ushort_at(i + instanceKlass::signature_index_offset); - int acc_flags = fields->ushort_at(i + instanceKlass::access_flags_offset); -- symbolOop f_name = cp->symbol_at(name_index); -- symbolOop f_sig = cp->symbol_at(sig_index); -- -+ Symbol* f_name = cp->symbol_at(name_index); -+ Symbol* f_sig = cp->symbol_at(sig_index); - if (f_name == vmSymbols::vmentry_name() && (acc_flags & JVM_ACC_STATIC) == 0) { - if (f_sig == vmSymbols::machine_word_signature()) { - // If the signature of vmentry is already changed, we're done. -@@ -2845,12 +2868,12 @@ - } - - --instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name, -+instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, - Handle class_loader, - Handle protection_domain, - KlassHandle host_klass, - GrowableArray<Handle>* cp_patches, -- symbolHandle& parsed_name, -+ TempNewSymbol& parsed_name, - bool verify, - TRAPS) { - // So that JVMTI can cache class file in the state before retransformable agents -@@ -2903,7 +2926,7 @@ - cfs->set_verify(_need_verify); - - // Save the class file name for easier error message printing. -- _class_name = name.not_null()? name : vmSymbolHandles::unknown_class_name(); -+ _class_name = (name != NULL) ? name : vmSymbols::unknown_class_name(); - - cfs->guarantee_more(8, CHECK_(nullHandle)); // magic, major, minor - // Magic value -@@ -2918,10 +2941,10 @@ - - // Check version numbers - we check this even with verifier off - if (!is_supported_version(major_version, minor_version)) { -- if (name.is_null()) { -+ if (name == NULL) { - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_UnsupportedClassVersionError(), -+ vmSymbols::java_lang_UnsupportedClassVersionError(), - "Unsupported major.minor version %u.%u", - major_version, - minor_version); -@@ -2929,7 +2952,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_UnsupportedClassVersionError(), -+ vmSymbols::java_lang_UnsupportedClassVersionError(), - "%s : Unsupported major.minor version %u.%u", - name->as_C_string(), - major_version, -@@ -2948,6 +2971,8 @@ - - // Constant pool - constantPoolHandle cp = parse_constant_pool(CHECK_(nullHandle)); -+ ConstantPoolCleaner error_handler(cp); // set constant pool to be cleaned up. -+ - int cp_size = cp->length(); - - cfs->guarantee_more(8, CHECK_(nullHandle)); // flags, this_class, super_class, infs_len -@@ -2972,12 +2997,15 @@ - "Invalid this class index %u in constant pool in class file %s", - this_class_index, CHECK_(nullHandle)); - -- symbolHandle class_name (THREAD, cp->unresolved_klass_at(this_class_index)); -- assert(class_name.not_null(), "class_name can't be null"); -+ Symbol* class_name = cp->unresolved_klass_at(this_class_index); -+ assert(class_name != NULL, "class_name can't be null"); - - // It's important to set parsed_name *before* resolving the super class. - // (it's used for cleanup by the caller if parsing fails) - parsed_name = class_name; -+ // parsed_name is returned and can be used if there's an error, so add to -+ // its reference count. Caller will decrement the refcount. -+ parsed_name->increment_refcount(); - - // Update _class_name which could be null previously to be class_name - _class_name = class_name; -@@ -2997,11 +3025,11 @@ - { HandleMark hm(THREAD); - - // Checks if name in class file matches requested name -- if (name.not_null() && class_name() != name()) { -+ if (name != NULL && class_name != name) { - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_NoClassDefFoundError(), -+ vmSymbols::java_lang_NoClassDefFoundError(), - "%s (wrong name: %s)", - name->as_C_string(), - class_name->as_C_string() -@@ -3010,14 +3038,14 @@ - } - - if (TraceClassLoadingPreorder) { -- tty->print("[Loading %s", name()->as_klass_external_name()); -+ tty->print("[Loading %s", name->as_klass_external_name()); - if (cfs->source() != NULL) tty->print(" from %s", cfs->source()); - tty->print_cr("]"); - } - - u2 super_class_index = cfs->get_u2_fast(); - if (super_class_index == 0) { -- check_property(class_name() == vmSymbols::java_lang_Object(), -+ check_property(class_name == vmSymbols::java_lang_Object(), - "Invalid superclass index %u in class file %s", - super_class_index, - CHECK_(nullHandle)); -@@ -3079,11 +3107,11 @@ - - // We check super class after class file is parsed and format is checked - if (super_class_index > 0 && super_klass.is_null()) { -- symbolHandle sk (THREAD, cp->klass_name_at(super_class_index)); -+ Symbol* sk = cp->klass_name_at(super_class_index); - if (access_flags.is_interface()) { - // Before attempting to resolve the superclass, check for class format - // errors not checked yet. -- guarantee_property(sk() == vmSymbols::java_lang_Object(), -+ guarantee_property(sk == vmSymbols::java_lang_Object(), - "Interfaces must have java.lang.Object as superclass in class file %s", - CHECK_(nullHandle)); - } -@@ -3104,7 +3132,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IncompatibleClassChangeError(), -+ vmSymbols::java_lang_IncompatibleClassChangeError(), - "class %s has interface %s as super class", - class_name->as_klass_external_name(), - super_klass->external_name() -@@ -3195,18 +3223,18 @@ - next_nonstatic_field_offset = first_nonstatic_field_offset; - - // Add fake fields for java.lang.Class instances (also see below) -- if (class_name() == vmSymbols::java_lang_Class() && class_loader.is_null()) { -+ if (class_name == vmSymbols::java_lang_Class() && class_loader.is_null()) { - java_lang_Class_fix_pre(&methods, &fac, CHECK_(nullHandle)); - } - - // adjust the vmentry field declaration in java.dyn.MethodHandle -- if (EnableMethodHandles && class_name() == vmSymbols::sun_dyn_MethodHandleImpl() && class_loader.is_null()) { -+ if (EnableMethodHandles && class_name == vmSymbols::sun_dyn_MethodHandleImpl() && class_loader.is_null()) { - java_dyn_MethodHandle_fix_pre(cp, fields, &fac, CHECK_(nullHandle)); - } - - // Add a fake "discovered" field if it is not present - // for compatibility with earlier jdk's. -- if (class_name() == vmSymbols::java_lang_ref_Reference() -+ if (class_name == vmSymbols::java_lang_ref_Reference() - && class_loader.is_null()) { - java_lang_ref_Reference_fix_pre(&fields, cp, &fac, CHECK_(nullHandle)); - } -@@ -3238,7 +3266,7 @@ - - // Add fake fields for java.lang.Class instances (also see above). - // FieldsAllocationStyle and CompactFields values will be reset to default. -- if(class_name() == vmSymbols::java_lang_Class() && class_loader.is_null()) { -+ if(class_name == vmSymbols::java_lang_Class() && class_loader.is_null()) { - java_lang_Class_fix_post(&next_nonstatic_field_offset); - nonstatic_oop_offsets[0] = first_nonstatic_field_offset; - const uint fake_oop_count = (next_nonstatic_field_offset - -@@ -3281,22 +3309,22 @@ - // (see in JavaClasses::compute_hard_coded_offsets()). - // Use default fields allocation order for them. - if( (allocation_style != 0 || compact_fields ) && class_loader.is_null() && -- (class_name() == vmSymbols::java_lang_AssertionStatusDirectives() || -- class_name() == vmSymbols::java_lang_Class() || -- class_name() == vmSymbols::java_lang_ClassLoader() || -- class_name() == vmSymbols::java_lang_ref_Reference() || -- class_name() == vmSymbols::java_lang_ref_SoftReference() || -- class_name() == vmSymbols::java_lang_StackTraceElement() || -- class_name() == vmSymbols::java_lang_String() || -- class_name() == vmSymbols::java_lang_Throwable() || -- class_name() == vmSymbols::java_lang_Boolean() || -- class_name() == vmSymbols::java_lang_Character() || -- class_name() == vmSymbols::java_lang_Float() || -- class_name() == vmSymbols::java_lang_Double() || -- class_name() == vmSymbols::java_lang_Byte() || -- class_name() == vmSymbols::java_lang_Short() || -- class_name() == vmSymbols::java_lang_Integer() || -- class_name() == vmSymbols::java_lang_Long())) { -+ (class_name == vmSymbols::java_lang_AssertionStatusDirectives() || -+ class_name == vmSymbols::java_lang_Class() || -+ class_name == vmSymbols::java_lang_ClassLoader() || -+ class_name == vmSymbols::java_lang_ref_Reference() || -+ class_name == vmSymbols::java_lang_ref_SoftReference() || -+ class_name == vmSymbols::java_lang_StackTraceElement() || -+ class_name == vmSymbols::java_lang_String() || -+ class_name == vmSymbols::java_lang_Throwable() || -+ class_name == vmSymbols::java_lang_Boolean() || -+ class_name == vmSymbols::java_lang_Character() || -+ class_name == vmSymbols::java_lang_Float() || -+ class_name == vmSymbols::java_lang_Double() || -+ class_name == vmSymbols::java_lang_Byte() || -+ class_name == vmSymbols::java_lang_Short() || -+ class_name == vmSymbols::java_lang_Integer() || -+ class_name == vmSymbols::java_lang_Long())) { - allocation_style = 0; // Allocate oops first - compact_fields = false; // Don't compact fields - } -@@ -3545,6 +3573,7 @@ - this_klass->set_has_nonstatic_fields(has_nonstatic_fields); - this_klass->set_static_oop_field_count(fac.static_oop_count); - cp->set_pool_holder(this_klass()); -+ error_handler.set_in_error(false); // turn off error handler for cp - this_klass->set_constants(cp()); - this_klass->set_local_interfaces(local_interfaces()); - this_klass->set_fields(fields()); -@@ -3937,7 +3966,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IllegalAccessError(), -+ vmSymbols::java_lang_IllegalAccessError(), - "class %s cannot access its superclass %s", - this_klass->external_name(), - instanceKlass::cast(super)->external_name() -@@ -3957,7 +3986,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IllegalAccessError(), -+ vmSymbols::java_lang_IllegalAccessError(), - "class %s cannot access its superinterface %s", - this_klass->external_name(), - instanceKlass::cast(k)->external_name() -@@ -3981,8 +4010,8 @@ - (!m->is_static()) && - (m->name() != vmSymbols::object_initializer_name())) { - -- symbolOop name = m->name(); -- symbolOop signature = m->signature(); -+ Symbol* name = m->name(); -+ Symbol* signature = m->signature(); - klassOop k = this_klass->super(); - methodOop super_m = NULL; - while (k != NULL) { -@@ -4005,7 +4034,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_VerifyError(), -+ vmSymbols::java_lang_VerifyError(), - "class %s overrides final method %s.%s", - this_klass->external_name(), - name->as_C_string(), -@@ -4039,7 +4068,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_VerifyError(), -+ vmSymbols::java_lang_VerifyError(), - "Illegal static method %s in interface %s", - m->name()->as_C_string(), - this_klass->external_name() -@@ -4069,7 +4098,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_ClassFormatError(), -+ vmSymbols::java_lang_ClassFormatError(), - "Illegal class modifiers in class %s: 0x%X", - _class_name->as_C_string(), flags - ); -@@ -4129,7 +4158,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_ClassFormatError(), -+ vmSymbols::java_lang_ClassFormatError(), - "Illegal field modifiers in class %s: 0x%X", - _class_name->as_C_string(), flags); - return; -@@ -4137,7 +4166,7 @@ - } - - void ClassFileParser::verify_legal_method_modifiers( -- jint flags, bool is_interface, symbolHandle name, TRAPS) { -+ jint flags, bool is_interface, Symbol* name, TRAPS) { - if (!_need_verify) { return; } - - const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; -@@ -4182,7 +4211,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_ClassFormatError(), -+ vmSymbols::java_lang_ClassFormatError(), - "Method %s in class %s has illegal modifiers: 0x%X", - name->as_C_string(), _class_name->as_C_string(), flags); - return; -@@ -4253,7 +4282,7 @@ - } - - // Checks if name is a legal class name. --void ClassFileParser::verify_legal_class_name(symbolHandle name, TRAPS) { -+void ClassFileParser::verify_legal_class_name(Symbol* name, TRAPS) { - if (!_need_verify || _relax_verify) { return; } - - char buf[fixed_buffer_size]; -@@ -4283,7 +4312,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_ClassFormatError(), -+ vmSymbols::java_lang_ClassFormatError(), - "Illegal class name \"%s\" in class file %s", bytes, - _class_name->as_C_string() - ); -@@ -4292,7 +4321,7 @@ - } - - // Checks if name is a legal field name. --void ClassFileParser::verify_legal_field_name(symbolHandle name, TRAPS) { -+void ClassFileParser::verify_legal_field_name(Symbol* name, TRAPS) { - if (!_need_verify || _relax_verify) { return; } - - char buf[fixed_buffer_size]; -@@ -4316,7 +4345,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_ClassFormatError(), -+ vmSymbols::java_lang_ClassFormatError(), - "Illegal field name \"%s\" in class %s", bytes, - _class_name->as_C_string() - ); -@@ -4325,10 +4354,10 @@ - } - - // Checks if name is a legal method name. --void ClassFileParser::verify_legal_method_name(symbolHandle name, TRAPS) { -+void ClassFileParser::verify_legal_method_name(Symbol* name, TRAPS) { - if (!_need_verify || _relax_verify) { return; } - -- assert(!name.is_null(), "method name is null"); -+ assert(name != NULL, "method name is null"); - char buf[fixed_buffer_size]; - char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); - unsigned int length = name->utf8_length(); -@@ -4353,7 +4382,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_ClassFormatError(), -+ vmSymbols::java_lang_ClassFormatError(), - "Illegal method name \"%s\" in class %s", bytes, - _class_name->as_C_string() - ); -@@ -4363,7 +4392,7 @@ - - - // Checks if signature is a legal field signature. --void ClassFileParser::verify_legal_field_signature(symbolHandle name, symbolHandle signature, TRAPS) { -+void ClassFileParser::verify_legal_field_signature(Symbol* name, Symbol* signature, TRAPS) { - if (!_need_verify) { return; } - - char buf[fixed_buffer_size]; -@@ -4378,7 +4407,7 @@ - - // Checks if signature is a legal method signature. - // Returns number of parameters --int ClassFileParser::verify_legal_method_signature(symbolHandle name, symbolHandle signature, TRAPS) { -+int ClassFileParser::verify_legal_method_signature(Symbol* name, Symbol* signature, TRAPS) { - if (!_need_verify) { - // make sure caller's args_size will be less than 0 even for non-static - // method so it will be recomputed in compute_size_of_parameters(). -@@ -4510,8 +4539,8 @@ - // public static boolean isJavaIdentifierStart(char ch); - JavaCalls::call_static(&result, - klass, -- vmSymbolHandles::isJavaIdentifierStart_name(), -- vmSymbolHandles::int_bool_signature(), -+ vmSymbols::isJavaIdentifierStart_name(), -+ vmSymbols::int_bool_signature(), - &args, - THREAD); - -@@ -4527,8 +4556,8 @@ - // public static boolean isJavaIdentifierPart(char ch); - JavaCalls::call_static(&result, - klass, -- vmSymbolHandles::isJavaIdentifierPart_name(), -- vmSymbolHandles::int_bool_signature(), -+ vmSymbols::isJavaIdentifierPart_name(), -+ vmSymbols::int_bool_signature(), - &args, - THREAD); - -diff --git a/src/share/vm/classfile/classFileParser.hpp b/src/share/vm/classfile/classFileParser.hpp ---- openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp -@@ -32,6 +32,7 @@ - #include "runtime/handles.inline.hpp" - #include "utilities/accessFlags.hpp" - -+class TempNewSymbol; - // Parser for for .class files - // - // The bytes describing the class file structure is read from a Stream object -@@ -42,7 +43,7 @@ - bool _relax_verify; - u2 _major_version; - u2 _minor_version; -- symbolHandle _class_name; -+ Symbol* _class_name; - KlassHandle _host_klass; - GrowableArray<Handle>* _cp_patches; // overrides for CP entries - -@@ -73,7 +74,7 @@ - int length, - Handle class_loader, - Handle protection_domain, -- symbolHandle class_name, -+ Symbol* class_name, - TRAPS); - - // Field parsing -@@ -210,21 +211,21 @@ - } - - void throwIllegalSignature( -- const char* type, symbolHandle name, symbolHandle sig, TRAPS); -+ const char* type, Symbol* name, Symbol* sig, TRAPS); - - bool is_supported_version(u2 major, u2 minor); - bool has_illegal_visibility(jint flags); - - void verify_constantvalue(int constantvalue_index, int signature_index, constantPoolHandle cp, TRAPS); - void verify_legal_utf8(const unsigned char* buffer, int length, TRAPS); -- void verify_legal_class_name(symbolHandle name, TRAPS); -- void verify_legal_field_name(symbolHandle name, TRAPS); -- void verify_legal_method_name(symbolHandle name, TRAPS); -- void verify_legal_field_signature(symbolHandle fieldname, symbolHandle signature, TRAPS); -- int verify_legal_method_signature(symbolHandle methodname, symbolHandle signature, TRAPS); -+ void verify_legal_class_name(Symbol* name, TRAPS); -+ void verify_legal_field_name(Symbol* name, TRAPS); -+ void verify_legal_method_name(Symbol* name, TRAPS); -+ void verify_legal_field_signature(Symbol* fieldname, Symbol* signature, TRAPS); -+ int verify_legal_method_signature(Symbol* methodname, Symbol* signature, TRAPS); - void verify_legal_class_modifiers(jint flags, TRAPS); - void verify_legal_field_modifiers(jint flags, bool is_interface, TRAPS); -- void verify_legal_method_modifiers(jint flags, bool is_interface, symbolHandle name, TRAPS); -+ void verify_legal_method_modifiers(jint flags, bool is_interface, Symbol* name, TRAPS); - bool verify_unqualified_name(char* name, unsigned int length, int type); - char* skip_over_field_name(char* name, bool slash_ok, unsigned int length); - char* skip_over_field_signature(char* signature, bool void_ok, unsigned int length, TRAPS); -@@ -273,21 +274,21 @@ - // - // "parsed_name" is updated by this method, and is the name found - // while parsing the stream. -- instanceKlassHandle parseClassFile(symbolHandle name, -+ instanceKlassHandle parseClassFile(Symbol* name, - Handle class_loader, - Handle protection_domain, -- symbolHandle& parsed_name, -+ TempNewSymbol& parsed_name, - bool verify, - TRAPS) { - KlassHandle no_host_klass; - return parseClassFile(name, class_loader, protection_domain, no_host_klass, NULL, parsed_name, verify, THREAD); - } -- instanceKlassHandle parseClassFile(symbolHandle name, -+ instanceKlassHandle parseClassFile(Symbol* name, - Handle class_loader, - Handle protection_domain, - KlassHandle host_klass, - GrowableArray<Handle>* cp_patches, -- symbolHandle& parsed_name, -+ TempNewSymbol& parsed_name, - bool verify, - TRAPS); - -diff --git a/src/share/vm/classfile/classLoader.cpp b/src/share/vm/classfile/classLoader.cpp ---- openjdk/hotspot/src/share/vm/classfile/classLoader.cpp -+++ openjdk/hotspot/src/share/vm/classfile/classLoader.cpp -@@ -41,7 +41,7 @@ - #include "oops/instanceKlass.hpp" - #include "oops/instanceRefKlass.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvm_misc.hpp" - #include "runtime/arguments.hpp" - #include "runtime/compilationPolicy.hpp" -@@ -752,11 +752,7 @@ - } - } - if (*top + n + sizeof(intptr_t) >= end) { -- warning("\nThe shared miscellaneous data space is not large " -- "enough to \npreload requested classes. Use " -- "-XX:SharedMiscDataSize= to increase \nthe initial " -- "size of the miscellaneous data space.\n"); -- exit(2); -+ report_out_of_shared_space(SharedMiscData); - } - - // Copy the table data (the strings) to the shared space. -@@ -875,9 +871,9 @@ - } - - --instanceKlassHandle ClassLoader::load_classfile(symbolHandle h_name, TRAPS) { -+instanceKlassHandle ClassLoader::load_classfile(Symbol* h_name, TRAPS) { - ResourceMark rm(THREAD); -- EventMark m("loading class " INTPTR_FORMAT, (address)h_name()); -+ EventMark m("loading class " INTPTR_FORMAT, (address)h_name); - ThreadProfilerMark tpm(ThreadProfilerMark::classLoaderRegion); - - stringStream st; -@@ -912,7 +908,7 @@ - ClassFileParser parser(stream); - Handle class_loader; - Handle protection_domain; -- symbolHandle parsed_name; -+ TempNewSymbol parsed_name = NULL; - instanceKlassHandle result = parser.parseClassFile(h_name, - class_loader, - protection_domain, -@@ -1308,7 +1304,7 @@ - if (_compile_the_world_counter > CompileTheWorldStopAt) return; - - // Construct name without extension -- symbolHandle sym = oopFactory::new_symbol_handle(buffer, CHECK); -+ TempNewSymbol sym = SymbolTable::new_symbol(buffer, CHECK); - // Use loader to load and initialize class - klassOop ik = SystemDictionary::resolve_or_null(sym, loader, Handle(), THREAD); - instanceKlassHandle k (THREAD, ik); -diff --git a/src/share/vm/classfile/classLoader.hpp b/src/share/vm/classfile/classLoader.hpp ---- openjdk/hotspot/src/share/vm/classfile/classLoader.hpp -+++ openjdk/hotspot/src/share/vm/classfile/classLoader.hpp -@@ -280,7 +280,7 @@ - } - - // Load individual .class file -- static instanceKlassHandle load_classfile(symbolHandle h_name, TRAPS); -+ static instanceKlassHandle load_classfile(Symbol* h_name, TRAPS); - - // If the specified package has been loaded by the system, then returns - // the name of the directory or ZIP file that the package was loaded from. -diff --git a/src/share/vm/classfile/dictionary.cpp b/src/share/vm/classfile/dictionary.cpp ---- openjdk/hotspot/src/share/vm/classfile/dictionary.cpp -+++ openjdk/hotspot/src/share/vm/classfile/dictionary.cpp -@@ -36,7 +36,7 @@ - - - Dictionary::Dictionary(int table_size) -- : TwoOopHashtable(table_size, sizeof(DictionaryEntry)) { -+ : TwoOopHashtable<klassOop>(table_size, sizeof(DictionaryEntry)) { - _current_class_index = 0; - _current_class_entry = NULL; - }; -@@ -45,7 +45,7 @@ - - Dictionary::Dictionary(int table_size, HashtableBucket* t, - int number_of_entries) -- : TwoOopHashtable(table_size, sizeof(DictionaryEntry), t, number_of_entries) { -+ : TwoOopHashtable<klassOop>(table_size, sizeof(DictionaryEntry), t, number_of_entries) { - _current_class_index = 0; - _current_class_entry = NULL; - }; -@@ -54,7 +54,7 @@ - DictionaryEntry* Dictionary::new_entry(unsigned int hash, klassOop klass, - oop loader) { - DictionaryEntry* entry; -- entry = (DictionaryEntry*)Hashtable::new_entry(hash, klass); -+ entry = (DictionaryEntry*)Hashtable<klassOop>::new_entry(hash, klass); - entry->set_loader(loader); - entry->set_pd_set(NULL); - return entry; -@@ -62,7 +62,7 @@ - - - DictionaryEntry* Dictionary::new_entry() { -- DictionaryEntry* entry = (DictionaryEntry*)Hashtable::new_entry(0L, NULL); -+ DictionaryEntry* entry = (DictionaryEntry*)Hashtable<klassOop>::new_entry(0L, NULL); - entry->set_loader(NULL); - entry->set_pd_set(NULL); - return entry; -@@ -76,7 +76,7 @@ - entry->set_pd_set(to_delete->next()); - delete to_delete; - } -- Hashtable::free_entry(entry); -+ Hashtable<klassOop>::free_entry(entry); - } - - -@@ -298,7 +298,7 @@ - for (DictionaryEntry *probe = bucket(index); - probe != NULL; - probe = probe->next()) { -- oop e = probe->klass(); -+ klassOop e = probe->klass(); - oop class_loader = probe->loader(); - if (is_strongly_reachable(class_loader, e)) { - blk->do_oop((oop*)probe->klass_addr()); -@@ -421,11 +421,11 @@ - // also cast to volatile; we do this to ensure store order is maintained - // by the compilers. - --void Dictionary::add_klass(symbolHandle class_name, Handle class_loader, -+void Dictionary::add_klass(Symbol* class_name, Handle class_loader, - KlassHandle obj) { - assert_locked_or_safepoint(SystemDictionary_lock); - assert(obj() != NULL, "adding NULL obj"); -- assert(Klass::cast(obj())->name() == class_name(), "sanity check on name"); -+ assert(Klass::cast(obj())->name() == class_name, "sanity check on name"); - - unsigned int hash = compute_hash(class_name, class_loader); - int index = hash_to_index(hash); -@@ -444,15 +444,14 @@ - // Callers should be aware that an entry could be added just after - // _buckets[index] is read here, so the caller will not see the new entry. - DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader) { -- symbolOop name_ = class_name(); -- oop loader_ = class_loader(); -+ oop loader = class_loader(); - debug_only(_lookup_count++); - for (DictionaryEntry* entry = bucket(index); - entry != NULL; - entry = entry->next()) { -- if (entry->hash() == hash && entry->equals(name_, loader_)) { -+ if (entry->hash() == hash && entry->equals(class_name, loader)) { - return entry; - } - debug_only(_lookup_length++); -@@ -461,7 +460,7 @@ - } - - --klassOop Dictionary::find(int index, unsigned int hash, symbolHandle name, -+klassOop Dictionary::find(int index, unsigned int hash, Symbol* name, - Handle loader, Handle protection_domain, TRAPS) { - DictionaryEntry* entry = get_entry(index, hash, name, loader); - if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) { -@@ -473,7 +472,7 @@ - - - klassOop Dictionary::find_class(int index, unsigned int hash, -- symbolHandle name, Handle loader) { -+ Symbol* name, Handle loader) { - assert_locked_or_safepoint(SystemDictionary_lock); - assert (index == index_for(name, loader), "incorrect index?"); - -@@ -486,7 +485,7 @@ - // that table is static. - - klassOop Dictionary::find_shared_class(int index, unsigned int hash, -- symbolHandle name) { -+ Symbol* name) { - assert (index == index_for(name, Handle()), "incorrect index?"); - - DictionaryEntry* entry = get_entry(index, hash, name, Handle()); -@@ -498,7 +497,7 @@ - instanceKlassHandle klass, - Handle loader, Handle protection_domain, - TRAPS) { -- symbolHandle klass_name(THREAD, klass->name()); -+ Symbol* klass_name = klass->name(); - DictionaryEntry* entry = get_entry(index, hash, klass_name, loader); - - assert(entry != NULL,"entry must be present, we just created it"); -@@ -513,7 +512,7 @@ - - - bool Dictionary::is_valid_protection_domain(int index, unsigned int hash, -- symbolHandle name, -+ Symbol* name, - Handle loader, - Handle protection_domain) { - DictionaryEntry* entry = get_entry(index, hash, name, loader); -@@ -545,7 +544,7 @@ - DictionaryEntry* p = master_list; - master_list = master_list->next(); - p->set_next(NULL); -- symbolHandle class_name (thread, instanceKlass::cast((klassOop)(p->klass()))->name()); -+ Symbol* class_name = instanceKlass::cast((klassOop)(p->klass()))->name(); - unsigned int hash = compute_hash(class_name, Handle(thread, p->loader())); - int index = hash_to_index(hash); - p->set_hash(hash); -@@ -555,22 +554,22 @@ - } - - SymbolPropertyTable::SymbolPropertyTable(int table_size) -- : Hashtable(table_size, sizeof(SymbolPropertyEntry)) -+ : Hashtable<Symbol*>(table_size, sizeof(SymbolPropertyEntry)) - { - } - SymbolPropertyTable::SymbolPropertyTable(int table_size, HashtableBucket* t, - int number_of_entries) -- : Hashtable(table_size, sizeof(SymbolPropertyEntry), t, number_of_entries) -+ : Hashtable<Symbol*>(table_size, sizeof(SymbolPropertyEntry), t, number_of_entries) - { - } - - - SymbolPropertyEntry* SymbolPropertyTable::find_entry(int index, unsigned int hash, -- symbolHandle sym, -+ Symbol* sym, - intptr_t sym_mode) { - assert(index == index_for(sym, sym_mode), "incorrect index?"); - for (SymbolPropertyEntry* p = bucket(index); p != NULL; p = p->next()) { -- if (p->hash() == hash && p->symbol() == sym() && p->symbol_mode() == sym_mode) { -+ if (p->hash() == hash && p->symbol() == sym && p->symbol_mode() == sym_mode) { - return p; - } - } -@@ -579,13 +578,13 @@ - - - SymbolPropertyEntry* SymbolPropertyTable::add_entry(int index, unsigned int hash, -- symbolHandle sym, intptr_t sym_mode) { -+ Symbol* sym, intptr_t sym_mode) { - assert_locked_or_safepoint(SystemDictionary_lock); - assert(index == index_for(sym, sym_mode), "incorrect index?"); - assert(find_entry(index, hash, sym, sym_mode) == NULL, "no double entry"); - -- SymbolPropertyEntry* p = new_entry(hash, sym(), sym_mode); -- Hashtable::add_entry(index, p); -+ SymbolPropertyEntry* p = new_entry(hash, sym, sym_mode); -+ Hashtable<Symbol*>::add_entry(index, p); - return p; - } - -@@ -593,7 +592,6 @@ - void SymbolPropertyTable::oops_do(OopClosure* f) { - for (int index = 0; index < table_size(); index++) { - for (SymbolPropertyEntry* p = bucket(index); p != NULL; p = p->next()) { -- f->do_oop((oop*) p->symbol_addr()); - if (p->property_oop() != NULL) { - f->do_oop(p->property_oop_addr()); - } -diff --git a/src/share/vm/classfile/dictionary.hpp b/src/share/vm/classfile/dictionary.hpp ---- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp -+++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp -@@ -36,7 +36,7 @@ - // The data structure for the system dictionary (and the shared system - // dictionary). - --class Dictionary : public TwoOopHashtable { -+class Dictionary : public TwoOopHashtable<klassOop> { - friend class VMStructs; - private: - // current iteration index. -@@ -45,19 +45,19 @@ - static DictionaryEntry* _current_class_entry; - - DictionaryEntry* get_entry(int index, unsigned int hash, -- symbolHandle name, Handle loader); -+ Symbol* name, Handle loader); - - DictionaryEntry* bucket(int i) { -- return (DictionaryEntry*)Hashtable::bucket(i); -+ return (DictionaryEntry*)Hashtable<klassOop>::bucket(i); - } - - // The following method is not MT-safe and must be done under lock. - DictionaryEntry** bucket_addr(int i) { -- return (DictionaryEntry**)Hashtable::bucket_addr(i); -+ return (DictionaryEntry**)Hashtable<klassOop>::bucket_addr(i); - } - - void add_entry(int index, DictionaryEntry* new_entry) { -- Hashtable::add_entry(index, (HashtableEntry*)new_entry); -+ Hashtable<klassOop>::add_entry(index, (HashtableEntry<oop>*)new_entry); - } - - -@@ -71,12 +71,12 @@ - - void free_entry(DictionaryEntry* entry); - -- void add_klass(symbolHandle class_name, Handle class_loader,KlassHandle obj); -+ void add_klass(Symbol* class_name, Handle class_loader,KlassHandle obj); - - klassOop find_class(int index, unsigned int hash, -- symbolHandle name, Handle loader); -+ Symbol* name, Handle loader); - -- klassOop find_shared_class(int index, unsigned int hash, symbolHandle name); -+ klassOop find_shared_class(int index, unsigned int hash, Symbol* name); - - // Compiler support - klassOop try_get_next_class(); -@@ -95,7 +95,7 @@ - - // Classes loaded by the bootstrap loader are always strongly reachable. - // If we're not doing class unloading, all classes are strongly reachable. -- static bool is_strongly_reachable(oop class_loader, oop klass) { -+ static bool is_strongly_reachable(oop class_loader, klassOop klass) { - assert (klass != NULL, "should have non-null klass"); - return (class_loader == NULL || !ClassUnloading); - } -@@ -105,10 +105,10 @@ - bool do_unloading(BoolObjectClosure* is_alive); - - // Protection domains -- klassOop find(int index, unsigned int hash, symbolHandle name, -+ klassOop find(int index, unsigned int hash, Symbol* name, - Handle loader, Handle protection_domain, TRAPS); - bool is_valid_protection_domain(int index, unsigned int hash, -- symbolHandle name, Handle class_loader, -+ Symbol* name, Handle class_loader, - Handle protection_domain); - void add_protection_domain(int index, unsigned int hash, - instanceKlassHandle klass, Handle loader, -@@ -147,7 +147,7 @@ - // An entry in the system dictionary, this describes a class as - // { klassOop, loader, protection_domain }. - --class DictionaryEntry : public HashtableEntry { -+class DictionaryEntry : public HashtableEntry<klassOop> { - friend class VMStructs; - private: - // Contains the set of approved protection domains that can access -@@ -166,11 +166,11 @@ - klassOop* klass_addr() { return (klassOop*)literal_addr(); } - - DictionaryEntry* next() const { -- return (DictionaryEntry*)HashtableEntry::next(); -+ return (DictionaryEntry*)HashtableEntry<klassOop>::next(); - } - - DictionaryEntry** next_addr() { -- return (DictionaryEntry**)HashtableEntry::next_addr(); -+ return (DictionaryEntry**)HashtableEntry<klassOop>::next_addr(); - } - - oop loader() const { return _loader; } -@@ -209,7 +209,7 @@ - } - } - -- bool equals(symbolOop class_name, oop class_loader) const { -+ bool equals(Symbol* class_name, oop class_loader) const { - klassOop klass = (klassOop)literal(); - return (instanceKlass::cast(klass)->name() == class_name && - _loader == class_loader); -@@ -226,9 +226,9 @@ - } - }; - --// Entry in a SymbolPropertyTable, mapping a single symbolOop -+// Entry in a SymbolPropertyTable, mapping a single Symbol* - // to a managed and an unmanaged pointer. --class SymbolPropertyEntry : public HashtableEntry { -+class SymbolPropertyEntry : public HashtableEntry<Symbol*> { - friend class VMStructs; - private: - intptr_t _symbol_mode; // secondary key -@@ -236,7 +236,7 @@ - address _property_data; - - public: -- symbolOop symbol() const { return (symbolOop) literal(); } -+ Symbol* symbol() const { return literal(); } - - intptr_t symbol_mode() const { return _symbol_mode; } - void set_symbol_mode(intptr_t m) { _symbol_mode = m; } -@@ -248,14 +248,13 @@ - void set_property_data(address p) { _property_data = p; } - - SymbolPropertyEntry* next() const { -- return (SymbolPropertyEntry*)HashtableEntry::next(); -+ return (SymbolPropertyEntry*)HashtableEntry<Symbol*>::next(); - } - - SymbolPropertyEntry** next_addr() { -- return (SymbolPropertyEntry**)HashtableEntry::next_addr(); -+ return (SymbolPropertyEntry**)HashtableEntry<Symbol*>::next_addr(); - } - -- oop* symbol_addr() { return literal_addr(); } - oop* property_oop_addr() { return &_property_oop; } - - void print_on(outputStream* st) const { -@@ -279,16 +278,16 @@ - // A system-internal mapping of symbols to pointers, both managed - // and unmanaged. Used to record the auto-generation of each method - // MethodHandle.invoke(S)T, for all signatures (S)T. --class SymbolPropertyTable : public Hashtable { -+class SymbolPropertyTable : public Hashtable<Symbol*> { - friend class VMStructs; - private: - SymbolPropertyEntry* bucket(int i) { -- return (SymbolPropertyEntry*) Hashtable::bucket(i); -+ return (SymbolPropertyEntry*) Hashtable<Symbol*>::bucket(i); - } - - // The following method is not MT-safe and must be done under lock. - SymbolPropertyEntry** bucket_addr(int i) { -- return (SymbolPropertyEntry**) Hashtable::bucket_addr(i); -+ return (SymbolPropertyEntry**) Hashtable<Symbol*>::bucket_addr(i); - } - - void add_entry(int index, SymbolPropertyEntry* new_entry) { -@@ -298,8 +297,10 @@ - ShouldNotReachHere(); - } - -- SymbolPropertyEntry* new_entry(unsigned int hash, symbolOop symbol, intptr_t symbol_mode) { -- SymbolPropertyEntry* entry = (SymbolPropertyEntry*) Hashtable::new_entry(hash, symbol); -+ SymbolPropertyEntry* new_entry(unsigned int hash, Symbol* symbol, intptr_t symbol_mode) { -+ SymbolPropertyEntry* entry = (SymbolPropertyEntry*) Hashtable<Symbol*>::new_entry(hash, symbol); -+ // Hashtable with Symbol* literal must increment and decrement refcount. -+ symbol->increment_refcount(); - entry->set_symbol_mode(symbol_mode); - entry->set_property_oop(NULL); - entry->set_property_data(NULL); -@@ -311,23 +312,25 @@ - SymbolPropertyTable(int table_size, HashtableBucket* t, int number_of_entries); - - void free_entry(SymbolPropertyEntry* entry) { -- Hashtable::free_entry(entry); -+ // decrement Symbol refcount here because hashtable doesn't. -+ entry->literal()->decrement_refcount(); -+ Hashtable<Symbol*>::free_entry(entry); - } - -- unsigned int compute_hash(symbolHandle sym, intptr_t symbol_mode) { -+ unsigned int compute_hash(Symbol* sym, intptr_t symbol_mode) { - // Use the regular identity_hash. -- return Hashtable::compute_hash(sym) ^ symbol_mode; -+ return Hashtable<Symbol*>::compute_hash(sym) ^ symbol_mode; - } - -- int index_for(symbolHandle name, intptr_t symbol_mode) { -+ int index_for(Symbol* name, intptr_t symbol_mode) { - return hash_to_index(compute_hash(name, symbol_mode)); - } - - // need not be locked; no state change -- SymbolPropertyEntry* find_entry(int index, unsigned int hash, symbolHandle name, intptr_t name_mode); -+ SymbolPropertyEntry* find_entry(int index, unsigned int hash, Symbol* name, intptr_t name_mode); - - // must be done under SystemDictionary_lock -- SymbolPropertyEntry* add_entry(int index, unsigned int hash, symbolHandle name, intptr_t name_mode); -+ SymbolPropertyEntry* add_entry(int index, unsigned int hash, Symbol* name, intptr_t name_mode); - - // GC support - void oops_do(OopClosure* f); -@@ -343,6 +346,4 @@ - #endif - void verify(); - }; -- -- - #endif // SHARE_VM_CLASSFILE_DICTIONARY_HPP -diff --git a/src/share/vm/classfile/javaAssertions.cpp b/src/share/vm/classfile/javaAssertions.cpp ---- openjdk/hotspot/src/share/vm/classfile/javaAssertions.cpp -+++ openjdk/hotspot/src/share/vm/classfile/javaAssertions.cpp -@@ -93,7 +93,7 @@ - } - - oop JavaAssertions::createAssertionStatusDirectives(TRAPS) { -- symbolHandle asd_sym = vmSymbolHandles::java_lang_AssertionStatusDirectives(); -+ Symbol* asd_sym = vmSymbols::java_lang_AssertionStatusDirectives(); - klassOop k = SystemDictionary::resolve_or_fail(asd_sym, true, CHECK_NULL); - instanceKlassHandle asd_klass (THREAD, k); - asd_klass->initialize(CHECK_NULL); -diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -@@ -37,7 +37,7 @@ - #include "oops/klass.hpp" - #include "oops/klassOop.hpp" - #include "oops/methodOop.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "oops/typeArrayOop.hpp" - #include "runtime/fieldDescriptor.hpp" - #include "runtime/handles.inline.hpp" -@@ -58,7 +58,7 @@ - #endif - - static bool find_field(instanceKlass* ik, -- symbolOop name_symbol, symbolOop signature_symbol, -+ Symbol* name_symbol, Symbol* signature_symbol, - fieldDescriptor* fd, - bool allow_super = false) { - if (allow_super) -@@ -70,7 +70,7 @@ - // Helpful routine for computing field offsets at run time rather than hardcoding them - static void - compute_offset(int &dest_offset, -- klassOop klass_oop, symbolOop name_symbol, symbolOop signature_symbol, -+ klassOop klass_oop, Symbol* name_symbol, Symbol* signature_symbol, - bool allow_super = false) { - fieldDescriptor fd; - instanceKlass* ik = instanceKlass::cast(klass_oop); -@@ -85,7 +85,7 @@ - // Same as above but for "optional" offsets that might not be present in certain JDK versions - static void - compute_optional_offset(int& dest_offset, -- klassOop klass_oop, symbolOop name_symbol, symbolOop signature_symbol, -+ klassOop klass_oop, Symbol* name_symbol, Symbol* signature_symbol, - bool allow_super = false) { - fieldDescriptor fd; - instanceKlass* ik = instanceKlass::cast(klass_oop); -@@ -165,7 +165,7 @@ - return h_obj(); - } - --Handle java_lang_String::create_from_symbol(symbolHandle symbol, TRAPS) { -+Handle java_lang_String::create_from_symbol(Symbol* symbol, TRAPS) { - int length = UTF8::unicode_length((char*)symbol->bytes(), symbol->utf8_length()); - Handle h_obj = basic_create(length, false, CHECK_NH); - if (length > 0) { -@@ -301,17 +301,17 @@ - return StringTable::hash_string(value->char_at_addr(offset), length); - } - --symbolHandle java_lang_String::as_symbol(Handle java_string, TRAPS) { -+Symbol* java_lang_String::as_symbol(Handle java_string, TRAPS) { - oop obj = java_string(); - typeArrayOop value = java_lang_String::value(obj); - int offset = java_lang_String::offset(obj); - int length = java_lang_String::length(obj); - jchar* base = (length == 0) ? NULL : value->char_at_addr(offset); -- symbolOop sym = SymbolTable::lookup_unicode(base, length, THREAD); -- return symbolHandle(THREAD, sym); -+ Symbol* sym = SymbolTable::lookup_unicode(base, length, THREAD); -+ return sym; - } - --symbolOop java_lang_String::as_symbol_or_null(oop java_string) { -+Symbol* java_lang_String::as_symbol_or_null(oop java_string) { - typeArrayOop value = java_lang_String::value(java_string); - int offset = java_lang_String::offset(java_string); - int length = java_lang_String::length(java_string); -@@ -562,7 +562,7 @@ - - void java_lang_Class::print_signature(oop java_class, outputStream* st) { - assert(java_lang_Class::is_instance(java_class), "must be a Class object"); -- symbolOop name = NULL; -+ Symbol* name = NULL; - bool is_instance = false; - if (is_primitive(java_class)) { - name = vmSymbols::type_signature(primitive_type(java_class)); -@@ -580,25 +580,32 @@ - if (is_instance) st->print(";"); - } - --symbolOop java_lang_Class::as_signature(oop java_class, bool intern_if_not_found, TRAPS) { -+Symbol* java_lang_Class::as_signature(oop java_class, bool intern_if_not_found, TRAPS) { - assert(java_lang_Class::is_instance(java_class), "must be a Class object"); -- symbolOop name = NULL; -+ Symbol* name; - if (is_primitive(java_class)) { -- return vmSymbols::type_signature(primitive_type(java_class)); -+ name = vmSymbols::type_signature(primitive_type(java_class)); -+ // Because this can create a new symbol, the caller has to decrement -+ // the refcount, so make adjustment here and below for symbols returned -+ // that are not created or incremented due to a successful lookup. -+ name->increment_refcount(); - } else { - klassOop k = as_klassOop(java_class); - if (!Klass::cast(k)->oop_is_instance()) { -- return Klass::cast(k)->name(); -+ name = Klass::cast(k)->name(); -+ name->increment_refcount(); - } else { - ResourceMark rm; - const char* sigstr = Klass::cast(k)->signature_name(); - int siglen = (int) strlen(sigstr); -- if (!intern_if_not_found) -- return SymbolTable::probe(sigstr, siglen); -- else -- return oopFactory::new_symbol(sigstr, siglen, THREAD); -+ if (!intern_if_not_found) { -+ name = SymbolTable::probe(sigstr, siglen); -+ } else { -+ name = SymbolTable::new_symbol(sigstr, siglen, THREAD); -+ } - } - } -+ return name; - } - - -@@ -1147,8 +1154,8 @@ - JavaCalls::call_virtual(&result, - stream, - KlassHandle(THREAD, stream->klass()), -- vmSymbolHandles::println_name(), -- vmSymbolHandles::char_array_void_signature(), -+ vmSymbols::println_name(), -+ vmSymbols::char_array_void_signature(), - arg, - THREAD); - } -@@ -1202,8 +1209,8 @@ - JavaCalls::call_virtual(&result, - h_throwable, - KlassHandle(THREAD, h_throwable->klass()), -- vmSymbolHandles::getCause_name(), -- vmSymbolHandles::void_throwable_signature(), -+ vmSymbols::getCause_name(), -+ vmSymbols::void_throwable_signature(), - THREAD); - // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM. - if (HAS_PENDING_EXCEPTION) { -@@ -1641,7 +1648,7 @@ - oop methodname = StringTable::intern(method->name(), CHECK_0); - java_lang_StackTraceElement::set_methodName(element(), methodname); - // Fill in source file name -- symbolOop source = instanceKlass::cast(method->method_holder())->source_file_name(); -+ Symbol* source = instanceKlass::cast(method->method_holder())->source_file_name(); - oop filename = StringTable::intern(source, CHECK_0); - java_lang_StackTraceElement::set_fileName(element(), filename); - // File in source line number -@@ -1857,7 +1864,7 @@ - - Handle java_lang_reflect_Constructor::create(TRAPS) { - assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); -- symbolHandle name = vmSymbolHandles::java_lang_reflect_Constructor(); -+ Symbol* name = vmSymbols::java_lang_reflect_Constructor(); - klassOop k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); - instanceKlassHandle klass (THREAD, k); - // Ensure it is initialized -@@ -1979,7 +1986,7 @@ - - Handle java_lang_reflect_Field::create(TRAPS) { - assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); -- symbolHandle name = vmSymbolHandles::java_lang_reflect_Field(); -+ Symbol* name = vmSymbols::java_lang_reflect_Field(); - klassOop k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); - instanceKlassHandle klass (THREAD, k); - // Ensure it is initialized -@@ -2545,16 +2552,19 @@ - java_lang_Class::print_signature(rtype(mt), st); - } - --symbolOop java_dyn_MethodType::as_signature(oop mt, bool intern_if_not_found, TRAPS) { -+Symbol* java_dyn_MethodType::as_signature(oop mt, bool intern_if_not_found, TRAPS) { - ResourceMark rm; - stringStream buffer(128); - print_signature(mt, &buffer); - const char* sigstr = buffer.base(); - int siglen = (int) buffer.size(); -- if (!intern_if_not_found) -- return SymbolTable::probe(sigstr, siglen); -- else -- return oopFactory::new_symbol(sigstr, siglen, THREAD); -+ Symbol *name; -+ if (!intern_if_not_found) { -+ name = SymbolTable::probe(sigstr, siglen); -+ } else { -+ name = SymbolTable::new_symbol(sigstr, siglen, THREAD); -+ } -+ return name; - } - - oop java_dyn_MethodType::rtype(oop mt) { -@@ -3057,13 +3067,12 @@ - bool JavaClasses::check_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { - EXCEPTION_MARK; - fieldDescriptor fd; -- symbolHandle klass_sym = oopFactory::new_symbol_handle(klass_name, CATCH); -+ TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); - klassOop k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); - instanceKlassHandle h_klass (THREAD, k); -- //instanceKlassHandle h_klass(klass); -- symbolHandle f_name = oopFactory::new_symbol_handle(field_name, CATCH); -- symbolHandle f_sig = oopFactory::new_symbol_handle(field_sig, CATCH); -- if (!h_klass->find_local_field(f_name(), f_sig(), &fd)) { -+ TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); -+ TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); -+ if (!h_klass->find_local_field(f_name, f_sig, &fd)) { - tty->print_cr("Nonstatic field %s.%s not found", klass_name, field_name); - return false; - } -@@ -3084,12 +3093,12 @@ - bool JavaClasses::check_static_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { - EXCEPTION_MARK; - fieldDescriptor fd; -- symbolHandle klass_sym = oopFactory::new_symbol_handle(klass_name, CATCH); -+ TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); - klassOop k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); - instanceKlassHandle h_klass (THREAD, k); -- symbolHandle f_name = oopFactory::new_symbol_handle(field_name, CATCH); -- symbolHandle f_sig = oopFactory::new_symbol_handle(field_sig, CATCH); -- if (!h_klass->find_local_field(f_name(), f_sig(), &fd)) { -+ TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); -+ TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); -+ if (!h_klass->find_local_field(f_name, f_sig, &fd)) { - tty->print_cr("Static field %s.%s not found", klass_name, field_name); - return false; - } -@@ -3109,12 +3118,12 @@ - bool JavaClasses::check_constant(const char *klass_name, int hardcoded_constant, const char *field_name, const char* field_sig) { - EXCEPTION_MARK; - fieldDescriptor fd; -- symbolHandle klass_sym = oopFactory::new_symbol_handle(klass_name, CATCH); -+ TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); - klassOop k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); - instanceKlassHandle h_klass (THREAD, k); -- symbolHandle f_name = oopFactory::new_symbol_handle(field_name, CATCH); -- symbolHandle f_sig = oopFactory::new_symbol_handle(field_sig, CATCH); -- if (!h_klass->find_local_field(f_name(), f_sig(), &fd)) { -+ TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); -+ TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); -+ if (!h_klass->find_local_field(f_name, f_sig, &fd)) { - tty->print_cr("Static field %s.%s not found", klass_name, field_name); - return false; - } -diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -@@ -78,7 +78,7 @@ - static oop create_oop_from_unicode(jchar* unicode, int len, TRAPS); - static Handle create_from_str(const char* utf8_str, TRAPS); - static oop create_oop_from_str(const char* utf8_str, TRAPS); -- static Handle create_from_symbol(symbolHandle symbol, TRAPS); -+ static Handle create_from_symbol(Symbol* symbol, TRAPS); - static Handle create_from_platform_dependent_str(const char* str, TRAPS); - static Handle char_converter(Handle java_string, jchar from_char, jchar to_char, TRAPS); - -@@ -140,8 +140,8 @@ - static Handle internalize_classname(Handle java_string, TRAPS) { return char_converter(java_string, '.', '/', THREAD); } - - // Conversion -- static symbolHandle as_symbol(Handle java_string, TRAPS); -- static symbolOop as_symbol_or_null(oop java_string); -+ static Symbol* as_symbol(Handle java_string, TRAPS); -+ static Symbol* as_symbol_or_null(oop java_string); - - // Testers - static bool is_instance(oop obj) { -@@ -193,7 +193,7 @@ - (*reference_klass) = KlassHandle(refk_oop); - return result; - } -- static symbolOop as_signature(oop java_class, bool intern_if_not_found, TRAPS); -+ static Symbol* as_signature(oop java_class, bool intern_if_not_found, TRAPS); - static void print_signature(oop java_class, outputStream *st); - // Testing - static bool is_instance(oop obj) { -@@ -1071,7 +1071,7 @@ - static oop ptype(oop mt, int index); - static int ptype_count(oop mt); - -- static symbolOop as_signature(oop mt, bool intern_if_not_found, TRAPS); -+ static Symbol* as_signature(oop mt, bool intern_if_not_found, TRAPS); - static void print_signature(oop mt, outputStream* st); - - static bool is_instance(oop obj) { -diff --git a/src/share/vm/classfile/loaderConstraints.cpp b/src/share/vm/classfile/loaderConstraints.cpp ---- openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp -+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp -@@ -31,28 +31,33 @@ - #include "utilities/hashtable.inline.hpp" - - LoaderConstraintTable::LoaderConstraintTable(int nof_buckets) -- : Hashtable(nof_buckets, sizeof(LoaderConstraintEntry)) {}; -+ : Hashtable<klassOop>(nof_buckets, sizeof(LoaderConstraintEntry)) {}; - - - LoaderConstraintEntry* LoaderConstraintTable::new_entry( -- unsigned int hash, symbolOop name, -+ unsigned int hash, Symbol* name, - klassOop klass, int num_loaders, - int max_loaders) { - LoaderConstraintEntry* entry; -- entry = (LoaderConstraintEntry*)Hashtable::new_entry(hash, klass); -+ entry = (LoaderConstraintEntry*)Hashtable<klassOop>::new_entry(hash, klass); - entry->set_name(name); - entry->set_num_loaders(num_loaders); - entry->set_max_loaders(max_loaders); - return entry; - } - -+void LoaderConstraintTable::free_entry(LoaderConstraintEntry *entry) { -+ // decrement name refcount before freeing -+ entry->name()->decrement_refcount(); -+ Hashtable<klassOop>::free_entry(entry); -+} -+ - - void LoaderConstraintTable::oops_do(OopClosure* f) { - for (int index = 0; index < table_size(); index++) { - for (LoaderConstraintEntry* probe = bucket(index); - probe != NULL; - probe = probe->next()) { -- f->do_oop((oop*)(probe->name_addr())); - if (probe->klass() != NULL) { - f->do_oop((oop*)probe->klass_addr()); - } -@@ -65,27 +70,13 @@ - } - } - --// We must keep the symbolOop used in the name alive. We'll use the --// loaders to decide if a particular entry can be purged. --void LoaderConstraintTable::always_strong_classes_do(OopClosure* blk) { -- // We must keep the symbolOop used in the name alive. -- for (int cindex = 0; cindex < table_size(); cindex++) { -- for (LoaderConstraintEntry* lc_probe = bucket(cindex); -- lc_probe != NULL; -- lc_probe = lc_probe->next()) { -- assert (lc_probe->name() != NULL, "corrupted loader constraint table"); -- blk->do_oop((oop*)lc_probe->name_addr()); -- } -- } --} -- - - // The loaderConstraintTable must always be accessed with the - // SystemDictionary lock held. This is true even for readers as - // entries in the table could be being dynamically resized. - - LoaderConstraintEntry** LoaderConstraintTable::find_loader_constraint( -- symbolHandle name, Handle loader) { -+ Symbol* name, Handle loader) { - - unsigned int hash = compute_hash(name); - int index = hash_to_index(hash); -@@ -93,7 +84,7 @@ - while (*pp) { - LoaderConstraintEntry* p = *pp; - if (p->hash() == hash) { -- if (p->name() == name()) { -+ if (p->name() == name) { - for (int i = p->num_loaders() - 1; i >= 0; i--) { - if (p->loader(i) == loader()) { - return pp; -@@ -177,7 +168,6 @@ - free_entry(probe); - } else { - #ifdef ASSERT -- assert(is_alive->do_object_b(probe->name()), "name should be live"); - if (probe->klass() != NULL) { - assert(is_alive->do_object_b(probe->klass()), "klass should be live"); - } -@@ -194,7 +184,7 @@ - } - } - --bool LoaderConstraintTable::add_entry(symbolHandle class_name, -+bool LoaderConstraintTable::add_entry(Symbol* class_name, - klassOop klass1, Handle class_loader1, - klassOop klass2, Handle class_loader2) { - int failure_code = 0; // encode different reasons for failing -@@ -233,7 +223,7 @@ - unsigned int hash = compute_hash(class_name); - int index = hash_to_index(hash); - LoaderConstraintEntry* p; -- p = new_entry(hash, class_name(), klass, 2, 2); -+ p = new_entry(hash, class_name, klass, 2, 2); - p->set_loaders(NEW_C_HEAP_ARRAY(oop, 2)); - p->set_loader(0, class_loader1()); - p->set_loader(1, class_loader2()); -@@ -244,7 +234,7 @@ - ResourceMark rm; - tty->print("[Adding new constraint for name: %s, loader[0]: %s," - " loader[1]: %s ]\n", -- class_name()->as_C_string(), -+ class_name->as_C_string(), - SystemDictionary::loader_name(class_loader1()), - SystemDictionary::loader_name(class_loader2()) - ); -@@ -257,7 +247,7 @@ - ResourceMark rm; - tty->print("[Setting class object in existing constraint for" - " name: %s and loader %s ]\n", -- class_name()->as_C_string(), -+ class_name->as_C_string(), - SystemDictionary::loader_name(class_loader1()) - ); - } -@@ -288,7 +278,7 @@ - } - tty->print("[Failed to add constraint for name: %s, loader[0]: %s," - " loader[1]: %s, Reason: %s ]\n", -- class_name()->as_C_string(), -+ class_name->as_C_string(), - SystemDictionary::loader_name(class_loader1()), - SystemDictionary::loader_name(class_loader2()), - reason -@@ -303,14 +293,14 @@ - // violated - bool LoaderConstraintTable::check_or_update(instanceKlassHandle k, - Handle loader, -- symbolHandle name) { -+ Symbol* name) { - LoaderConstraintEntry* p = *(find_loader_constraint(name, loader)); - if (p && p->klass() != NULL && p->klass() != k()) { - if (TraceLoaderConstraints) { - ResourceMark rm; - tty->print("[Constraint check failed for name %s, loader %s: " - "the presented class object differs from that stored ]\n", -- name()->as_C_string(), -+ name->as_C_string(), - SystemDictionary::loader_name(loader())); - } - return false; -@@ -321,7 +311,7 @@ - ResourceMark rm; - tty->print("[Updating constraint for name %s, loader %s, " - "by setting class object ]\n", -- name()->as_C_string(), -+ name->as_C_string(), - SystemDictionary::loader_name(loader())); - } - } -@@ -329,7 +319,7 @@ - } - } - --klassOop LoaderConstraintTable::find_constrained_klass(symbolHandle name, -+klassOop LoaderConstraintTable::find_constrained_klass(Symbol* name, - Handle loader) { - LoaderConstraintEntry *p = *(find_loader_constraint(name, loader)); - if (p != NULL && p->klass() != NULL) -@@ -442,11 +432,10 @@ - for (LoaderConstraintEntry* probe = bucket(cindex); - probe != NULL; - probe = probe->next()) { -- guarantee(probe->name()->is_symbol(), "should be symbol"); - if (probe->klass() != NULL) { - instanceKlass* ik = instanceKlass::cast(probe->klass()); - guarantee(ik->name() == probe->name(), "name should match"); -- symbolHandle name (thread, ik->name()); -+ Symbol* name = ik->name(); - Handle loader(thread, ik->class_loader()); - unsigned int d_hash = dictionary->compute_hash(name, loader); - int d_index = dictionary->hash_to_index(d_hash); -diff --git a/src/share/vm/classfile/loaderConstraints.hpp b/src/share/vm/classfile/loaderConstraints.hpp ---- openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp -+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp -@@ -31,7 +31,7 @@ - - class LoaderConstraintEntry; - --class LoaderConstraintTable : public Hashtable { -+class LoaderConstraintTable : public Hashtable<klassOop> { - friend class VMStructs; - private: - -@@ -40,39 +40,39 @@ - _nof_buckets = 1009 // number of buckets in hash table - }; - -- LoaderConstraintEntry** find_loader_constraint(symbolHandle name, -+ LoaderConstraintEntry** find_loader_constraint(Symbol* name, - Handle loader); - - public: - - LoaderConstraintTable(int nof_buckets); - -- LoaderConstraintEntry* new_entry(unsigned int hash, symbolOop name, -+ LoaderConstraintEntry* new_entry(unsigned int hash, Symbol* name, - klassOop klass, int num_loaders, - int max_loaders); -+ void free_entry(LoaderConstraintEntry *entry); - - LoaderConstraintEntry* bucket(int i) { -- return (LoaderConstraintEntry*)Hashtable::bucket(i); -+ return (LoaderConstraintEntry*)Hashtable<klassOop>::bucket(i); - } - - LoaderConstraintEntry** bucket_addr(int i) { -- return (LoaderConstraintEntry**)Hashtable::bucket_addr(i); -+ return (LoaderConstraintEntry**)Hashtable<klassOop>::bucket_addr(i); - } - - // GC support - void oops_do(OopClosure* f); -- void always_strong_classes_do(OopClosure* blk); - - // Check class loader constraints -- bool add_entry(symbolHandle name, klassOop klass1, Handle loader1, -+ bool add_entry(Symbol* name, klassOop klass1, Handle loader1, - klassOop klass2, Handle loader2); - - // Note: The main entry point for this module is via SystemDictionary. -- // SystemDictionary::check_signature_loaders(symbolHandle signature, -+ // SystemDictionary::check_signature_loaders(Symbol* signature, - // Handle loader1, Handle loader2, - // bool is_method, TRAPS) - -- klassOop find_constrained_klass(symbolHandle name, Handle loader); -+ klassOop find_constrained_klass(Symbol* name, Handle loader); - - // Class loader constraints - -@@ -83,7 +83,7 @@ - LoaderConstraintEntry** pp2, klassOop klass); - - bool check_or_update(instanceKlassHandle k, Handle loader, -- symbolHandle name); -+ Symbol* name); - - - void purge_loader_constraints(BoolObjectClosure* is_alive); -@@ -94,34 +94,36 @@ - #endif - }; - --class LoaderConstraintEntry : public HashtableEntry { -+class LoaderConstraintEntry : public HashtableEntry<klassOop> { - friend class VMStructs; - private: -- symbolOop _name; // class name -+ Symbol* _name; // class name - int _num_loaders; - int _max_loaders; - oop* _loaders; // initiating loaders - - public: - -- klassOop klass() { return (klassOop)literal(); } -- klassOop* klass_addr() { return (klassOop*)literal_addr(); } -+ klassOop klass() { return literal(); } -+ klassOop* klass_addr() { return literal_addr(); } - void set_klass(klassOop k) { set_literal(k); } - - LoaderConstraintEntry* next() { -- return (LoaderConstraintEntry*)HashtableEntry::next(); -+ return (LoaderConstraintEntry*)HashtableEntry<klassOop>::next(); - } - - LoaderConstraintEntry** next_addr() { -- return (LoaderConstraintEntry**)HashtableEntry::next_addr(); -+ return (LoaderConstraintEntry**)HashtableEntry<klassOop>::next_addr(); - } - void set_next(LoaderConstraintEntry* next) { -- HashtableEntry::set_next(next); -+ HashtableEntry<klassOop>::set_next(next); - } - -- symbolOop name() { return _name; } -- symbolOop* name_addr() { return &_name; } -- void set_name(symbolOop name) { _name = name; } -+ Symbol* name() { return _name; } -+ void set_name(Symbol* name) { -+ _name = name; -+ if (name != NULL) name->increment_refcount(); -+ } - - int num_loaders() { return _num_loaders; } - void set_num_loaders(int i) { _num_loaders = i; } -diff --git a/src/share/vm/classfile/placeholders.cpp b/src/share/vm/classfile/placeholders.cpp ---- openjdk/hotspot/src/share/vm/classfile/placeholders.cpp -+++ openjdk/hotspot/src/share/vm/classfile/placeholders.cpp -@@ -31,10 +31,12 @@ - - // Placeholder methods - --PlaceholderEntry* PlaceholderTable::new_entry(int hash, symbolOop name, -+PlaceholderEntry* PlaceholderTable::new_entry(int hash, Symbol* name, - oop loader, bool havesupername, -- symbolOop supername) { -- PlaceholderEntry* entry = (PlaceholderEntry*)Hashtable::new_entry(hash, name); -+ Symbol* supername) { -+ PlaceholderEntry* entry = (PlaceholderEntry*)Hashtable<Symbol*>::new_entry(hash, name); -+ // Hashtable with Symbol* literal must increment and decrement refcount. -+ name->increment_refcount(); - entry->set_loader(loader); - entry->set_havesupername(havesupername); - entry->set_supername(supername); -@@ -46,33 +48,40 @@ - return entry; - } - -+void PlaceholderTable::free_entry(PlaceholderEntry* entry) { -+ // decrement Symbol refcount here because Hashtable doesn't. -+ entry->literal()->decrement_refcount(); -+ if (entry->supername() != NULL) entry->supername()->decrement_refcount(); -+ Hashtable<Symbol*>::free_entry(entry); -+} -+ - - // Placeholder objects represent classes currently being loaded. - // All threads examining the placeholder table must hold the - // SystemDictionary_lock, so we don't need special precautions - // on store ordering here. - void PlaceholderTable::add_entry(int index, unsigned int hash, -- symbolHandle class_name, Handle class_loader, -- bool havesupername, symbolHandle supername){ -+ Symbol* class_name, Handle class_loader, -+ bool havesupername, Symbol* supername){ - assert_locked_or_safepoint(SystemDictionary_lock); -- assert(!class_name.is_null(), "adding NULL obj"); -+ assert(class_name != NULL, "adding NULL obj"); - - // Both readers and writers are locked so it's safe to just - // create the placeholder and insert it in the list without a membar. -- PlaceholderEntry* entry = new_entry(hash, class_name(), class_loader(), havesupername, supername()); -+ PlaceholderEntry* entry = new_entry(hash, class_name, class_loader(), havesupername, supername); - add_entry(index, entry); - } - - - // Remove a placeholder object. - void PlaceholderTable::remove_entry(int index, unsigned int hash, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader) { - assert_locked_or_safepoint(SystemDictionary_lock); - PlaceholderEntry** p = bucket_addr(index); - while (*p) { - PlaceholderEntry *probe = *p; -- if (probe->hash() == hash && probe->equals(class_name(), class_loader())) { -+ if (probe->hash() == hash && probe->equals(class_name, class_loader())) { - // Delete entry - *p = probe->next(); - free_entry(probe); -@@ -83,29 +92,28 @@ - } - - PlaceholderEntry* PlaceholderTable::get_entry(int index, unsigned int hash, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader) { - assert_locked_or_safepoint(SystemDictionary_lock); - -- symbolOop class_name_ = class_name(); - oop class_loader_ = class_loader(); - - for (PlaceholderEntry *place_probe = bucket(index); - place_probe != NULL; - place_probe = place_probe->next()) { - if (place_probe->hash() == hash && -- place_probe->equals(class_name_, class_loader_)) { -+ place_probe->equals(class_name, class_loader_)) { - return place_probe; - } - } - return NULL; - } - --symbolOop PlaceholderTable::find_entry(int index, unsigned int hash, -- symbolHandle class_name, -+Symbol* PlaceholderTable::find_entry(int index, unsigned int hash, -+ Symbol* class_name, - Handle class_loader) { - PlaceholderEntry* probe = get_entry(index, hash, class_name, class_loader); -- return (probe? probe->klass(): symbolOop(NULL)); -+ return (probe? probe->klassname(): (Symbol*)NULL); - } - - // find_and_add returns probe pointer - old or new -@@ -113,7 +121,7 @@ - // If entry exists, reuse entry - // For both, push SeenThread for classloadAction - // if havesupername: this is used for circularity for instanceklass loading --PlaceholderEntry* PlaceholderTable::find_and_add(int index, unsigned int hash, symbolHandle name, Handle loader, classloadAction action, symbolHandle supername, Thread* thread) { -+PlaceholderEntry* PlaceholderTable::find_and_add(int index, unsigned int hash, Symbol* name, Handle loader, classloadAction action, Symbol* supername, Thread* thread) { - PlaceholderEntry* probe = get_entry(index, hash, name, loader); - if (probe == NULL) { - // Nothing found, add place holder -@@ -122,7 +130,7 @@ - } else { - if (action == LOAD_SUPER) { - probe->set_havesupername(true); -- probe->set_supername(supername()); -+ probe->set_supername(supername); - } - } - if (probe) probe->add_seen_thread(thread, action); -@@ -145,7 +153,7 @@ - // Therefore - must always check SD first - // Ignores the case where entry is not found - void PlaceholderTable::find_and_remove(int index, unsigned int hash, -- symbolHandle name, Handle loader, Thread* thread) { -+ Symbol* name, Handle loader, Thread* thread) { - assert_locked_or_safepoint(SystemDictionary_lock); - PlaceholderEntry *probe = get_entry(index, hash, name, loader); - if (probe != NULL) { -@@ -158,7 +166,7 @@ - } - - PlaceholderTable::PlaceholderTable(int table_size) -- : TwoOopHashtable(table_size, sizeof(PlaceholderEntry)) { -+ : TwoOopHashtable<Symbol*>(table_size, sizeof(PlaceholderEntry)) { - } - - -@@ -174,26 +182,22 @@ - - - void PlaceholderEntry::oops_do(OopClosure* blk) { -- assert(klass() != NULL, "should have a non-null klass"); -- blk->do_oop((oop*)klass_addr()); -+ assert(klassname() != NULL, "should have a non-null klass"); - if (_loader != NULL) { - blk->do_oop(loader_addr()); - } -- if (_supername != NULL) { -- blk->do_oop((oop*)supername_addr()); -- } - if (_instanceKlass != NULL) { - blk->do_oop((oop*)instanceKlass_addr()); - } - } - - // do all entries in the placeholder table --void PlaceholderTable::entries_do(void f(symbolOop, oop)) { -+void PlaceholderTable::entries_do(void f(Symbol*, oop)) { - for (int index = 0; index < table_size(); index++) { - for (PlaceholderEntry* probe = bucket(index); - probe != NULL; - probe = probe->next()) { -- f(probe->klass(), probe->loader()); -+ f(probe->klassname(), probe->loader()); - } - } - } -@@ -202,7 +206,7 @@ - #ifndef PRODUCT - // Note, doesn't append a cr - void PlaceholderEntry::print() const { -- klass()->print_value(); -+ klassname()->print_value(); - if (loader() != NULL) { - tty->print(", loader "); - loader()->print_value(); -@@ -238,7 +242,6 @@ - guarantee(instanceKlass() == NULL - || Klass::cast(instanceKlass())->oop_is_instance(), - "checking type of instanceKlass result"); -- klass()->verify(); - } - - void PlaceholderTable::verify() { -diff --git a/src/share/vm/classfile/placeholders.hpp b/src/share/vm/classfile/placeholders.hpp ---- openjdk/hotspot/src/share/vm/classfile/placeholders.hpp -+++ openjdk/hotspot/src/share/vm/classfile/placeholders.hpp -@@ -34,35 +34,36 @@ - // being loaded, as well as arrays of primitives. - // - --class PlaceholderTable : public TwoOopHashtable { -+class PlaceholderTable : public TwoOopHashtable<Symbol*> { - friend class VMStructs; - - public: - PlaceholderTable(int table_size); - -- PlaceholderEntry* new_entry(int hash, symbolOop name, oop loader, bool havesupername, symbolOop supername); -+ PlaceholderEntry* new_entry(int hash, Symbol* name, oop loader, bool havesupername, Symbol* supername); -+ void free_entry(PlaceholderEntry* entry); - - PlaceholderEntry* bucket(int i) { -- return (PlaceholderEntry*)Hashtable::bucket(i); -+ return (PlaceholderEntry*)Hashtable<Symbol*>::bucket(i); - } - - PlaceholderEntry** bucket_addr(int i) { -- return (PlaceholderEntry**)Hashtable::bucket_addr(i); -+ return (PlaceholderEntry**)Hashtable<Symbol*>::bucket_addr(i); - } - - void add_entry(int index, PlaceholderEntry* new_entry) { -- Hashtable::add_entry(index, (HashtableEntry*)new_entry); -+ Hashtable<Symbol*>::add_entry(index, (HashtableEntry<Symbol*>*)new_entry); - } - -- void add_entry(int index, unsigned int hash, symbolHandle name, -- Handle loader, bool havesupername, symbolHandle supername); -+ void add_entry(int index, unsigned int hash, Symbol* name, -+ Handle loader, bool havesupername, Symbol* supername); - --// This returns a symbolOop to match type for SystemDictionary -- symbolOop find_entry(int index, unsigned int hash, -- symbolHandle name, Handle loader); -+ // This returns a Symbol* to match type for SystemDictionary -+ Symbol* find_entry(int index, unsigned int hash, -+ Symbol* name, Handle loader); - - PlaceholderEntry* get_entry(int index, unsigned int hash, -- symbolHandle name, Handle loader); -+ Symbol* name, Handle loader); - - // caller to create a placeholder entry must enumerate an action - // caller claims ownership of that action -@@ -84,22 +85,22 @@ - // If no entry exists, add a placeholder entry and push SeenThread - // If entry exists, reuse entry and push SeenThread for classloadAction - PlaceholderEntry* find_and_add(int index, unsigned int hash, -- symbolHandle name, Handle loader, -- classloadAction action, symbolHandle supername, -+ Symbol* name, Handle loader, -+ classloadAction action, Symbol* supername, - Thread* thread); - - void remove_entry(int index, unsigned int hash, -- symbolHandle name, Handle loader); -+ Symbol* name, Handle loader); - - // Remove placeholder information - void find_and_remove(int index, unsigned int hash, -- symbolHandle name, Handle loader, Thread* thread); -+ Symbol* name, Handle loader, Thread* thread); - - // GC support. - void oops_do(OopClosure* f); - - // JVMTI support -- void entries_do(void f(symbolOop, oop)); -+ void entries_do(void f(Symbol*, oop)); - - #ifndef PRODUCT - void print(); -@@ -151,14 +152,14 @@ - // on store ordering here. - // The system dictionary is the only user of this class. - --class PlaceholderEntry : public HashtableEntry { -+class PlaceholderEntry : public HashtableEntry<Symbol*> { - friend class VMStructs; - - - private: - oop _loader; // initiating loader - bool _havesupername; // distinguish between null supername, and unknown -- symbolOop _supername; -+ Symbol* _supername; - Thread* _definer; // owner of define token - klassOop _instanceKlass; // instanceKlass from successful define - SeenThread* _superThreadQ; // doubly-linked queue of Threads loading a superclass for this class -@@ -173,8 +174,7 @@ - - public: - // Simple accessors, used only by SystemDictionary -- symbolOop klass() const { return (symbolOop)literal(); } -- symbolOop* klass_addr() { return (symbolOop*)literal_addr(); } -+ Symbol* klassname() const { return literal(); } - - oop loader() const { return _loader; } - void set_loader(oop loader) { _loader = loader; } -@@ -183,9 +183,11 @@ - bool havesupername() const { return _havesupername; } - void set_havesupername(bool havesupername) { _havesupername = havesupername; } - -- symbolOop supername() const { return _supername; } -- void set_supername(symbolOop supername) { _supername = supername; } -- symbolOop* supername_addr() { return &_supername; } -+ Symbol* supername() const { return _supername; } -+ void set_supername(Symbol* supername) { -+ _supername = supername; -+ if (_supername != NULL) _supername->increment_refcount(); -+ } - - Thread* definer() const {return _definer; } - void set_definer(Thread* definer) { _definer = definer; } -@@ -204,17 +206,17 @@ - void set_defineThreadQ(SeenThread* SeenThread) { _defineThreadQ = SeenThread; } - - PlaceholderEntry* next() const { -- return (PlaceholderEntry*)HashtableEntry::next(); -+ return (PlaceholderEntry*)HashtableEntry<Symbol*>::next(); - } - - PlaceholderEntry** next_addr() { -- return (PlaceholderEntry**)HashtableEntry::next_addr(); -+ return (PlaceholderEntry**)HashtableEntry<Symbol*>::next_addr(); - } - - // Test for equality - // Entries are unique for class/classloader name pair -- bool equals(symbolOop class_name, oop class_loader) const { -- return (klass() == class_name && loader() == class_loader); -+ bool equals(Symbol* class_name, oop class_loader) const { -+ return (klassname() == class_name && loader() == class_loader); - } - - SeenThread* actionToQueue(PlaceholderTable::classloadAction action) { -diff --git a/src/share/vm/classfile/resolutionErrors.cpp b/src/share/vm/classfile/resolutionErrors.cpp ---- openjdk/hotspot/src/share/vm/classfile/resolutionErrors.cpp -+++ openjdk/hotspot/src/share/vm/classfile/resolutionErrors.cpp -@@ -32,12 +32,12 @@ - - // add new entry to the table - void ResolutionErrorTable::add_entry(int index, unsigned int hash, -- constantPoolHandle pool, int cp_index, symbolHandle error) -+ constantPoolHandle pool, int cp_index, Symbol* error) - { - assert_locked_or_safepoint(SystemDictionary_lock); -- assert(!pool.is_null() && !error.is_null(), "adding NULL obj"); -+ assert(!pool.is_null() && error != NULL, "adding NULL obj"); - -- ResolutionErrorEntry* entry = new_entry(hash, pool(), cp_index, error()); -+ ResolutionErrorEntry* entry = new_entry(hash, pool(), cp_index, error); - add_entry(index, entry); - } - -@@ -57,20 +57,35 @@ - return NULL; - } - -+void ResolutionErrorEntry::set_error(Symbol* e) { -+ assert(e == NULL || _error == NULL, "cannot reset error"); -+ _error = e; -+ if (_error != NULL) _error->increment_refcount(); -+} -+ - // create new error entry - ResolutionErrorEntry* ResolutionErrorTable::new_entry(int hash, constantPoolOop pool, -- int cp_index, symbolOop error) -+ int cp_index, Symbol* error) - { -- ResolutionErrorEntry* entry = (ResolutionErrorEntry*)Hashtable::new_entry(hash, pool); -+ ResolutionErrorEntry* entry = (ResolutionErrorEntry*)Hashtable<constantPoolOop>::new_entry(hash, pool); - entry->set_cp_index(cp_index); -+ NOT_PRODUCT(entry->set_error(NULL);) - entry->set_error(error); - - return entry; - } - -+void ResolutionErrorTable::free_entry(ResolutionErrorEntry *entry) { -+ // decrement error refcount -+ assert(entry->error() != NULL, "error should be set"); -+ entry->error()->decrement_refcount(); -+ Hashtable<constantPoolOop>::free_entry(entry); -+} -+ -+ - // create resolution error table - ResolutionErrorTable::ResolutionErrorTable(int table_size) -- : Hashtable(table_size, sizeof(ResolutionErrorEntry)) { -+ : Hashtable<constantPoolOop>(table_size, sizeof(ResolutionErrorEntry)) { - } - - // GC support -@@ -80,7 +95,7 @@ - probe != NULL; - probe = probe->next()) { - assert(probe->pool() != (constantPoolOop)NULL, "resolution error table is corrupt"); -- assert(probe->error() != (symbolOop)NULL, "resolution error table is corrupt"); -+ assert(probe->error() != (Symbol*)NULL, "resolution error table is corrupt"); - probe->oops_do(f); - } - } -@@ -89,20 +104,6 @@ - // GC support - void ResolutionErrorEntry::oops_do(OopClosure* blk) { - blk->do_oop((oop*)pool_addr()); -- blk->do_oop((oop*)error_addr()); --} -- --// We must keep the symbolOop used in the error alive. The constantPoolOop will --// decide when the entry can be purged. --void ResolutionErrorTable::always_strong_classes_do(OopClosure* blk) { -- for (int i = 0; i < table_size(); i++) { -- for (ResolutionErrorEntry* probe = bucket(i); -- probe != NULL; -- probe = probe->next()) { -- assert(probe->error() != (symbolOop)NULL, "resolution error table is corrupt"); -- blk->do_oop((oop*)probe->error_addr()); -- } -- } - } - - // Remove unloaded entries from the table -diff --git a/src/share/vm/classfile/resolutionErrors.hpp b/src/share/vm/classfile/resolutionErrors.hpp ---- openjdk/hotspot/src/share/vm/classfile/resolutionErrors.hpp -+++ openjdk/hotspot/src/share/vm/classfile/resolutionErrors.hpp -@@ -33,27 +33,28 @@ - // ResolutionError objects are used to record errors encountered during - // constant pool resolution (JVMS 5.4.3). - --class ResolutionErrorTable : public Hashtable { -+class ResolutionErrorTable : public Hashtable<constantPoolOop> { - - public: - ResolutionErrorTable(int table_size); - -- ResolutionErrorEntry* new_entry(int hash, constantPoolOop pool, int cp_index, symbolOop error); -+ ResolutionErrorEntry* new_entry(int hash, constantPoolOop pool, int cp_index, Symbol* error); -+ void free_entry(ResolutionErrorEntry *entry); - - ResolutionErrorEntry* bucket(int i) { -- return (ResolutionErrorEntry*)Hashtable::bucket(i); -+ return (ResolutionErrorEntry*)Hashtable<constantPoolOop>::bucket(i); - } - - ResolutionErrorEntry** bucket_addr(int i) { -- return (ResolutionErrorEntry**)Hashtable::bucket_addr(i); -+ return (ResolutionErrorEntry**)Hashtable<constantPoolOop>::bucket_addr(i); - } - - void add_entry(int index, ResolutionErrorEntry* new_entry) { -- Hashtable::add_entry(index, (HashtableEntry*)new_entry); -+ Hashtable<constantPoolOop>::add_entry(index, (HashtableEntry<constantPoolOop>*)new_entry); - } - - void add_entry(int index, unsigned int hash, -- constantPoolHandle pool, int which, symbolHandle error); -+ constantPoolHandle pool, int which, Symbol* error); - - - // find error given the constant pool and constant pool index -@@ -68,18 +69,15 @@ - // purges unloaded entries from the table - void purge_resolution_errors(BoolObjectClosure* is_alive); - -- // this table keeps symbolOops alive -- void always_strong_classes_do(OopClosure* blk); -- - // GC support. - void oops_do(OopClosure* f); - }; - - --class ResolutionErrorEntry : public HashtableEntry { -+class ResolutionErrorEntry : public HashtableEntry<constantPoolOop> { - private: - int _cp_index; -- symbolOop _error; -+ Symbol* _error; - - public: - constantPoolOop pool() const { return (constantPoolOop)literal(); } -@@ -88,16 +86,15 @@ - int cp_index() const { return _cp_index; } - void set_cp_index(int cp_index) { _cp_index = cp_index; } - -- symbolOop error() const { return _error; } -- void set_error(symbolOop e) { _error = e; } -- symbolOop* error_addr() { return &_error; } -+ Symbol* error() const { return _error; } -+ void set_error(Symbol* e); - - ResolutionErrorEntry* next() const { -- return (ResolutionErrorEntry*)HashtableEntry::next(); -+ return (ResolutionErrorEntry*)HashtableEntry<constantPoolOop>::next(); - } - - ResolutionErrorEntry** next_addr() { -- return (ResolutionErrorEntry**)HashtableEntry::next_addr(); -+ return (ResolutionErrorEntry**)HashtableEntry<constantPoolOop>::next_addr(); - } - - // GC support -diff --git a/src/share/vm/classfile/stackMapFrame.cpp b/src/share/vm/classfile/stackMapFrame.cpp ---- openjdk/hotspot/src/share/vm/classfile/stackMapFrame.cpp -+++ openjdk/hotspot/src/share/vm/classfile/stackMapFrame.cpp -@@ -27,7 +27,7 @@ - #include "classfile/verifier.hpp" - #include "memory/resourceArea.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.inline.hpp" - #include "utilities/globalDefinitions.hpp" - -@@ -90,8 +90,7 @@ - - VerificationType StackMapFrame::set_locals_from_arg( - const methodHandle m, VerificationType thisKlass, TRAPS) { -- symbolHandle signature(THREAD, m->signature()); -- SignatureStream ss(signature); -+ SignatureStream ss(m->signature()); - int init_local_num = 0; - if (!m->is_static()) { - init_local_num++; -@@ -118,8 +117,14 @@ - case T_OBJECT: - case T_ARRAY: - { -- symbolOop sig = ss.as_symbol(CHECK_(VerificationType::bogus_type())); -- return VerificationType::reference_type(symbolHandle(THREAD, sig)); -+ Symbol* sig = ss.as_symbol(CHECK_(VerificationType::bogus_type())); -+ // Create another symbol to save as signature stream unreferences -+ // this symbol. -+ Symbol* sig_copy = -+ verifier()->create_temporary_symbol(sig, 0, sig->utf8_length(), -+ CHECK_(VerificationType::bogus_type())); -+ assert(sig_copy == sig, "symbols don't match"); -+ return VerificationType::reference_type(sig_copy); - } - case T_INT: return VerificationType::integer_type(); - case T_BYTE: return VerificationType::byte_type(); -@@ -157,7 +162,7 @@ - VerificationType* from, VerificationType* to, int32_t len, TRAPS) const { - for (int32_t i = 0; i < len; i++) { - bool subtype = to[i].is_assignable_from( -- from[i], verifier()->current_class(), THREAD); -+ from[i], verifier(), THREAD); - if (!subtype) { - return false; - } -@@ -187,7 +192,7 @@ - } - VerificationType top = _stack[--_stack_size]; - bool subtype = type.is_assignable_from( -- top, verifier()->current_class(), CHECK_(VerificationType::bogus_type())); -+ top, verifier(), CHECK_(VerificationType::bogus_type())); - if (!subtype) { - verifier()->verify_error(_offset, "Bad type on operand stack"); - return VerificationType::bogus_type(); -@@ -203,7 +208,7 @@ - return VerificationType::bogus_type(); - } - bool subtype = type.is_assignable_from(_locals[index], -- verifier()->current_class(), CHECK_(VerificationType::bogus_type())); -+ verifier(), CHECK_(VerificationType::bogus_type())); - if (!subtype) { - verifier()->verify_error(_offset, "Bad local variable type"); - return VerificationType::bogus_type(); -@@ -221,9 +226,9 @@ - return; - } - bool subtype1 = type1.is_assignable_from( -- _locals[index], verifier()->current_class(), CHECK); -+ _locals[index], verifier(), CHECK); - bool subtype2 = type2.is_assignable_from( -- _locals[index+1], verifier()->current_class(), CHECK); -+ _locals[index+1], verifier(), CHECK); - if (!subtype1 || !subtype2) { - verifier()->verify_error(_offset, "Bad local variable type"); - return; -diff --git a/src/share/vm/classfile/stackMapFrame.hpp b/src/share/vm/classfile/stackMapFrame.hpp ---- openjdk/hotspot/src/share/vm/classfile/stackMapFrame.hpp -+++ openjdk/hotspot/src/share/vm/classfile/stackMapFrame.hpp -@@ -177,8 +177,7 @@ - if (_stack_size != 0) { - VerificationType top = _stack[_stack_size - 1]; - bool subtype = type.is_assignable_from( -- top, verifier()->current_class(), -- CHECK_(VerificationType::bogus_type())); -+ top, verifier(), CHECK_(VerificationType::bogus_type())); - if (subtype) { - _stack_size --; - NOT_PRODUCT( _stack[_stack_size] = VerificationType::bogus_type(); ) -@@ -194,11 +193,9 @@ - assert(type2.is_long() || type2.is_double(), "must be long/double_2"); - if (_stack_size >= 2) { - VerificationType top1 = _stack[_stack_size - 1]; -- bool subtype1 = type1.is_assignable_from( -- top1, verifier()->current_class(), CHECK); -+ bool subtype1 = type1.is_assignable_from(top1, verifier(), CHECK); - VerificationType top2 = _stack[_stack_size - 2]; -- bool subtype2 = type2.is_assignable_from( -- top2, verifier()->current_class(), CHECK); -+ bool subtype2 = type2.is_assignable_from(top2, verifier(), CHECK); - if (subtype1 && subtype2) { - _stack_size -= 2; - NOT_PRODUCT( _stack[_stack_size] = VerificationType::bogus_type(); ) -diff --git a/src/share/vm/classfile/stackMapTable.cpp b/src/share/vm/classfile/stackMapTable.cpp ---- openjdk/hotspot/src/share/vm/classfile/stackMapTable.cpp -+++ openjdk/hotspot/src/share/vm/classfile/stackMapTable.cpp -@@ -184,8 +184,7 @@ - _stream->stackmap_format_error("bad class index", THREAD); - return VerificationType::bogus_type(); - } -- return VerificationType::reference_type( -- symbolHandle(THREAD, _cp->klass_name_at(class_index))); -+ return VerificationType::reference_type(_cp->klass_name_at(class_index)); - } - if (tag == ITEM_UninitializedThis) { - if (flags != NULL) { -diff --git a/src/share/vm/classfile/symbolTable.cpp b/src/share/vm/classfile/symbolTable.cpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -32,7 +32,6 @@ - #include "memory/gcLocker.inline.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" --#include "oops/symbolKlass.hpp" - #include "runtime/mutexLocker.hpp" - #include "utilities/hashtable.inline.hpp" - #include "utilities/numberSeq.hpp" -@@ -42,6 +41,87 @@ - SymbolTable* SymbolTable::_the_table = NULL; - bool SymbolTable::_needs_rehashing = false; - -+Symbol* SymbolTable::allocate_symbol(const u1* name, int len, TRAPS) { -+ // Don't allow symbols to be created which cannot fit in a Symbol*. -+ if (len > Symbol::max_length()) { -+ THROW_MSG_0(vmSymbols::java_lang_InternalError(), -+ "name is too long to represent"); -+ } -+ Symbol* sym = new (len) Symbol(name, len); -+ assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted"); -+ return sym; -+} -+ -+bool SymbolTable::allocate_symbols(int names_count, const u1** names, -+ int* lengths, Symbol** syms, TRAPS) { -+ for (int i = 0; i< names_count; i++) { -+ if (lengths[i] > Symbol::max_length()) { -+ THROW_MSG_0(vmSymbols::java_lang_InternalError(), -+ "name is too long to represent"); -+ } -+ } -+ -+ for (int i = 0; i< names_count; i++) { -+ int len = lengths[i]; -+ syms[i] = new (len) Symbol(names[i], len); -+ assert(syms[i] != NULL, "new should call vm_exit_out_of_memory if " -+ "C_HEAP is exhausted"); -+ } -+ return true; -+} -+ -+// Call function for all symbols in the symbol table. -+void SymbolTable::symbols_do(SymbolClosure *cl) { -+ const int n = the_table()->table_size(); -+ for (int i = 0; i < n; i++) { -+ for (HashtableEntry<Symbol*>* p = the_table()->bucket(i); -+ p != NULL; -+ p = p->next()) { -+ cl->do_symbol(p->literal_addr()); -+ } -+ } -+} -+ -+int SymbolTable::symbols_removed = 0; -+int SymbolTable::symbols_counted = 0; -+ -+// Remove unreferenced symbols from the symbol table -+// This is done late during GC. This doesn't use the hash table unlink because -+// it assumes that the literals are oops. -+void SymbolTable::unlink() { -+ int removed = 0; -+ int total = 0; -+ int memory_total = 0; -+ for (int i = 0; i < the_table()->table_size(); ++i) { -+ for (HashtableEntry<Symbol*>** p = the_table()->bucket_addr(i); *p != NULL; ) { -+ HashtableEntry<Symbol*>* entry = *p; -+ if (entry->is_shared()) { -+ break; -+ } -+ Symbol* s = entry->literal(); -+ memory_total += s->object_size(); -+ total++; -+ assert(s != NULL, "just checking"); -+ // If reference count is zero, remove. -+ if (s->refcount() == 0) { -+ delete s; -+ removed++; -+ *p = entry->next(); -+ the_table()->free_entry(entry); -+ } else { -+ p = entry->next_addr(); -+ } -+ } -+ } -+ symbols_removed += removed; -+ symbols_counted += total; -+ if (PrintGCDetails) { -+ gclog_or_tty->print(" [Symbols=%d size=%dK] ", total, -+ (memory_total*HeapWordSize)/1024); -+ } -+} -+ -+ - // Create a new table and using alternate hash code, populate the new table - // with the existing strings. Set flag to use the alternate hash code afterwards. - void SymbolTable::rehash_table() { -@@ -64,14 +144,16 @@ - - // Lookup a symbol in a bucket. - --symbolOop SymbolTable::lookup(int index, const char* name, -+Symbol* SymbolTable::lookup(int index, const char* name, - int len, unsigned int hash) { - int count = 0; -- for (HashtableEntry* e = bucket(index); e != NULL; e = e->next()) { -+ for (HashtableEntry<Symbol*>* e = bucket(index); e != NULL; e = e->next()) { - count++; - if (e->hash() == hash) { -- symbolOop sym = symbolOop(e->literal()); -+ Symbol* sym = e->literal(); - if (sym->equals(name, len)) { -+ // something is referencing this symbol now. -+ sym->increment_refcount(); - return sym; - } - } -@@ -98,29 +180,21 @@ - // entries in the symbol table during normal execution (only during - // safepoints). - --symbolOop SymbolTable::lookup(const char* name, int len, TRAPS) { -+Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { - unsigned int hashValue = hash_symbol(name, len); - int index = the_table()->hash_to_index(hashValue); - -- symbolOop s = the_table()->lookup(index, name, len, hashValue); -+ Symbol* s = the_table()->lookup(index, name, len, hashValue); - - // Found - if (s != NULL) return s; - -- // We assume that lookup() has been called already, that it failed, -- // and symbol was not found. We create the symbol here. -- symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -- symbolOop s_oop = sk->allocate_symbol((u1*)name, len, CHECK_NULL); -- symbolHandle sym (THREAD, s_oop); -- -- // Allocation must be done before grabbing the SymbolTable_lock lock -- MutexLocker ml(SymbolTable_lock, THREAD); -- - // Otherwise, add to symbol to table -- return the_table()->basic_add(sym, index, (u1*)name, len, hashValue, CHECK_NULL); -+ return the_table()->basic_add(index, (u1*)name, len, hashValue, CHECK_NULL); -+; - } - --symbolOop SymbolTable::lookup(symbolHandle sym, int begin, int end, TRAPS) { -+Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { - char* buffer; - int index, len; - unsigned int hashValue; -@@ -132,7 +206,7 @@ - len = end - begin; - hashValue = hash_symbol(name, len); - index = the_table()->hash_to_index(hashValue); -- symbolOop s = the_table()->lookup(index, name, len, hashValue); -+ Symbol* s = the_table()->lookup(index, name, len, hashValue); - - // Found - if (s != NULL) return s; -@@ -153,30 +227,22 @@ - // We can't include the code in No_Safepoint_Verifier because of the - // ResourceMark. - -- // We assume that lookup() has been called already, that it failed, -- // and symbol was not found. We create the symbol here. -- symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -- symbolOop s_oop = sk->allocate_symbol((u1*)buffer, len, CHECK_NULL); -- symbolHandle newsym (THREAD, s_oop); -- -- // Allocation must be done before grabbing the SymbolTable_lock lock -- MutexLocker ml(SymbolTable_lock, THREAD); -- -- return the_table()->basic_add(newsym, index, (u1*)buffer, len, hashValue, CHECK_NULL); -+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, CHECK_NULL); - } - --symbolOop SymbolTable::lookup_only(const char* name, int len, -+Symbol* SymbolTable::lookup_only(const char* name, int len, - unsigned int& hash) { - hash = hash_symbol(name, len); - int index = the_table()->hash_to_index(hash); - -- return the_table()->lookup(index, name, len, hash); -+ Symbol* s = the_table()->lookup(index, name, len, hash); -+ return s; - } - - // Suggestion: Push unicode-based lookup all the way into the hashing - // and probing logic, so there is no need for convert_to_utf8 until --// an actual new symbolOop is created. --symbolOop SymbolTable::lookup_unicode(const jchar* name, int utf16_length, TRAPS) { -+// an actual new Symbol* is created. -+Symbol* SymbolTable::lookup_unicode(const jchar* name, int utf16_length, TRAPS) { - int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); - char stack_buf[128]; - if (utf8_length < (int) sizeof(stack_buf)) { -@@ -191,7 +257,7 @@ - } - } - --symbolOop SymbolTable::lookup_only_unicode(const jchar* name, int utf16_length, -+Symbol* SymbolTable::lookup_only_unicode(const jchar* name, int utf16_length, - unsigned int& hash) { - int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); - char stack_buf[128]; -@@ -210,54 +276,33 @@ - void SymbolTable::add(constantPoolHandle cp, int names_count, - const char** names, int* lengths, int* cp_indices, - unsigned int* hashValues, TRAPS) { -- -- symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -- symbolOop sym_oops[symbol_alloc_batch_size]; -- bool allocated = sk->allocate_symbols(names_count, names, lengths, -- sym_oops, CHECK); -- if (!allocated) { -+ SymbolTable* table = the_table(); -+ bool added = table->basic_add(cp, names_count, names, lengths, -+ cp_indices, hashValues, CHECK); -+ if (!added) { - // do it the hard way - for (int i=0; i<names_count; i++) { - assert(!Universe::heap()->is_in_reserved(names[i]) || GC_locker::is_active(), -+ int index = table->hash_to_index(hashValues[i]); -+ Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], -+ hashValues[i], CHECK); -+ cp->symbol_at_put(cp_indices[i], sym); -+ } -+ } -+} -+ -+Symbol* SymbolTable::basic_add(int index, u1 *name, int len, -+ unsigned int hashValue_arg, TRAPS) { -+ assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), - "proposed name of symbol must be stable"); - -- // We assume that lookup() has been called already, that it failed, -- // and symbol was not found. We create the symbol here. -- symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -- symbolOop s_oop = sk->allocate_symbol((u1*)names[i], lengths[i], CHECK); -- symbolHandle sym (THREAD, s_oop); -- -- // Allocation must be done before grabbing the SymbolTable_lock lock -- MutexLocker ml(SymbolTable_lock, THREAD); -- -- SymbolTable* table = the_table(); -- int index = table->hash_to_index(hashValues[i]); -- symbolOop s = table->basic_add(sym, index, (u1*)names[i], lengths[i], -- hashValues[i], CHECK); -- cp->symbol_at_put(cp_indices[i], s); -- } -- return; -- } -- -- symbolHandle syms[symbol_alloc_batch_size]; -- for (int i=0; i<names_count; i++) { -- syms[i] = symbolHandle(THREAD, sym_oops[i]); -- } -+ // We assume that lookup() has been called already, that it failed, -+ // and symbol was not found. We create the symbol here. -+ Symbol* sym = allocate_symbol(name, len, CHECK_NULL); - - // Allocation must be done before grabbing the SymbolTable_lock lock - MutexLocker ml(SymbolTable_lock, THREAD); - -- SymbolTable* table = the_table(); -- bool added = table->basic_add(syms, cp, names_count, names, lengths, -- cp_indices, hashValues, CHECK); -- assert(added, "should always return true"); --} -- --symbolOop SymbolTable::basic_add(symbolHandle sym, int index_arg, u1 *name, int len, -- unsigned int hashValue_arg, TRAPS) { -- // Cannot hit a safepoint in this function because the "this" pointer can move. -- No_Safepoint_Verifier nsv; -- - assert(sym->equals((char*)name, len), "symbol must be properly initialized"); - - // Check if the symbol table has been rehashed, if so, need to recalculate -@@ -275,25 +320,34 @@ - // Since look-up was done lock-free, we need to check if another - // thread beat us in the race to insert the symbol. - -- symbolOop test = lookup(index, (char*)name, len, hashValue); -+ Symbol* test = lookup(index, (char*)name, len, hashValue); - if (test != NULL) { - // A race occurred and another thread introduced the symbol, this one - // will be dropped and collected. -+ delete sym; -+ assert(test->refcount() != 0, "lookup should have incremented the count"); - return test; - } - -- HashtableEntry* entry = new_entry(hashValue, sym()); -+ HashtableEntry<Symbol*>* entry = new_entry(hashValue, sym); -+ sym->increment_refcount(); - add_entry(index, entry); -- return sym(); -+ return sym; - } - --bool SymbolTable::basic_add(symbolHandle* syms, -- constantPoolHandle cp, int names_count, -+bool SymbolTable::basic_add(constantPoolHandle cp, int names_count, - const char** names, int* lengths, - int* cp_indices, unsigned int* hashValues, - TRAPS) { -- // Cannot hit a safepoint in this function because the "this" pointer can move. -- No_Safepoint_Verifier nsv; -+ Symbol* syms[symbol_alloc_batch_size]; -+ bool allocated = allocate_symbols(names_count, (const u1**)names, lengths, -+ syms, CHECK_false); -+ if (!allocated) { -+ return false; -+ } -+ -+ // Allocation must be done before grabbing the SymbolTable_lock lock -+ MutexLocker ml(SymbolTable_lock, THREAD); - - for (int i=0; i<names_count; i++) { - assert(syms[i]->equals(names[i], lengths[i]), "symbol must be properly initialized"); -@@ -308,29 +362,31 @@ - // Since look-up was done lock-free, we need to check if another - // thread beat us in the race to insert the symbol. - int index = hash_to_index(hashValue); -- symbolOop test = lookup(index, names[i], lengths[i], hashValue); -+ Symbol* test = lookup(index, names[i], lengths[i], hashValue); - if (test != NULL) { - // A race occurred and another thread introduced the symbol, this one - // will be dropped and collected. Use test instead. - cp->symbol_at_put(cp_indices[i], test); -+ assert(test->refcount() != 0, "lookup should have incremented the count"); -+ delete syms[i]; - } else { -- symbolOop sym = syms[i](); -- HashtableEntry* entry = new_entry(hashValue, sym); -+ Symbol* sym = syms[i]; -+ HashtableEntry<Symbol*>* entry = new_entry(hashValue, sym); -+ sym->increment_refcount(); // increment refcount in external hashtable - add_entry(index, entry); - cp->symbol_at_put(cp_indices[i], sym); - } - } -- return true; // always returns true -+ -+ return true; - } - - void SymbolTable::verify() { - for (int i = 0; i < the_table()->table_size(); ++i) { -- HashtableEntry* p = the_table()->bucket(i); -+ HashtableEntry<Symbol*>* p = the_table()->bucket(i); - for ( ; p != NULL; p = p->next()) { -- symbolOop s = symbolOop(p->literal()); -+ Symbol* s = (Symbol*)(p->literal()); - guarantee(s != NULL, "symbol is NULL"); -- s->verify(); -- guarantee(s->is_perm(), "symbol not in permspace"); - unsigned int h = hash_symbol((const char*)s->bytes(), s->utf8_length()); - guarantee(p->hash() == h, "broken hash in symbol table entry"); - guarantee(the_table()->hash_to_index(h) == i, -@@ -343,7 +399,7 @@ - NumberSeq summary; - for (int i = 0; i < the_table()->table_size(); ++i) { - int count = 0; -- for (HashtableEntry* e = the_table()->bucket(i); -+ for (HashtableEntry<Symbol*>* e = the_table()->bucket(i); - e != NULL; e = e->next()) { - count++; - } -@@ -376,10 +432,14 @@ - int total = 0; - int max_symbols = 0; - int out_of_range = 0; -+ int memory_total = 0; -+ int count = 0; - for (i = 0; i < the_table()->table_size(); i++) { -- HashtableEntry* p = the_table()->bucket(i); -+ HashtableEntry<Symbol*>* p = the_table()->bucket(i); - for ( ; p != NULL; p = p->next()) { -- int counter = symbolOop(p->literal())->utf8_length(); -+ memory_total += p->literal()->object_size(); -+ count++; -+ int counter = p->literal()->utf8_length(); - total += counter; - if (counter < results_length) { - results[counter]++; -@@ -390,6 +450,17 @@ - } - } - tty->print_cr("Symbol Table:"); -+ tty->print_cr("Total number of symbols %5d", count); -+ tty->print_cr("Total size in memory %5dK", -+ (memory_total*HeapWordSize)/1024); -+ tty->print_cr("Total counted %5d", symbols_counted); -+ tty->print_cr("Total removed %5d", symbols_removed); -+ if (symbols_counted > 0) { -+ tty->print_cr("Percent removed %3.2f", -+ ((float)symbols_removed/(float)symbols_counted)* 100); -+ } -+ tty->print_cr("Reference counts %5d", Symbol::_total_count); -+ tty->print_cr("Histogram of symbol length:"); - tty->print_cr("%8s %5d", "Total ", total); - tty->print_cr("%8s %5d", "Maximum", max_symbols); - tty->print_cr("%8s %3.2f", "Average", -@@ -401,22 +472,41 @@ - tty->print_cr("%6d %10d", i, results[i]); - } - } -- int line_length = 70; -- tty->print_cr("%s %30s", " Length", "Number chains that length"); -- for (i = 0; i < results_length; i++) { -- if (results[i] > 0) { -- tty->print("%4d", i); -- for (j = 0; (j < results[i]) && (j < line_length); j++) { -- tty->print("%1s", "*"); -+ if (Verbose) { -+ int line_length = 70; -+ tty->print_cr("%s %30s", " Length", "Number chains that length"); -+ for (i = 0; i < results_length; i++) { -+ if (results[i] > 0) { -+ tty->print("%4d", i); -+ for (j = 0; (j < results[i]) && (j < line_length); j++) { -+ tty->print("%1s", "*"); -+ } -+ if (j == line_length) { -+ tty->print("%1s", "+"); -+ } -+ tty->cr(); - } -- if (j == line_length) { -- tty->print("%1s", "+"); -+ } -+ } -+ tty->print_cr(" %s %d: %d\n", "Number chains longer than", -+ results_length, out_of_range); -+} -+ -+void SymbolTable::print() { -+ for (int i = 0; i < the_table()->table_size(); ++i) { -+ HashtableEntry<Symbol*>** p = the_table()->bucket_addr(i); -+ HashtableEntry<Symbol*>* entry = the_table()->bucket(i); -+ if (entry != NULL) { -+ while (entry != NULL) { -+ tty->print(PTR_FORMAT " ", entry->literal()); -+ entry->literal()->print(); -+ tty->print(" %d", entry->literal()->refcount()); -+ p = entry->next_addr(); -+ entry = (HashtableEntry<Symbol*>*)HashtableEntry<Symbol*>::make_ptr(*p); - } - tty->cr(); - } - } -- tty->print_cr(" %s %d: %d\n", "Number chains longer than", -- results_length, out_of_range); - } - #endif // PRODUCT - -@@ -476,7 +566,7 @@ - oop StringTable::lookup(int index, jchar* name, - int len, unsigned int hash) { - int count = 0; -- for (HashtableEntry* l = bucket(index); l != NULL; l = l->next()) { -+ for (HashtableEntry<oop>* l = bucket(index); l != NULL; l = l->next()) { - count++; - if (l->hash() == hash) { - if (java_lang_String::equals(l->literal(), name, len)) { -@@ -492,11 +582,22 @@ - } - - --oop StringTable::basic_add(int index_arg, Handle string, jchar* name, -+oop StringTable::basic_add(int index, Handle string_or_null, jchar* name, - int len, unsigned int hashValue_arg, TRAPS) { -+ debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); -+ assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), -+ "proposed name of symbol must be stable"); - -- // Cannot hit a safepoint in this function because the "this" pointer can move. -- No_Safepoint_Verifier nsv; -+ Handle string; -+ // try to reuse the string if possible -+ if (!string_or_null.is_null() && (!JavaObjectsInPerm || string_or_null()->is_perm())) { -+ string = string_or_null; -+ } else { -+ string = java_lang_String::create_tenured_from_unicode(name, len, CHECK_NULL); -+ } -+ -+ // Allocation must be done before grapping the SymbolTable_lock lock -+ MutexLocker ml(StringTable_lock, THREAD); - - assert(java_lang_String::equals(string(), name, len), - "string must be properly initialized"); -@@ -522,13 +623,13 @@ - return test; - } - -- HashtableEntry* entry = new_entry(hashValue, string()); -+ HashtableEntry<oop>* entry = new_entry(hashValue, string()); - add_entry(index, entry); - return string(); - } - - --oop StringTable::lookup(symbolOop symbol) { -+oop StringTable::lookup(Symbol* symbol) { - ResourceMark rm; - int length; - jchar* chars = symbol->as_unicode(length); -@@ -542,32 +643,17 @@ - int len, TRAPS) { - unsigned int hashValue = hash_string(name, len); - int index = the_table()->hash_to_index(hashValue); -- oop found_string = the_table()->lookup(index, name, len, hashValue); -+ oop string = the_table()->lookup(index, name, len, hashValue); - - // Found -- if (found_string != NULL) return found_string; -- -- debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); -- assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), -- "proposed name of symbol must be stable"); -- -- Handle string; -- // try to reuse the string if possible -- if (!string_or_null.is_null() && string_or_null()->is_perm()) { -- string = string_or_null; -- } else { -- string = java_lang_String::create_tenured_from_unicode(name, len, CHECK_NULL); -- } -- -- // Allocation must be done before grabbing the StringTable_lock lock -- MutexLocker ml(StringTable_lock, THREAD); -+ if (string != NULL) return string; - - // Otherwise, add to symbol to table -- return the_table()->basic_add(index, string, name, len, -+ return the_table()->basic_add(index, string_or_null, name, len, - hashValue, CHECK_NULL); - } - --oop StringTable::intern(symbolOop symbol, TRAPS) { -+oop StringTable::intern(Symbol* symbol, TRAPS) { - if (symbol == NULL) return NULL; - ResourceMark rm(THREAD); - int length; -@@ -601,17 +687,55 @@ - return result; - } - -+void StringTable::unlink(BoolObjectClosure* is_alive) { -+ // Readers of the table are unlocked, so we should only be removing -+ // entries at a safepoint. -+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); -+ for (int i = 0; i < the_table()->table_size(); ++i) { -+ for (HashtableEntry<oop>** p = the_table()->bucket_addr(i); *p != NULL; ) { -+ HashtableEntry<oop>* entry = *p; -+ if (entry->is_shared()) { -+ break; -+ } -+ assert(entry->literal() != NULL, "just checking"); -+ if (is_alive->do_object_b(entry->literal())) { -+ p = entry->next_addr(); -+ } else { -+ *p = entry->next(); -+ the_table()->free_entry(entry); -+ } -+ } -+ } -+} -+ -+void StringTable::oops_do(OopClosure* f) { -+ for (int i = 0; i < the_table()->table_size(); ++i) { -+ HashtableEntry<oop>** p = the_table()->bucket_addr(i); -+ HashtableEntry<oop>* entry = the_table()->bucket(i); -+ while (entry != NULL) { -+ f->do_oop((oop*)entry->literal_addr()); -+ -+ // Did the closure remove the literal from the table? -+ if (entry->literal() == NULL) { -+ assert(!entry->is_shared(), "immutable hashtable entry?"); -+ *p = entry->next(); -+ the_table()->free_entry(entry); -+ } else { -+ p = entry->next_addr(); -+ } -+ entry = (HashtableEntry<oop>*)HashtableEntry<oop>::make_ptr(*p); -+ } -+ } -+} -+ - void StringTable::verify() { - for (int i = 0; i < the_table()->table_size(); ++i) { -- HashtableEntry* p = the_table()->bucket(i); -+ HashtableEntry<oop>* p = the_table()->bucket(i); - for ( ; p != NULL; p = p->next()) { - oop s = p->literal(); - guarantee(s != NULL, "interned string is NULL"); -- guarantee(s->is_perm(), "interned string not in permspace"); -- -- int length; -- jchar* chars = java_lang_String::as_unicode_string(s, length); -- unsigned int h = hash_string(chars, length); -+ guarantee(s->is_perm() || !JavaObjectsInPerm, "interned string not in permspace"); -+ unsigned int h = java_lang_String::hash_string(s); - guarantee(p->hash() == h, "broken hash in string table entry"); - guarantee(the_table()->hash_to_index(h) == i, - "wrong index in string table"); -@@ -622,7 +746,7 @@ - void StringTable::dump(outputStream* st) { - NumberSeq summary; - for (int i = 0; i < the_table()->table_size(); ++i) { -- HashtableEntry* p = the_table()->bucket(i); -+ HashtableEntry<oop>* p = the_table()->bucket(i); - int count = 0; - for ( ; p != NULL; p = p->next()) { - count++; -diff --git a/src/share/vm/classfile/symbolTable.hpp b/src/share/vm/classfile/symbolTable.hpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp -@@ -26,11 +26,11 @@ - #define SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP - - #include "memory/allocation.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "utilities/hashtable.hpp" - --// The symbol table holds all symbolOops and corresponding interned strings. --// symbolOops and literal strings should be canonicalized. -+// The symbol table holds all Symbol*s and corresponding interned strings. -+// Symbol*s and literal strings should be canonicalized. - // - // The interned strings are created lazily. - // -@@ -43,23 +43,67 @@ - class outputStream; - - --class SymbolTable : public Hashtable { -+// Class to hold a newly created or referenced Symbol* temporarily in scope. -+// new_symbol() and lookup() will create a Symbol* if not already in the -+// symbol table and add to the symbol's reference count. -+// probe() and lookup_only() will increment the refcount if symbol is found. -+class TempNewSymbol : public StackObj { -+ Symbol* _temp; -+ -+ public: -+ TempNewSymbol() : _temp(NULL) {} -+ // Creating or looking up a symbol increments the symbol's reference count -+ TempNewSymbol(Symbol *s) : _temp(s) {} -+ -+ // Operator= increments reference count. -+ void operator=(const TempNewSymbol &s) { -+ _temp = s._temp; -+ if (_temp !=NULL) _temp->increment_refcount(); -+ } -+ -+ // Decrement reference counter so it can go away if it's unique -+ ~TempNewSymbol() { if (_temp != NULL) _temp->decrement_refcount(); } -+ -+ // Operators so they can be used like Symbols -+ Symbol* operator -> () const { return _temp; } -+ bool operator == (Symbol* o) const { return _temp == o; } -+ // Sneaky conversion function -+ operator Symbol*() { return _temp; } -+}; -+ -+class SymbolTable : public Hashtable<Symbol*> { - friend class VMStructs; -+ friend class ClassFileParser; - - private: - // The symbol table - static SymbolTable* _the_table; - -+ // For statistics -+ static int symbols_removed; -+ static int symbols_counted; -+ -+ Symbol* allocate_symbol(const u1* name, int len, TRAPS); // Assumes no characters larger than 0x7F -+ bool allocate_symbols(int names_count, const u1** names, int* lengths, Symbol** syms, TRAPS); -+ - // Set if one bucket is out of balance due to hash algorithm deficiency - static bool _needs_rehashing; - - // Adding elements -- symbolOop basic_add(symbolHandle sym, int index, u1* name, int len, -+ Symbol* basic_add(int index, u1* name, int len, - unsigned int hashValue, TRAPS); -- bool basic_add(symbolHandle* syms, constantPoolHandle cp, int names_count, -+ bool basic_add(constantPoolHandle cp, int names_count, - const char** names, int* lengths, int* cp_indices, - unsigned int* hashValues, TRAPS); - -+ static void new_symbols(constantPoolHandle cp, int names_count, -+ const char** name, int* lengths, -+ int* cp_indices, unsigned int* hashValues, -+ TRAPS) { -+ add(cp, names_count, name, lengths, cp_indices, hashValues, THREAD); -+ } -+ -+ - // Table size - enum { - symbol_table_size = 20011 -@@ -67,13 +111,13 @@ - - static unsigned int hash_symbol(const char* s, int len); - -- symbolOop lookup(int index, const char* name, int len, unsigned int hash); -+ Symbol* lookup(int index, const char* name, int len, unsigned int hash); - - SymbolTable() -- : Hashtable(symbol_table_size, sizeof (HashtableEntry)) {} -+ : Hashtable<Symbol*>(symbol_table_size, sizeof (HashtableEntry<Symbol*>)) {} - - SymbolTable(HashtableBucket* t, int number_of_entries) -- : Hashtable(symbol_table_size, sizeof (HashtableEntry), t, -+ : Hashtable<Symbol*>(symbol_table_size, sizeof (HashtableEntry<Symbol*>), t, - number_of_entries) {} - - public: -@@ -97,48 +141,60 @@ - _the_table = new SymbolTable(t, number_of_entries); - } - -- static symbolOop lookup(const char* name, int len, TRAPS); -+ static Symbol* lookup(const char* name, int len, TRAPS); - // lookup only, won't add. Also calculate hash. -- static symbolOop lookup_only(const char* name, int len, unsigned int& hash); -+ static Symbol* lookup_only(const char* name, int len, unsigned int& hash); - // Only copy to C string to be added if lookup failed. -- static symbolOop lookup(symbolHandle sym, int begin, int end, TRAPS); -+ static Symbol* lookup(const Symbol* sym, int begin, int end, TRAPS); -+ -+ static void release(Symbol* sym); - - // jchar (utf16) version of lookups -- static symbolOop lookup_unicode(const jchar* name, int len, TRAPS); -- static symbolOop lookup_only_unicode(const jchar* name, int len, unsigned int& hash); -+ static Symbol* lookup_unicode(const jchar* name, int len, TRAPS); -+ static Symbol* lookup_only_unicode(const jchar* name, int len, unsigned int& hash); - - static void add(constantPoolHandle cp, int names_count, - const char** names, int* lengths, int* cp_indices, - unsigned int* hashValues, TRAPS); - -- // GC support -- // Delete pointers to otherwise-unreachable objects. -- static void unlink(BoolObjectClosure* cl) { -- the_table()->Hashtable::unlink(cl); -+ // Release any dead symbols -+ static void unlink(); -+ -+ // iterate over symbols -+ static void symbols_do(SymbolClosure *cl); -+ -+ // Symbol creation -+ static Symbol* new_symbol(const char* utf8_buffer, int length, TRAPS) { -+ assert(utf8_buffer != NULL, "just checking"); -+ return lookup(utf8_buffer, length, THREAD); - } - -- // Invoke "f->do_oop" on the locations of all oops in the table. -- static void oops_do(OopClosure* f) { -- the_table()->Hashtable::oops_do(f); -+ static Symbol* new_symbol(const char* name, TRAPS) { -+ return new_symbol(name, (int)strlen(name), THREAD); -+ } -+ static Symbol* new_symbol(const Symbol* sym, int begin, int end, TRAPS) { -+ assert(begin <= end && end <= sym->utf8_length(), "just checking"); -+ return lookup(sym, begin, end, THREAD); - } - - // Symbol lookup -- static symbolOop lookup(int index, const char* name, int len, TRAPS); -+ static Symbol* lookup(int index, const char* name, int len, TRAPS); - - // Needed for preloading classes in signatures when compiling. - // Returns the symbol is already present in symbol table, otherwise - // NULL. NO ALLOCATION IS GUARANTEED! -- static symbolOop probe(const char* name, int len) { -+ static Symbol* probe(const char* name, int len) { - unsigned int ignore_hash; - return lookup_only(name, len, ignore_hash); - } -- static symbolOop probe_unicode(const jchar* name, int len) { -+ static Symbol* probe_unicode(const jchar* name, int len) { - unsigned int ignore_hash; - return lookup_only_unicode(name, len, ignore_hash); - } - - // Histogram - static void print_histogram() PRODUCT_RETURN; -+ static void print() PRODUCT_RETURN; - - // Debugging - static void verify(); -@@ -146,13 +202,13 @@ - - // Sharing - static void copy_buckets(char** top, char*end) { -- the_table()->Hashtable::copy_buckets(top, end); -+ the_table()->Hashtable<Symbol*>::copy_buckets(top, end); - } - static void copy_table(char** top, char*end) { -- the_table()->Hashtable::copy_table(top, end); -+ the_table()->Hashtable<Symbol*>::copy_table(top, end); - } - static void reverse(void* boundary = NULL) { -- ((Hashtable*)the_table())->reverse(boundary); -+ the_table()->Hashtable<Symbol*>::reverse(boundary); - } - - // Rehash the symbol table if it gets out of balance -@@ -160,8 +216,7 @@ - static bool needs_rehashing() { return _needs_rehashing; } - }; - -- --class StringTable : public Hashtable { -+class StringTable : public Hashtable<oop> { - friend class VMStructs; - - private: -@@ -172,7 +227,7 @@ - static bool _needs_rehashing; - - static oop intern(Handle string_or_null, jchar* chars, int length, TRAPS); -- oop basic_add(int index, Handle string, jchar* name, int len, -+ oop basic_add(int index, Handle string_or_null, jchar* name, int len, - unsigned int hashValue, TRAPS); - - // Table size -@@ -182,10 +237,10 @@ - - oop lookup(int index, jchar* chars, int length, unsigned int hashValue); - -- StringTable() : Hashtable(string_table_size, sizeof (HashtableEntry)) {} -+ StringTable() : Hashtable<oop>(string_table_size, sizeof (HashtableEntry<oop>)) {} - - StringTable(HashtableBucket* t, int number_of_entries) -- : Hashtable(string_table_size, sizeof (HashtableEntry), t, -+ : Hashtable<oop>(string_table_size, sizeof (HashtableEntry<oop>), t, - number_of_entries) {} - - public: -@@ -207,14 +262,10 @@ - - // GC support - // Delete pointers to otherwise-unreachable objects. -- static void unlink(BoolObjectClosure* cl) { -- the_table()->Hashtable::unlink(cl); -- } -+ static void unlink(BoolObjectClosure* cl); - - // Invoke "f->do_oop" on the locations of all oops in the table. -- static void oops_do(OopClosure* f) { -- the_table()->Hashtable::oops_do(f); -- } -+ static void oops_do(OopClosure* f); - - // Hashing algorithm, used as the hash value used by the - // StringTable for bucket selection and comparison (stored in the -@@ -225,10 +276,10 @@ - static void test_alt_hash() PRODUCT_RETURN; - - // Probing -- static oop lookup(symbolOop symbol); -+ static oop lookup(Symbol* symbol); - - // Interning -- static oop intern(symbolOop symbol, TRAPS); -+ static oop intern(Symbol* symbol, TRAPS); - static oop intern(oop string, TRAPS); - static oop intern(const char *utf8_string, TRAPS); - -@@ -238,13 +289,13 @@ - - // Sharing - static void copy_buckets(char** top, char*end) { -- the_table()->Hashtable::copy_buckets(top, end); -+ the_table()->Hashtable<oop>::copy_buckets(top, end); - } - static void copy_table(char** top, char*end) { -- the_table()->Hashtable::copy_table(top, end); -+ the_table()->Hashtable<oop>::copy_table(top, end); - } - static void reverse() { -- ((BasicHashtable*)the_table())->reverse(); -+ the_table()->Hashtable<oop>::reverse(); - } - - // Rehash the symbol table if it gets out of balance -diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp ---- openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp -+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -93,8 +93,8 @@ - JavaValue result(T_OBJECT); - JavaCalls::call_static(&result, - KlassHandle(THREAD, WK_KLASS(ClassLoader_klass)), -- vmSymbolHandles::getSystemClassLoader_name(), -- vmSymbolHandles::void_classloader_signature(), -+ vmSymbols::getSystemClassLoader_name(), -+ vmSymbols::void_classloader_signature(), - CHECK); - - _java_system_loader = (oop)result.get_jobject(); -@@ -107,8 +107,8 @@ - #ifdef ASSERT - - // return true if class_name contains no '.' (internal format is '/') --bool SystemDictionary::is_internal_format(symbolHandle class_name) { -- if (class_name.not_null()) { -+bool SystemDictionary::is_internal_format(Symbol* class_name) { -+ if (class_name != NULL) { - ResourceMark rm; - char* name = class_name->as_C_string(); - return strchr(name, '.') == NULL; -@@ -141,7 +141,7 @@ - - // Forwards to resolve_or_null - --klassOop SystemDictionary::resolve_or_fail(symbolHandle class_name, Handle class_loader, Handle protection_domain, bool throw_error, TRAPS) { -+klassOop SystemDictionary::resolve_or_fail(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, TRAPS) { - klassOop klass = resolve_or_null(class_name, class_loader, protection_domain, THREAD); - if (HAS_PENDING_EXCEPTION || klass == NULL) { - KlassHandle k_h(THREAD, klass); -@@ -151,7 +151,7 @@ - return klass; - } - --klassOop SystemDictionary::handle_resolution_exception(symbolHandle class_name, Handle class_loader, Handle protection_domain, bool throw_error, KlassHandle klass_h, TRAPS) { -+klassOop SystemDictionary::handle_resolution_exception(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, KlassHandle klass_h, TRAPS) { - if (HAS_PENDING_EXCEPTION) { - // If we have a pending exception we forward it to the caller, unless throw_error is true, - // in which case we have to check whether the pending exception is a ClassNotFoundException, -@@ -180,7 +180,7 @@ - } - - --klassOop SystemDictionary::resolve_or_fail(symbolHandle class_name, -+klassOop SystemDictionary::resolve_or_fail(Symbol* class_name, - bool throw_error, TRAPS) - { - return resolve_or_fail(class_name, Handle(), Handle(), throw_error, THREAD); -@@ -189,48 +189,49 @@ - - // Forwards to resolve_instance_class_or_null - --klassOop SystemDictionary::resolve_or_null(symbolHandle class_name, Handle class_loader, Handle protection_domain, TRAPS) { -+klassOop SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS) { - assert(!THREAD->is_Compiler_thread(), "Can not load classes with the Compiler thread"); -- if (FieldType::is_array(class_name())) { -+ if (FieldType::is_array(class_name)) { - return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); -+ } else if (FieldType::is_obj(class_name)) { -+ ResourceMark rm(THREAD); -+ // Ignore wrapping L and ;. -+ TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1, -+ class_name->utf8_length() - 2, CHECK_NULL); -+ return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL); - } else { - return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); - } - } - --klassOop SystemDictionary::resolve_or_null(symbolHandle class_name, TRAPS) { -+klassOop SystemDictionary::resolve_or_null(Symbol* class_name, TRAPS) { - return resolve_or_null(class_name, Handle(), Handle(), THREAD); - } - - // Forwards to resolve_instance_class_or_null - --klassOop SystemDictionary::resolve_array_class_or_null(symbolHandle class_name, -+klassOop SystemDictionary::resolve_array_class_or_null(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - TRAPS) { -- assert(FieldType::is_array(class_name()), "must be array"); -- jint dimension; -- symbolOop object_key; -+ assert(FieldType::is_array(class_name), "must be array"); - klassOop k = NULL; -- // dimension and object_key are assigned as a side-effect of this call -- BasicType t = FieldType::get_array_info(class_name(), -- &dimension, -- &object_key, -- CHECK_NULL); -- -+ FieldArrayInfo fd; -+ // dimension and object_key in FieldArrayInfo are assigned as a side-effect -+ // of this call -+ BasicType t = FieldType::get_array_info(class_name, fd, CHECK_NULL); - if (t == T_OBJECT) { -- symbolHandle h_key(THREAD, object_key); - // naked oop "k" is OK here -- we assign back into it -- k = SystemDictionary::resolve_instance_class_or_null(h_key, -+ k = SystemDictionary::resolve_instance_class_or_null(fd.object_key(), - class_loader, - protection_domain, - CHECK_NULL); - if (k != NULL) { -- k = Klass::cast(k)->array_klass(dimension, CHECK_NULL); -+ k = Klass::cast(k)->array_klass(fd.dimension(), CHECK_NULL); - } - } else { - k = Universe::typeArrayKlassObj(t); -- k = typeArrayKlass::cast(k)->array_klass(dimension, CHECK_NULL); -+ k = typeArrayKlass::cast(k)->array_klass(fd.dimension(), CHECK_NULL); - } - return k; - } -@@ -271,8 +272,8 @@ - // Must be called, even if superclass is null, since this is - // where the placeholder entry is created which claims this - // thread is loading this class/classloader. --klassOop SystemDictionary::resolve_super_or_fail(symbolHandle child_name, -- symbolHandle class_name, -+klassOop SystemDictionary::resolve_super_or_fail(Symbol* child_name, -+ Symbol* class_name, - Handle class_loader, - Handle protection_domain, - bool is_superclass, -@@ -281,7 +282,7 @@ - // Try to get one of the well-known klasses. - // They are trusted, and do not participate in circularities. - if (LinkWellKnownClasses) { -- klassOop k = find_well_known_klass(class_name()); -+ klassOop k = find_well_known_klass(class_name); - if (k != NULL) { - return k; - } -@@ -323,7 +324,7 @@ - if ((childk != NULL ) && (is_superclass) && - ((quicksuperk = instanceKlass::cast(childk)->super()) != NULL) && - -- ((Klass::cast(quicksuperk)->name() == class_name()) && -+ ((Klass::cast(quicksuperk)->name() == class_name) && - (Klass::cast(quicksuperk)->class_loader() == class_loader()))) { - return quicksuperk; - } else { -@@ -342,7 +343,7 @@ - } - - // java.lang.Object should have been found above -- assert(class_name() != NULL, "null super class for resolving"); -+ assert(class_name != NULL, "null super class for resolving"); - // Resolve the super class or interface, check results on return - klassOop superk = NULL; - superk = SystemDictionary::resolve_or_null(class_name, -@@ -392,8 +393,8 @@ - JavaCalls::call_special(&result, - class_loader, - system_loader, -- vmSymbolHandles::checkPackageAccess_name(), -- vmSymbolHandles::class_protectiondomain_signature(), -+ vmSymbols::checkPackageAccess_name(), -+ vmSymbols::class_protectiondomain_signature(), - Handle(THREAD, klass->java_mirror()), - protection_domain, - THREAD); -@@ -414,7 +415,7 @@ - { - // We recalculate the entry here -- we've called out to java since - // the last time it was calculated. -- symbolHandle kn(THREAD, klass->name()); -+ Symbol* kn = klass->name(); - unsigned int d_hash = dictionary()->compute_hash(kn, class_loader); - int d_index = dictionary()->hash_to_index(d_hash); - -@@ -489,7 +490,7 @@ - // and we are done, - // If return null klassOop and no pending exception, the caller must load the class - instanceKlassHandle SystemDictionary::handle_parallel_super_load( -- symbolHandle name, symbolHandle superclassname, Handle class_loader, -+ Symbol* name, Symbol* superclassname, Handle class_loader, - Handle protection_domain, Handle lockObject, TRAPS) { - - instanceKlassHandle nh = instanceKlassHandle(); // null Handle -@@ -578,17 +579,9 @@ - } - - --klassOop SystemDictionary::resolve_instance_class_or_null(symbolHandle class_name, Handle class_loader, Handle protection_domain, TRAPS) { -- assert(class_name.not_null() && !FieldType::is_array(class_name()), "invalid class name"); -- // First check to see if we should remove wrapping L and ; -- symbolHandle name; -- if (FieldType::is_obj(class_name())) { -- ResourceMark rm(THREAD); -- // Ignore wrapping L and ;. -- name = oopFactory::new_symbol_handle(class_name()->as_C_string() + 1, class_name()->utf8_length() - 2, CHECK_NULL); -- } else { -- name = class_name; -- } -+klassOop SystemDictionary::resolve_instance_class_or_null(Symbol* name, Handle class_loader, Handle protection_domain, TRAPS) { -+ assert(name != NULL && !FieldType::is_array(name) && -+ !FieldType::is_obj(name), "invalid class name"); - - // UseNewReflection - // Fix for 4474172; see evaluation for more details -@@ -632,7 +625,7 @@ - bool havesupername = false; - instanceKlassHandle k; - PlaceholderEntry* placeholder; -- symbolHandle superclassname; -+ Symbol* superclassname = NULL; - - { - MutexLocker mu(SystemDictionary_lock, THREAD); -@@ -646,7 +639,7 @@ - if (placeholder && placeholder->super_load_in_progress()) { - super_load_in_progress = true; - if (placeholder->havesupername() == true) { -- superclassname = symbolHandle(THREAD, placeholder->supername()); -+ superclassname = placeholder->supername(); - havesupername = true; - } - } -@@ -691,7 +684,6 @@ - // No performance benefit and no deadlock issues. - // case 5. parallelCapable user level classloaders - without objectLocker - // Allow parallel classloading of a class/classloader pair -- symbolHandle nullsymbolHandle; - bool throw_circularity_error = false; - { - MutexLocker mu(SystemDictionary_lock, THREAD); -@@ -733,7 +725,7 @@ - // LOAD_INSTANCE in parallel - // add placeholder entry even if error - callers will remove on error - if (!throw_circularity_error && !class_has_been_loaded) { -- PlaceholderEntry* newprobe = placeholders()->find_and_add(p_index, p_hash, name, class_loader, PlaceholderTable::LOAD_INSTANCE, nullsymbolHandle, THREAD); -+ PlaceholderEntry* newprobe = placeholders()->find_and_add(p_index, p_hash, name, class_loader, PlaceholderTable::LOAD_INSTANCE, NULL, THREAD); - // For class loaders that do not acquire the classloader object lock, - // if they did not catch another thread holding LOAD_INSTANCE, - // need a check analogous to the acquire ObjectLocker/find_class -@@ -837,7 +829,7 @@ - { - Handle loader (THREAD, k->class_loader()); - MutexLocker mu(SystemDictionary_lock, THREAD); -- oop kk = find_class_or_placeholder(name, loader); -+ oop kk = find_class(name, loader); - assert(kk == k(), "should be present in dictionary"); - } - #endif -@@ -880,7 +872,7 @@ - // _dictionary->bucket(index) is read here, so the caller will not see - // the new entry. - --klassOop SystemDictionary::find(symbolHandle class_name, -+klassOop SystemDictionary::find(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - TRAPS) { -@@ -910,37 +902,34 @@ - - // Look for a loaded instance or array klass by name. Do not do any loading. - // return NULL in case of error. --klassOop SystemDictionary::find_instance_or_array_klass(symbolHandle class_name, -+klassOop SystemDictionary::find_instance_or_array_klass(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - TRAPS) { - klassOop k = NULL; -- assert(class_name() != NULL, "class name must be non NULL"); -+ assert(class_name != NULL, "class name must be non NULL"); - - // Try to get one of the well-known klasses. - if (LinkWellKnownClasses) { -- k = find_well_known_klass(class_name()); -+ k = find_well_known_klass(class_name); - if (k != NULL) { - return k; - } - } - -- if (FieldType::is_array(class_name())) { -+ if (FieldType::is_array(class_name)) { - // The name refers to an array. Parse the name. -- jint dimension; -- symbolOop object_key; -- -- // dimension and object_key are assigned as a side-effect of this call -- BasicType t = FieldType::get_array_info(class_name(), &dimension, -- &object_key, CHECK_(NULL)); -+ // dimension and object_key in FieldArrayInfo are assigned as a -+ // side-effect of this call -+ FieldArrayInfo fd; -+ BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(NULL)); - if (t != T_OBJECT) { - k = Universe::typeArrayKlassObj(t); - } else { -- symbolHandle h_key(THREAD, object_key); -- k = SystemDictionary::find(h_key, class_loader, protection_domain, THREAD); -+ k = SystemDictionary::find(fd.object_key(), class_loader, protection_domain, THREAD); - } - if (k != NULL) { -- k = Klass::cast(k)->array_klass_or_null(dimension); -+ k = Klass::cast(k)->array_klass_or_null(fd.dimension()); - } - } else { - k = find(class_name, class_loader, protection_domain, THREAD); -@@ -949,7 +938,7 @@ - } - - // Quick range check for names of well-known classes: --static symbolOop wk_klass_name_limits[2] = {NULL, NULL}; -+static Symbol* wk_klass_name_limits[2] = {NULL, NULL}; - - #ifndef PRODUCT - static int find_wkk_calls, find_wkk_probes, find_wkk_wins; -@@ -957,7 +946,7 @@ - // => 60% hit after limit guard, 25% total win rate - #endif - --klassOop SystemDictionary::find_well_known_klass(symbolOop class_name) { -+klassOop SystemDictionary::find_well_known_klass(Symbol* class_name) { - // A bounds-check on class_name will quickly get a negative result. - NOT_PRODUCT(find_wkk_calls++); - if (class_name >= wk_klass_name_limits[0] && -@@ -983,14 +972,14 @@ - // Note: this method is much like resolve_from_stream, but - // updates no supplemental data structures. - // TODO consolidate the two methods with a helper routine? --klassOop SystemDictionary::parse_stream(symbolHandle class_name, -+klassOop SystemDictionary::parse_stream(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - ClassFileStream* st, - KlassHandle host_klass, - GrowableArray<Handle>* cp_patches, - TRAPS) { -- symbolHandle parsed_name; -+ TempNewSymbol parsed_name = NULL; - - // Parse the stream. Note that we do this even though this klass might - // already be present in the SystemDictionary, otherwise we would not -@@ -1011,13 +1000,12 @@ - true, - THREAD); - -- - // We don't redefine the class, so we just need to clean up whether there - // was an error or not (don't want to modify any system dictionary - // data structures). - // Parsed name could be null if we threw an error before we got far - // enough along to parse it -- in that case, there is nothing to clean up. -- if (!parsed_name.is_null()) { -+ if (parsed_name != NULL) { - unsigned int p_hash = placeholders()->compute_hash(parsed_name, - class_loader); - int p_index = placeholders()->hash_to_index(p_hash); -@@ -1060,7 +1048,7 @@ - // Note: class_name can be NULL. In that case we do not know the name of - // the class until we have parsed the stream. - --klassOop SystemDictionary::resolve_from_stream(symbolHandle class_name, -+klassOop SystemDictionary::resolve_from_stream(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - ClassFileStream* st, -@@ -1079,7 +1067,7 @@ - check_loader_lock_contention(lockObject, THREAD); - ObjectLocker ol(lockObject, THREAD, DoObjectLock); - -- symbolHandle parsed_name; -+ TempNewSymbol parsed_name = NULL; - - // Parse the stream. Note that we do this even though this klass might - // already be present in the SystemDictionary, otherwise we would not -@@ -1101,7 +1089,7 @@ - const char* pkg = "java/"; - if (!HAS_PENDING_EXCEPTION && - !class_loader.is_null() && -- !parsed_name.is_null() && -+ parsed_name != NULL && - !strncmp((const char*)parsed_name->bytes(), pkg, strlen(pkg))) { - // It is illegal to define classes in the "java." package from - // JVM_DefineClass or jni_DefineClass unless you're the bootclassloader -@@ -1121,9 +1109,8 @@ - } - - if (!HAS_PENDING_EXCEPTION) { -- assert(!parsed_name.is_null(), "Sanity"); -- assert(class_name.is_null() || class_name() == parsed_name(), -- "name mismatch"); -+ assert(parsed_name != NULL, "Sanity"); -+ assert(class_name == NULL || class_name == parsed_name, "name mismatch"); - // Verification prevents us from creating names with dots in them, this - // asserts that that's the case. - assert(is_internal_format(parsed_name), -@@ -1144,7 +1131,7 @@ - // must make sure parsed_name is valid first (it won't be if we had - // a format error before the class was parsed far enough to - // find the name). -- if (HAS_PENDING_EXCEPTION && !parsed_name.is_null()) { -+ if (HAS_PENDING_EXCEPTION && parsed_name != NULL) { - unsigned int p_hash = placeholders()->compute_hash(parsed_name, - class_loader); - int p_index = placeholders()->hash_to_index(p_hash); -@@ -1160,16 +1147,16 @@ - // SystemDictionary; this is only done on success - debug_only( { - if (!HAS_PENDING_EXCEPTION) { -- assert(!parsed_name.is_null(), "parsed_name is still null?"); -- symbolHandle h_name (THREAD, k->name()); -+ assert(parsed_name != NULL, "parsed_name is still null?"); -+ Symbol* h_name = k->name(); - Handle h_loader (THREAD, k->class_loader()); - - MutexLocker mu(SystemDictionary_lock, THREAD); - -- oop check = find_class_or_placeholder(parsed_name, class_loader); -+ klassOop check = find_class(parsed_name, class_loader); - assert(check == k(), "should be present in the dictionary"); - -- oop check2 = find_class_or_placeholder(h_name, h_loader); -+ klassOop check2 = find_class(h_name, h_loader); - assert(check == check2, "name inconsistancy in SystemDictionary"); - } - } ); -@@ -1189,7 +1176,7 @@ - // If there is a shared dictionary, then find the entry for the - // given shared system class, if any. - --klassOop SystemDictionary::find_shared_class(symbolHandle class_name) { -+klassOop SystemDictionary::find_shared_class(Symbol* class_name) { - if (shared_dictionary() != NULL) { - unsigned int d_hash = dictionary()->compute_hash(class_name, Handle()); - int d_index = dictionary()->hash_to_index(d_hash); -@@ -1207,7 +1194,7 @@ - // object hierarchy until loaded.] - - instanceKlassHandle SystemDictionary::load_shared_class( -- symbolHandle class_name, Handle class_loader, TRAPS) { -+ Symbol* class_name, Handle class_loader, TRAPS) { - instanceKlassHandle ik (THREAD, find_shared_class(class_name)); - return load_shared_class(ik, class_loader, THREAD); - } -@@ -1222,14 +1209,14 @@ - assert(class_loader.is_null(), "non-null classloader for shared class?"); - if (ik.not_null()) { - instanceKlassHandle nh = instanceKlassHandle(); // null Handle -- symbolHandle class_name(THREAD, ik->name()); -+ Symbol* class_name = ik->name(); - - // Found the class, now load the superclass and interfaces. If they - // are shared, add them to the main system dictionary and reset - // their hierarchy references (supers, subs, and interfaces). - - if (ik->super() != NULL) { -- symbolHandle cn(THREAD, ik->super()->klass_part()->name()); -+ Symbol* cn = ik->super()->klass_part()->name(); - resolve_super_or_fail(class_name, cn, - class_loader, Handle(), true, CHECK_(nh)); - } -@@ -1243,7 +1230,7 @@ - // interfaces' instanceKlass's C++ vtbls haven't been - // reinitialized yet (they will be once the interface classes - // are loaded) -- symbolHandle name (THREAD, k->klass_part()->name()); -+ Symbol* name = k->klass_part()->name(); - resolve_super_or_fail(class_name, name, class_loader, Handle(), false, CHECK_(nh)); - } - -@@ -1290,7 +1277,7 @@ - // Note that with delegation class loaders all classes in another loader will - // first try to call this so it'd better be fast!! - static instanceKlassHandle download_and_retry_class_load( -- symbolHandle class_name, -+ Symbol* class_name, - TRAPS) { - - klassOop dlm = SystemDictionary::sun_jkernel_DownloadManager_klass(); -@@ -1313,8 +1300,8 @@ - // public static String getBootClassPathEntryForClass(String className); - JavaCalls::call_static(&result, - KlassHandle(THREAD, dlm), -- vmSymbolHandles::getBootClassPathEntryForClass_name(), -- vmSymbolHandles::string_string_signature(), -+ vmSymbols::getBootClassPathEntryForClass_name(), -+ vmSymbols::string_string_signature(), - class_string, - CHECK_(nk)); - -@@ -1344,7 +1331,7 @@ - #endif // KERNEL - - --instanceKlassHandle SystemDictionary::load_instance_class(symbolHandle class_name, Handle class_loader, TRAPS) { -+instanceKlassHandle SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) { - instanceKlassHandle nh = instanceKlassHandle(); // null Handle - if (class_loader.is_null()) { - -@@ -1419,16 +1406,16 @@ - JavaCalls::call_special(&result, - class_loader, - spec_klass, -- vmSymbolHandles::loadClassInternal_name(), -- vmSymbolHandles::string_class_signature(), -+ vmSymbols::loadClassInternal_name(), -+ vmSymbols::string_class_signature(), - string, - CHECK_(nh)); - } else { - JavaCalls::call_virtual(&result, - class_loader, - spec_klass, -- vmSymbolHandles::loadClass_name(), -- vmSymbolHandles::string_class_signature(), -+ vmSymbols::loadClass_name(), -+ vmSymbols::string_class_signature(), - string, - CHECK_(nh)); - } -@@ -1444,7 +1431,7 @@ - // For user defined Java class loaders, check that the name returned is - // the same as that requested. This check is done for the bootstrap - // loader when parsing the class file. -- if (class_name() == k->name()) { -+ if (class_name == k->name()) { - return k; - } - } -@@ -1477,7 +1464,7 @@ - // classloader lock held - // Parallel classloaders will call find_or_define_instance_class - // which will require a token to perform the define class -- symbolHandle name_h(THREAD, k->name()); -+ Symbol* name_h = k->name(); - unsigned int d_hash = dictionary()->compute_hash(name_h, class_loader_h); - int d_index = dictionary()->hash_to_index(d_hash); - check_constraints(d_index, d_hash, k, class_loader_h, true, CHECK); -@@ -1536,10 +1523,10 @@ - // findClass(), i.e. FindLoadedClass/DefineClassIfAbsent or they - // potentially waste time reading and parsing the bytestream. - // Note: VM callers should ensure consistency of k/class_name,class_loader --instanceKlassHandle SystemDictionary::find_or_define_instance_class(symbolHandle class_name, Handle class_loader, instanceKlassHandle k, TRAPS) { -+instanceKlassHandle SystemDictionary::find_or_define_instance_class(Symbol* class_name, Handle class_loader, instanceKlassHandle k, TRAPS) { - - instanceKlassHandle nh = instanceKlassHandle(); // null Handle -- symbolHandle name_h(THREAD, k->name()); // passed in class_name may be null -+ Symbol* name_h = k->name(); // passed in class_name may be null - - unsigned int d_hash = dictionary()->compute_hash(name_h, class_loader); - int d_index = dictionary()->hash_to_index(d_hash); -@@ -1560,8 +1547,7 @@ - } - - // Acquire define token for this class/classloader -- symbolHandle nullsymbolHandle; -- probe = placeholders()->find_and_add(p_index, p_hash, name_h, class_loader, PlaceholderTable::DEFINE_CLASS, nullsymbolHandle, THREAD); -+ probe = placeholders()->find_and_add(p_index, p_hash, name_h, class_loader, PlaceholderTable::DEFINE_CLASS, NULL, THREAD); - // Wait if another thread defining in parallel - // All threads wait - even those that will throw duplicate class: otherwise - // caller is surprised by LinkageError: duplicate, but findLoadedClass fails -@@ -1653,7 +1639,7 @@ - // Lookup - - klassOop SystemDictionary::find_class(int index, unsigned int hash, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader) { - assert_locked_or_safepoint(SystemDictionary_lock); - assert (index == dictionary()->index_for(class_name, class_loader), -@@ -1665,18 +1651,17 @@ - - - // Basic find on classes in the midst of being loaded --symbolOop SystemDictionary::find_placeholder(int index, unsigned int hash, -- symbolHandle class_name, -- Handle class_loader) { -+Symbol* SystemDictionary::find_placeholder(Symbol* class_name, -+ Handle class_loader) { - assert_locked_or_safepoint(SystemDictionary_lock); -- -- return placeholders()->find_entry(index, hash, class_name, class_loader); -+ unsigned int p_hash = placeholders()->compute_hash(class_name, class_loader); -+ int p_index = placeholders()->hash_to_index(p_hash); -+ return placeholders()->find_entry(p_index, p_hash, class_name, class_loader); - } - - - // Used for assertions and verification only --oop SystemDictionary::find_class_or_placeholder(symbolHandle class_name, -- Handle class_loader) { -+klassOop SystemDictionary::find_class(Symbol* class_name, Handle class_loader) { - #ifndef ASSERT - guarantee(VerifyBeforeGC || - VerifyDuringGC || -@@ -1684,22 +1669,11 @@ - VerifyAfterGC, "too expensive"); - #endif - assert_locked_or_safepoint(SystemDictionary_lock); -- symbolOop class_name_ = class_name(); -- oop class_loader_ = class_loader(); - - // First look in the loaded class array - unsigned int d_hash = dictionary()->compute_hash(class_name, class_loader); - int d_index = dictionary()->hash_to_index(d_hash); -- oop lookup = find_class(d_index, d_hash, class_name, class_loader); -- -- if (lookup == NULL) { -- // Next try the placeholders -- unsigned int p_hash = placeholders()->compute_hash(class_name,class_loader); -- int p_index = placeholders()->hash_to_index(p_hash); -- lookup = find_placeholder(p_index, p_hash, class_name, class_loader); -- } -- -- return lookup; -+ return find_class(d_index, d_hash, class_name, class_loader); - } - - -@@ -1757,12 +1731,6 @@ - - // Visit extra methods - invoke_method_table()->oops_do(blk); -- -- // Loader constraints. We must keep the symbolOop used in the name alive. -- constraints()->always_strong_classes_do(blk); -- -- // Resolution errors keep the symbolOop for the error alive -- resolution_errors()->always_strong_classes_do(blk); - } - - -@@ -1808,9 +1776,6 @@ - - - void SystemDictionary::preloaded_oops_do(OopClosure* f) { -- f->do_oop((oop*) &wk_klass_name_limits[0]); -- f->do_oop((oop*) &wk_klass_name_limits[1]); -- - for (int k = (int)FIRST_WKID; k < (int)WKID_LIMIT; k++) { - f->do_oop((oop*) &_well_known_klasses[k]); - } -@@ -1862,7 +1827,7 @@ - dictionary()->classes_do(f, CHECK); - } - --void SystemDictionary::placeholders_do(void f(symbolOop, oop)) { -+void SystemDictionary::placeholders_do(void f(Symbol*, oop)) { - placeholders()->entries_do(f); - } - -@@ -1882,7 +1847,7 @@ - // class is loaded. - klassOop aos = _abstract_ownable_synchronizer_klass; - if (aos == NULL) { -- klassOop k = resolve_or_fail(vmSymbolHandles::java_util_concurrent_locks_AbstractOwnableSynchronizer(), true, CHECK); -+ klassOop k = resolve_or_fail(vmSymbols::java_util_concurrent_locks_AbstractOwnableSynchronizer(), true, CHECK); - // Force a fence to prevent any read before the write completes - OrderAccess::fence(); - _abstract_ownable_synchronizer_klass = k; -@@ -1924,7 +1889,7 @@ - assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); - int info = wk_init_info[id - FIRST_WKID]; - int sid = (info >> CEIL_LG_OPTION_LIMIT); -- symbolHandle symbol = vmSymbolHandles::symbol_handle_at((vmSymbols::SID)sid); -+ Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid); - klassOop* klassp = &_well_known_klasses[id]; - bool must_load = (init_opt < SystemDictionary::Opt); - bool try_load = true; -@@ -1954,7 +1919,7 @@ - initialize_wk_klass((WKID)id, opt, CHECK); - - // Update limits, so find_well_known_klass can be very fast: -- symbolOop s = vmSymbols::symbol_at((vmSymbols::SID)sid); -+ Symbol* s = vmSymbols::symbol_at((vmSymbols::SID)sid); - if (wk_klass_name_limits[1] == NULL) { - wk_klass_name_limits[0] = wk_klass_name_limits[1] = s; - } else if (wk_klass_name_limits[1] < s) { -@@ -2081,7 +2046,7 @@ - TRAPS) { - const char *linkage_error = NULL; - { -- symbolHandle name (THREAD, k->name()); -+ Symbol* name = k->name(); - MutexLocker mu(SystemDictionary_lock, THREAD); - - klassOop check = find_class(d_index, d_hash, name, class_loader); -@@ -2102,10 +2067,8 @@ - } - - #ifdef ASSERT -- unsigned int p_hash = placeholders()->compute_hash(name, class_loader); -- int p_index = placeholders()->hash_to_index(p_hash); -- symbolOop ph_check = find_placeholder(p_index, p_hash, name, class_loader); -- assert(ph_check == NULL || ph_check == name(), "invalid symbol"); -+ Symbol* ph_check = find_placeholder(name, class_loader); -+ assert(ph_check == NULL || ph_check == name, "invalid symbol"); - #endif - - if (linkage_error == NULL) { -@@ -2141,7 +2104,7 @@ - TRAPS) { - // Compile_lock prevents systemDictionary updates during compilations - assert_locked_or_safepoint(Compile_lock); -- symbolHandle name (THREAD, k->name()); -+ Symbol* name = k->name(); - - { - MutexLocker mu1(SystemDictionary_lock, THREAD); -@@ -2181,7 +2144,7 @@ - // while only one thread can define a class at one time, multiple - // classes can resolve the superclass for a class at one time, - // and the placeholder is used to track that --// symbolOop ph_check = find_placeholder(p_index, p_hash, name, class_loader); -+// Symbol* ph_check = find_placeholder(name, class_loader); - // assert (ph_check == NULL, "should not have a placeholder entry"); - #endif - SystemDictionary_lock->notify_all(); -@@ -2190,7 +2153,7 @@ - - - klassOop SystemDictionary::find_constrained_instance_or_array_klass( -- symbolHandle class_name, Handle class_loader, TRAPS) { -+ Symbol* class_name, Handle class_loader, TRAPS) { - - // First see if it has been loaded directly. - // Force the protection domain to be null. (This removes protection checks.) -@@ -2203,23 +2166,20 @@ - // Now look to see if it has been loaded elsewhere, and is subject to - // a loader constraint that would require this loader to return the - // klass that is already loaded. -- if (FieldType::is_array(class_name())) { -+ if (FieldType::is_array(class_name)) { - // For array classes, their klassOops are not kept in the - // constraint table. The element klassOops are. -- jint dimension; -- symbolOop object_key; -- BasicType t = FieldType::get_array_info(class_name(), &dimension, -- &object_key, CHECK_(NULL)); -+ FieldArrayInfo fd; -+ BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(NULL)); - if (t != T_OBJECT) { - klass = Universe::typeArrayKlassObj(t); - } else { -- symbolHandle elem_name(THREAD, object_key); - MutexLocker mu(SystemDictionary_lock, THREAD); -- klass = constraints()->find_constrained_klass(elem_name, class_loader); -+ klass = constraints()->find_constrained_klass(fd.object_key(), class_loader); - } - // If element class already loaded, allocate array klass - if (klass != NULL) { -- klass = Klass::cast(klass)->array_klass_or_null(dimension); -+ klass = Klass::cast(klass)->array_klass_or_null(fd.dimension()); - } - } else { - MutexLocker mu(SystemDictionary_lock, THREAD); -@@ -2231,25 +2191,23 @@ - } - - --bool SystemDictionary::add_loader_constraint(symbolHandle class_name, -+bool SystemDictionary::add_loader_constraint(Symbol* class_name, - Handle class_loader1, - Handle class_loader2, - Thread* THREAD) { -- symbolHandle constraint_name; -- if (!FieldType::is_array(class_name())) { -+ Symbol* constraint_name = NULL; -+ if (!FieldType::is_array(class_name)) { - constraint_name = class_name; - } else { - // For array classes, their klassOops are not kept in the - // constraint table. The element classes are. -- jint dimension; -- symbolOop object_key; -- BasicType t = FieldType::get_array_info(class_name(), &dimension, -- &object_key, CHECK_(false)); -+ FieldArrayInfo fd; -+ BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(false)); - // primitive types always pass - if (t != T_OBJECT) { - return true; - } else { -- constraint_name = symbolHandle(THREAD, object_key); -+ constraint_name = fd.object_key(); - } - } - unsigned int d_hash1 = dictionary()->compute_hash(constraint_name, class_loader1); -@@ -2272,7 +2230,7 @@ - - // Add entry to resolution error table to record the error when the first - // attempt to resolve a reference to a class has failed. --void SystemDictionary::add_resolution_error(constantPoolHandle pool, int which, symbolHandle error) { -+void SystemDictionary::add_resolution_error(constantPoolHandle pool, int which, Symbol* error) { - unsigned int hash = resolution_errors()->compute_hash(pool, which); - int index = resolution_errors()->hash_to_index(hash); - { -@@ -2282,13 +2240,13 @@ - } - - // Lookup resolution error table. Returns error if found, otherwise NULL. --symbolOop SystemDictionary::find_resolution_error(constantPoolHandle pool, int which) { -+Symbol* SystemDictionary::find_resolution_error(constantPoolHandle pool, int which) { - unsigned int hash = resolution_errors()->compute_hash(pool, which); - int index = resolution_errors()->hash_to_index(hash); - { - MutexLocker ml(SystemDictionary_lock, Thread::current()); - ResolutionErrorEntry* entry = resolution_errors()->find_entry(index, hash, pool, which); -- return (entry != NULL) ? entry->error() : (symbolOop)NULL; -+ return (entry != NULL) ? entry->error() : (Symbol*)NULL; - } - } - -@@ -2344,7 +2302,7 @@ - // NULL if no constraint failed. The returned C string needs cleaning up - // with a ResourceMark in the caller. No exception except OOME is thrown. - // Arrays are not added to the loader constraint table, their elements are. --char* SystemDictionary::check_signature_loaders(symbolHandle signature, -+char* SystemDictionary::check_signature_loaders(Symbol* signature, - Handle loader1, Handle loader2, - bool is_method, TRAPS) { - // Nothing to do if loaders are the same. -@@ -2352,13 +2310,14 @@ - return NULL; - } - -+ ResourceMark rm(THREAD); - SignatureStream sig_strm(signature, is_method); - while (!sig_strm.is_done()) { - if (sig_strm.is_object()) { -- symbolOop s = sig_strm.as_symbol(CHECK_NULL); -- symbolHandle sig (THREAD, s); -+ Symbol* s = sig_strm.as_symbol(CHECK_NULL); -+ Symbol* sig = s; - if (!add_loader_constraint(sig, loader1, loader2, THREAD)) { -- return sig()->as_C_string(); -+ return sig->as_C_string(); - } - } - sig_strm.next(); -@@ -2367,12 +2326,12 @@ - } - - --methodOop SystemDictionary::find_method_handle_invoke(symbolHandle name, -- symbolHandle signature, -+methodOop SystemDictionary::find_method_handle_invoke(Symbol* name, -+ Symbol* signature, - KlassHandle accessing_klass, - TRAPS) { - if (!EnableMethodHandles) return NULL; -- vmSymbols::SID name_id = vmSymbols::find_sid(name()); -+ vmSymbols::SID name_id = vmSymbols::find_sid(name); - assert(name_id != vmSymbols::NO_SID, "must be a known name"); - unsigned int hash = invoke_method_table()->compute_hash(signature, name_id); - int index = invoke_method_table()->hash_to_index(hash); -@@ -2385,7 +2344,7 @@ - return NULL; // do not attempt from within compiler - bool for_invokeGeneric = (name_id == vmSymbols::VM_SYMBOL_ENUM_NAME(invokeGeneric_name)); - bool found_on_bcp = false; -- Handle mt = find_method_handle_type(signature(), accessing_klass, -+ Handle mt = find_method_handle_type(signature, accessing_klass, - for_invokeGeneric, - found_on_bcp, CHECK_NULL); - KlassHandle mh_klass = SystemDictionaryHandles::MethodHandle_klass(); -@@ -2416,7 +2375,7 @@ - // signature, as interpreted relative to the given class loader. - // Because of class loader constraints, all method handle usage must be - // consistent with this loader. --Handle SystemDictionary::find_method_handle_type(symbolHandle signature, -+Handle SystemDictionary::find_method_handle_type(Symbol* signature, - KlassHandle accessing_klass, - bool for_invokeGeneric, - bool& return_bcp_flag, -@@ -2424,11 +2383,12 @@ - Handle class_loader, protection_domain; - bool is_on_bcp = true; // keep this true as long as we can materialize from the boot classloader - Handle empty; -- int npts = ArgumentCount(signature()).size(); -+ int npts = ArgumentCount(signature).size(); - objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty)); - int arg = 0; - Handle rt; // the return type from the signature -- for (SignatureStream ss(signature()); !ss.is_done(); ss.next()) { -+ ResourceMark rm(THREAD); -+ for (SignatureStream ss(signature); !ss.is_done(); ss.next()) { - oop mirror = NULL; - if (is_on_bcp) { - mirror = ss.as_java_mirror(class_loader, protection_domain, -@@ -2500,17 +2460,18 @@ - Handle SystemDictionary::link_method_handle_constant(KlassHandle caller, - int ref_kind, //e.g., JVM_REF_invokeVirtual - KlassHandle callee, -- symbolHandle name_sym, -- symbolHandle signature, -+ Symbol* name_sym, -+ Symbol* signature, - TRAPS) { - Handle empty; -- Handle name = java_lang_String::create_from_symbol(name_sym(), CHECK_(empty)); -+ Handle name = java_lang_String::create_from_symbol(name_sym, CHECK_(empty)); - Handle type; - if (signature->utf8_length() > 0 && signature->byte_at(0) == '(') { - bool ignore_is_on_bcp = false; - type = find_method_handle_type(signature, caller, false, ignore_is_on_bcp, CHECK_(empty)); - } else { -- SignatureStream ss(signature(), false); -+ ResourceMark rm(THREAD); -+ SignatureStream ss(signature, false); - if (!ss.is_done()) { - oop mirror = ss.as_java_mirror(caller->class_loader(), caller->protection_domain(), - SignatureStream::NCDFError, CHECK_(empty)); -@@ -2542,7 +2503,7 @@ - // Ask Java code to find or construct a java.dyn.CallSite for the given - // name and signature, as interpreted relative to the given class loader. - Handle SystemDictionary::make_dynamic_call_site(Handle bootstrap_method, -- symbolHandle name, -+ Symbol* name, - methodHandle signature_invoker, - Handle info, - methodHandle caller_method, -@@ -2557,7 +2518,7 @@ - MethodHandles::init_MemberName(caller_mname(), caller_method()); - - // call sun.dyn.MethodHandleNatives::makeDynamicCallSite(bootm, name, mtype, info, caller_mname, caller_pos) -- oop name_str_oop = StringTable::intern(name(), CHECK_(empty)); // not a handle! -+ oop name_str_oop = StringTable::intern(name, CHECK_(empty)); // not a handle! - JavaCallArguments args(Handle(THREAD, bootstrap_method())); - args.push_oop(name_str_oop); - args.push_oop(signature_invoker->method_handle_type()); -@@ -2740,16 +2701,20 @@ - - - void SystemDictionary::verify_obj_klass_present(Handle obj, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader) { - GCMutexLocker mu(SystemDictionary_lock); -- oop probe = find_class_or_placeholder(class_name, class_loader); -+ Symbol* name; -+ -+ klassOop probe = find_class(class_name, class_loader); - if (probe == NULL) { - probe = SystemDictionary::find_shared_class(class_name); -+ if (probe == NULL) { -+ name = find_placeholder(class_name, class_loader); -+ } - } -- guarantee(probe != NULL && -- (!probe->is_klass() || probe == obj()), -- "Loaded klasses should be in SystemDictionary"); -+ guarantee(probe != NULL || name != NULL, -+ "Loaded klasses should be in SystemDictionary"); - } - - #ifndef PRODUCT -diff --git a/src/share/vm/classfile/systemDictionary.hpp b/src/share/vm/classfile/systemDictionary.hpp ---- openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp -+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp -@@ -28,14 +28,14 @@ - #include "classfile/classFileStream.hpp" - #include "classfile/classLoader.hpp" - #include "oops/objArrayOop.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/java.hpp" - #include "runtime/reflectionUtils.hpp" - #include "utilities/hashtable.hpp" - - // The system dictionary stores all loaded classes and maps: - // --// [class name,class loader] -> class i.e. [symbolOop,oop] -> klassOop -+// [class name,class loader] -> class i.e. [Symbol*,oop] -> klassOop - // - // Classes are loaded lazily. The default VM class loader is - // represented as NULL. -@@ -226,26 +226,26 @@ - // throw_error flag. For most uses the throw_error argument should be set - // to true. - -- static klassOop resolve_or_fail(symbolHandle class_name, Handle class_loader, Handle protection_domain, bool throw_error, TRAPS); -+ static klassOop resolve_or_fail(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, TRAPS); - // Convenient call for null loader and protection domain. -- static klassOop resolve_or_fail(symbolHandle class_name, bool throw_error, TRAPS); -+ static klassOop resolve_or_fail(Symbol* class_name, bool throw_error, TRAPS); - private: - // handle error translation for resolve_or_null results -- static klassOop handle_resolution_exception(symbolHandle class_name, Handle class_loader, Handle protection_domain, bool throw_error, KlassHandle klass_h, TRAPS); -+ static klassOop handle_resolution_exception(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, KlassHandle klass_h, TRAPS); - - public: - - // Returns a class with a given class name and class loader. - // Loads the class if needed. If not found NULL is returned. -- static klassOop resolve_or_null(symbolHandle class_name, Handle class_loader, Handle protection_domain, TRAPS); -+ static klassOop resolve_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS); - // Version with null loader and protection domain -- static klassOop resolve_or_null(symbolHandle class_name, TRAPS); -+ static klassOop resolve_or_null(Symbol* class_name, TRAPS); - - // Resolve a superclass or superinterface. Called from ClassFileParser, - // parse_interfaces, resolve_instance_class_or_null, load_shared_class - // "child_name" is the class whose super class or interface is being resolved. -- static klassOop resolve_super_or_fail(symbolHandle child_name, -- symbolHandle class_name, -+ static klassOop resolve_super_or_fail(Symbol* child_name, -+ Symbol* class_name, - Handle class_loader, - Handle protection_domain, - bool is_superclass, -@@ -253,7 +253,7 @@ - - // Parse new stream. This won't update the system dictionary or - // class hierarchy, simply parse the stream. Used by JVMTI RedefineClasses. -- static klassOop parse_stream(symbolHandle class_name, -+ static klassOop parse_stream(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - ClassFileStream* st, -@@ -261,7 +261,7 @@ - KlassHandle nullHandle; - return parse_stream(class_name, class_loader, protection_domain, st, nullHandle, NULL, THREAD); - } -- static klassOop parse_stream(symbolHandle class_name, -+ static klassOop parse_stream(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - ClassFileStream* st, -@@ -270,23 +270,23 @@ - TRAPS); - - // Resolve from stream (called by jni_DefineClass and JVM_DefineClass) -- static klassOop resolve_from_stream(symbolHandle class_name, Handle class_loader, -+ static klassOop resolve_from_stream(Symbol* class_name, Handle class_loader, - Handle protection_domain, - ClassFileStream* st, bool verify, TRAPS); - - // Lookup an already loaded class. If not found NULL is returned. -- static klassOop find(symbolHandle class_name, Handle class_loader, Handle protection_domain, TRAPS); -+ static klassOop find(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS); - - // Lookup an already loaded instance or array class. - // Do not make any queries to class loaders; consult only the cache. - // If not found NULL is returned. -- static klassOop find_instance_or_array_klass(symbolHandle class_name, -+ static klassOop find_instance_or_array_klass(Symbol* class_name, - Handle class_loader, - Handle protection_domain, - TRAPS); - - // If the given name is known to vmSymbols, return the well-know klass: -- static klassOop find_well_known_klass(symbolOop class_name); -+ static klassOop find_well_known_klass(Symbol* class_name); - - // Lookup an instance or array class that has already been loaded - // either into the given class loader, or else into another class -@@ -309,7 +309,7 @@ - // satisfied, and it is safe for classes in the given class loader - // to manipulate strongly-typed values of the found class, subject - // to local linkage and access checks. -- static klassOop find_constrained_instance_or_array_klass(symbolHandle class_name, -+ static klassOop find_constrained_instance_or_array_klass(Symbol* class_name, - Handle class_loader, - TRAPS); - -@@ -324,7 +324,7 @@ - // (added for helpers that use HandleMarks and ResourceMarks) - static void classes_do(void f(klassOop, oop, TRAPS), TRAPS); - // All entries in the placeholder table and their class loaders -- static void placeholders_do(void f(symbolOop, oop)); -+ static void placeholders_do(void f(Symbol*, oop)); - - // Iterate over all methods in all klasses in dictionary - static void methods_do(void f(methodOop)); -@@ -383,12 +383,12 @@ - static void verify(); - - #ifdef ASSERT -- static bool is_internal_format(symbolHandle class_name); -+ static bool is_internal_format(Symbol* class_name); - #endif - - // Verify class is in dictionary - static void verify_obj_klass_present(Handle obj, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader); - - // Initialization -@@ -469,19 +469,19 @@ - // Note: java_lang_Class::primitive_type is the inverse of java_mirror - - // Check class loader constraints -- static bool add_loader_constraint(symbolHandle name, Handle loader1, -+ static bool add_loader_constraint(Symbol* name, Handle loader1, - Handle loader2, TRAPS); -- static char* check_signature_loaders(symbolHandle signature, Handle loader1, -+ static char* check_signature_loaders(Symbol* signature, Handle loader1, - Handle loader2, bool is_method, TRAPS); - - // JSR 292 - // find the java.dyn.MethodHandles::invoke method for a given signature -- static methodOop find_method_handle_invoke(symbolHandle name, -- symbolHandle signature, -+ static methodOop find_method_handle_invoke(Symbol* name, -+ Symbol* signature, - KlassHandle accessing_klass, - TRAPS); - // ask Java to compute a java.dyn.MethodType object for a given signature -- static Handle find_method_handle_type(symbolHandle signature, -+ static Handle find_method_handle_type(Symbol* signature, - KlassHandle accessing_klass, - bool for_invokeGeneric, - bool& return_bcp_flag, -@@ -490,13 +490,13 @@ - static Handle link_method_handle_constant(KlassHandle caller, - int ref_kind, //e.g., JVM_REF_invokeVirtual - KlassHandle callee, -- symbolHandle name, -- symbolHandle signature, -+ Symbol* name, -+ Symbol* signature, - TRAPS); - // ask Java to create a dynamic call site, while linking an invokedynamic op - static Handle make_dynamic_call_site(Handle bootstrap_method, - // Callee information: -- symbolHandle name, -+ Symbol* name, - methodHandle signature_invoker, - Handle info, - // Caller information: -@@ -519,8 +519,8 @@ - - // Record the error when the first attempt to resolve a reference from a constant - // pool entry to a class fails. -- static void add_resolution_error(constantPoolHandle pool, int which, symbolHandle error); -- static symbolOop find_resolution_error(constantPoolHandle pool, int which); -+ static void add_resolution_error(constantPoolHandle pool, int which, Symbol* error); -+ static Symbol* find_resolution_error(constantPoolHandle pool, int which); - - private: - -@@ -580,29 +580,29 @@ - static SymbolPropertyTable* invoke_method_table() { return _invoke_method_table; } - - // Basic loading operations -- static klassOop resolve_instance_class_or_null(symbolHandle class_name, Handle class_loader, Handle protection_domain, TRAPS); -- static klassOop resolve_array_class_or_null(symbolHandle class_name, Handle class_loader, Handle protection_domain, TRAPS); -- static instanceKlassHandle handle_parallel_super_load(symbolHandle class_name, symbolHandle supername, Handle class_loader, Handle protection_domain, Handle lockObject, TRAPS); -+ static klassOop resolve_instance_class_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS); -+ static klassOop resolve_array_class_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS); -+ static instanceKlassHandle handle_parallel_super_load(Symbol* class_name, Symbol* supername, Handle class_loader, Handle protection_domain, Handle lockObject, TRAPS); - // Wait on SystemDictionary_lock; unlocks lockObject before - // waiting; relocks lockObject with correct recursion count - // after waiting, but before reentering SystemDictionary_lock - // to preserve lock order semantics. - static void double_lock_wait(Handle lockObject, TRAPS); - static void define_instance_class(instanceKlassHandle k, TRAPS); -- static instanceKlassHandle find_or_define_instance_class(symbolHandle class_name, -+ static instanceKlassHandle find_or_define_instance_class(Symbol* class_name, - Handle class_loader, - instanceKlassHandle k, TRAPS); -- static instanceKlassHandle load_shared_class(symbolHandle class_name, -+ static instanceKlassHandle load_shared_class(Symbol* class_name, - Handle class_loader, TRAPS); - static instanceKlassHandle load_shared_class(instanceKlassHandle ik, - Handle class_loader, TRAPS); -- static instanceKlassHandle load_instance_class(symbolHandle class_name, Handle class_loader, TRAPS); -+ static instanceKlassHandle load_instance_class(Symbol* class_name, Handle class_loader, TRAPS); - static Handle compute_loader_lock_object(Handle class_loader, TRAPS); - static void check_loader_lock_contention(Handle loader_lock, TRAPS); - static bool is_parallelCapable(Handle class_loader); - static bool is_parallelDefine(Handle class_loader); - -- static klassOop find_shared_class(symbolHandle class_name); -+ static klassOop find_shared_class(Symbol* class_name); - - // Setup link to hierarchy - static void add_to_hierarchy(instanceKlassHandle k, TRAPS); -@@ -613,34 +613,29 @@ - - // Basic find on loaded classes - static klassOop find_class(int index, unsigned int hash, -- symbolHandle name, Handle loader); -+ Symbol* name, Handle loader); -+ static klassOop find_class(Symbol* class_name, Handle class_loader); - - // Basic find on classes in the midst of being loaded -- static symbolOop find_placeholder(int index, unsigned int hash, -- symbolHandle name, Handle loader); -- -- // Basic find operation of loaded classes and classes in the midst -- // of loading; used for assertions and verification only. -- static oop find_class_or_placeholder(symbolHandle class_name, -- Handle class_loader); -+ static Symbol* find_placeholder(Symbol* name, Handle loader); - - // Updating entry in dictionary - // Add a completely loaded class -- static void add_klass(int index, symbolHandle class_name, -+ static void add_klass(int index, Symbol* class_name, - Handle class_loader, KlassHandle obj); - - // Add a placeholder for a class being loaded - static void add_placeholder(int index, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader); - static void remove_placeholder(int index, -- symbolHandle class_name, -+ Symbol* class_name, - Handle class_loader); - - // Performs cleanups after resolve_super_or_fail. This typically needs - // to be called on failure. - // Won't throw, but can block. -- static void resolution_cleanups(symbolHandle class_name, -+ static void resolution_cleanups(Symbol* class_name, - Handle class_loader, - TRAPS); - -@@ -670,7 +665,6 @@ - static bool _has_checkPackageAccess; - }; - --// Cf. vmSymbols vs. vmSymbolHandles - class SystemDictionaryHandles : AllStatic { - public: - #define WK_KLASS_HANDLE_DECLARE(name, ignore_symbol, option) \ -diff --git a/src/share/vm/classfile/verificationType.cpp b/src/share/vm/classfile/verificationType.cpp ---- openjdk/hotspot/src/share/vm/classfile/verificationType.cpp -+++ openjdk/hotspot/src/share/vm/classfile/verificationType.cpp -@@ -25,6 +25,7 @@ - #include "precompiled.hpp" - #include "classfile/symbolTable.hpp" - #include "classfile/verificationType.hpp" -+#include "classfile/verifier.hpp" - - VerificationType VerificationType::from_tag(u1 tag) { - switch (tag) { -@@ -41,7 +42,8 @@ - } - - bool VerificationType::is_reference_assignable_from( -- const VerificationType& from, instanceKlassHandle context, TRAPS) const { -+ const VerificationType& from, ClassVerifier* context, TRAPS) const { -+ instanceKlassHandle klass = context->current_class(); - if (from.is_null()) { - // null is assignable to any reference - return true; -@@ -56,8 +58,8 @@ - return true; - } - klassOop obj = SystemDictionary::resolve_or_fail( -- name_handle(), Handle(THREAD, context->class_loader()), -- Handle(THREAD, context->protection_domain()), true, CHECK_false); -+ name(), Handle(THREAD, klass->class_loader()), -+ Handle(THREAD, klass->protection_domain()), true, CHECK_false); - KlassHandle this_class(THREAD, obj); - - if (this_class->is_interface()) { -@@ -66,13 +68,13 @@ - return true; - } else if (from.is_object()) { - klassOop from_class = SystemDictionary::resolve_or_fail( -- from.name_handle(), Handle(THREAD, context->class_loader()), -- Handle(THREAD, context->protection_domain()), true, CHECK_false); -+ from.name(), Handle(THREAD, klass->class_loader()), -+ Handle(THREAD, klass->protection_domain()), true, CHECK_false); - return instanceKlass::cast(from_class)->is_subclass_of(this_class()); - } - } else if (is_array() && from.is_array()) { -- VerificationType comp_this = get_component(CHECK_false); -- VerificationType comp_from = from.get_component(CHECK_false); -+ VerificationType comp_this = get_component(context, CHECK_false); -+ VerificationType comp_from = from.get_component(context, CHECK_false); - if (!comp_this.is_bogus() && !comp_from.is_bogus()) { - return comp_this.is_assignable_from(comp_from, context, CHECK_false); - } -@@ -80,9 +82,9 @@ - return false; - } - --VerificationType VerificationType::get_component(TRAPS) const { -+VerificationType VerificationType::get_component(ClassVerifier *context, TRAPS) const { - assert(is_array() && name()->utf8_length() >= 2, "Must be a valid array"); -- symbolOop component; -+ Symbol* component; - switch (name()->byte_at(1)) { - case 'Z': return VerificationType(Boolean); - case 'B': return VerificationType(Byte); -@@ -93,12 +95,12 @@ - case 'F': return VerificationType(Float); - case 'D': return VerificationType(Double); - case '[': -- component = SymbolTable::lookup( -+ component = context->create_temporary_symbol( - name(), 1, name()->utf8_length(), - CHECK_(VerificationType::bogus_type())); - return VerificationType::reference_type(component); - case 'L': -- component = SymbolTable::lookup( -+ component = context->create_temporary_symbol( - name(), 2, name()->utf8_length() - 1, - CHECK_(VerificationType::bogus_type())); - return VerificationType::reference_type(component); -diff --git a/src/share/vm/classfile/verificationType.hpp b/src/share/vm/classfile/verificationType.hpp ---- openjdk/hotspot/src/share/vm/classfile/verificationType.hpp -+++ openjdk/hotspot/src/share/vm/classfile/verificationType.hpp -@@ -29,7 +29,7 @@ - #include "memory/allocation.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.hpp" - #include "runtime/signature.hpp" - -@@ -47,6 +47,8 @@ - ITEM_Bogus = (uint)-1 - }; - -+class ClassVerifier; -+ - class VerificationType VALUE_OBJ_CLASS_SPEC { - private: - // Least significant bits of _handle are always 0, so we use these as -@@ -56,7 +58,7 @@ - // will catch this and we'll have to add a descriminator tag to this - // structure. - union { -- symbolOop* _handle; -+ Symbol* _sym; - uintptr_t _data; - } _u; - -@@ -73,7 +75,7 @@ - TypeMask = 0x00000003, - - // Topmost types encoding -- Reference = 0x0, // _handle contains the name -+ Reference = 0x0, // _sym contains the name - Primitive = 0x1, // see below for primitive list - Uninitialized = 0x2, // 0x00ffff00 contains bci - TypeQuery = 0x3, // Meta-types used for category testing -@@ -85,7 +87,7 @@ - Category2_2ndFlag = 0x04, // Second word of a two-word value - - // special reference values -- Null = 0x00000000, // A reference with a 0 handle is null -+ Null = 0x00000000, // A reference with a 0 sym is null - - // Primitives categories (the second byte determines the category) - Category1 = (Category1Flag << 1 * BitsPerByte) | Primitive, -@@ -152,17 +154,14 @@ - static VerificationType category2_2nd_check() - { return VerificationType(Category2_2ndQuery); } - -- // For reference types, store the actual oop* handle -- static VerificationType reference_type(symbolHandle sh) { -- assert(((uintptr_t)sh.raw_value() & 0x3) == 0, "Oops must be aligned"); -+ // For reference types, store the actual Symbol -+ static VerificationType reference_type(Symbol* sh) { -+ assert(((uintptr_t)sh & 0x3) == 0, "Oops must be aligned"); - // If the above assert fails in the future because oop* isn't aligned, - // then this type encoding system will have to change to have a tag value - // to descriminate between oops and primitives. -- return VerificationType((uintptr_t)((symbolOop*)sh.raw_value())); -+ return VerificationType((uintptr_t)sh); - } -- static VerificationType reference_type(symbolOop s, TRAPS) -- { return reference_type(symbolHandle(THREAD, s)); } -- - static VerificationType uninitialized_type(u2 bci) - { return VerificationType(bci << 1 * BitsPerByte | Uninitialized); } - static VerificationType uninitialized_this_type() -@@ -242,13 +241,9 @@ - return ((_u._data & BciMask) >> 1 * BitsPerByte); - } - -- symbolHandle name_handle() const { -+ Symbol* name() const { - assert(is_reference() && !is_null(), "Must be a non-null reference"); -- return symbolHandle(_u._handle, true); -- } -- symbolOop name() const { -- assert(is_reference() && !is_null(), "Must be a non-null reference"); -- return *(_u._handle); -+ return _u._sym; - } - - bool equals(const VerificationType& t) const { -@@ -269,7 +264,7 @@ - // is assignable to another. Returns true if one can assign 'from' to - // this. - bool is_assignable_from( -- const VerificationType& from, instanceKlassHandle context, TRAPS) const { -+ const VerificationType& from, ClassVerifier* context, TRAPS) const { - if (equals(from) || is_bogus()) { - return true; - } else { -@@ -298,7 +293,7 @@ - } - } - -- VerificationType get_component(TRAPS) const; -+ VerificationType get_component(ClassVerifier* context, TRAPS) const; - - int dimensions() const { - assert(is_array(), "Must be an array"); -@@ -312,7 +307,7 @@ - private: - - bool is_reference_assignable_from( -- const VerificationType&, instanceKlassHandle, TRAPS) const; -+ const VerificationType&, ClassVerifier*, TRAPS) const; - }; - - #endif // SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP -diff --git a/src/share/vm/classfile/verifier.cpp b/src/share/vm/classfile/verifier.cpp ---- openjdk/hotspot/src/share/vm/classfile/verifier.cpp -+++ openjdk/hotspot/src/share/vm/classfile/verifier.cpp -@@ -98,10 +98,10 @@ - } - - bool Verifier::verify(instanceKlassHandle klass, Verifier::Mode mode, bool should_verify_class, TRAPS) { -+ HandleMark hm; - ResourceMark rm(THREAD); -- HandleMark hm; - -- symbolHandle exception_name; -+ Symbol* exception_name = NULL; - const size_t message_buffer_len = klass->name()->utf8_length() + 1024; - char* message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len); - -@@ -141,7 +141,7 @@ - tty->print("Verification for %s has", klassName); - tty->print_cr(" exception pending %s ", - instanceKlass::cast(PENDING_EXCEPTION->klass())->external_name()); -- } else if (!exception_name.is_null()) { -+ } else if (exception_name != NULL) { - tty->print_cr("Verification for %s failed", klassName); - } - tty->print_cr("End class verification for: %s", klassName); -@@ -150,7 +150,7 @@ - - if (HAS_PENDING_EXCEPTION) { - return false; // use the existing exception -- } else if (exception_name.is_null()) { -+ } else if (exception_name == NULL) { - return true; // verifcation succeeded - } else { // VerifyError or ClassFormatError to be created and thrown - ResourceMark rm(THREAD); -@@ -172,7 +172,7 @@ - } - - bool Verifier::is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class) { -- symbolOop name = klass->name(); -+ Symbol* name = klass->name(); - klassOop refl_magic_klass = SystemDictionary::reflect_MagicAccessorImpl_klass(); - - return (should_verify_for(klass->class_loader(), should_verify_class) && -@@ -202,7 +202,7 @@ - ); - } - --symbolHandle Verifier::inference_verify( -+Symbol* Verifier::inference_verify( - instanceKlassHandle klass, char* message, size_t message_len, TRAPS) { - JavaThread* thread = (JavaThread*)THREAD; - JNIEnv *env = thread->jni_environment(); -@@ -245,18 +245,17 @@ - // These numbers are chosen so that VerifyClassCodes interface doesn't need - // to be changed (still return jboolean (unsigned char)), and result is - // 1 when verification is passed. -- symbolHandle nh(NULL); - if (result == 0) { - return vmSymbols::java_lang_VerifyError(); - } else if (result == 1) { -- return nh; // verified. -+ return NULL; // verified. - } else if (result == 2) { -- THROW_MSG_(vmSymbols::java_lang_OutOfMemoryError(), message, nh); -+ THROW_MSG_(vmSymbols::java_lang_OutOfMemoryError(), message, NULL); - } else if (result == 3) { - return vmSymbols::java_lang_ClassFormatError(); - } else { - ShouldNotReachHere(); -- return nh; -+ return NULL; - } - } - -@@ -266,12 +265,19 @@ - - ClassVerifier::ClassVerifier( - instanceKlassHandle klass, char* msg, size_t msg_len, TRAPS) -- : _thread(THREAD), _exception_type(symbolHandle()), _message(msg), -+ : _thread(THREAD), _exception_type(NULL), _message(msg), - _message_buffer_len(msg_len), _klass(klass) { - _this_type = VerificationType::reference_type(klass->name()); -+ // Create list to hold symbols in reference area. -+ _symbols = new GrowableArray<Symbol*>(100, 0, NULL); - } - - ClassVerifier::~ClassVerifier() { -+ // Decrement the reference count for any symbols created. -+ for (int i = 0; i < _symbols->length(); i++) { -+ Symbol* s = _symbols->at(i); -+ s->decrement_refcount(); -+ } - } - - VerificationType ClassVerifier::object_type() const { -@@ -308,7 +314,6 @@ - } - - void ClassVerifier::verify_method(methodHandle m, TRAPS) { -- ResourceMark rm(THREAD); - _method = m; // initialize _method - if (_verify_verbose) { - tty->print_cr("Verifying method %s", m->name_and_sig_as_C_string()); -@@ -615,7 +620,7 @@ - VerificationType::null_type(), CHECK_VERIFY(this)); - } else { - VerificationType component = -- atype.get_component(CHECK_VERIFY(this)); -+ atype.get_component(this, CHECK_VERIFY(this)); - current_frame.push_stack(component, CHECK_VERIFY(this)); - } - no_control_flow = false; break; -@@ -1386,7 +1391,7 @@ - VerificationType throwable = - VerificationType::reference_type(vmSymbols::java_lang_Throwable()); - bool is_subclass = throwable.is_assignable_from( -- catch_type, current_class(), CHECK_VERIFY(this)); -+ catch_type, this, CHECK_VERIFY(this)); - if (!is_subclass) { - // 4286534: should throw VerifyError according to recent spec change - verify_error( -@@ -1473,8 +1478,6 @@ - if(bci >= start_pc && bci < end_pc) { - u1 flags = current_frame->flags(); - if (this_uninit) { flags |= FLAG_THIS_UNINIT; } -- -- ResourceMark rm(THREAD); - StackMapFrame* new_frame = current_frame->frame_in_exception_handler(flags); - if (catch_type_index != 0) { - // We know that this index refers to a subclass of Throwable -@@ -1575,7 +1578,7 @@ - va_end(va); - } - --klassOop ClassVerifier::load_class(symbolHandle name, TRAPS) { -+klassOop ClassVerifier::load_class(Symbol* name, TRAPS) { - // Get current loader and protection domain first. - oop loader = current_class()->class_loader(); - oop protection_domain = current_class()->protection_domain(); -@@ -1587,8 +1590,8 @@ - - bool ClassVerifier::is_protected_access(instanceKlassHandle this_class, - klassOop target_class, -- symbolOop field_name, -- symbolOop field_sig, -+ Symbol* field_name, -+ Symbol* field_sig, - bool is_method) { - No_Safepoint_Verifier nosafepoint; - -@@ -1736,7 +1739,7 @@ - } - - bool ClassVerifier::name_in_supers( -- symbolOop ref_name, instanceKlassHandle current) { -+ Symbol* ref_name, instanceKlassHandle current) { - klassOop super = current->super(); - while (super != NULL) { - if (super->klass_part()->name() == ref_name) { -@@ -1755,8 +1758,8 @@ - verify_cp_type(index, cp, 1 << JVM_CONSTANT_Fieldref, CHECK_VERIFY(this)); - - // Get field name and signature -- symbolHandle field_name = symbolHandle(THREAD, cp->name_ref_at(index)); -- symbolHandle field_sig = symbolHandle(THREAD, cp->signature_ref_at(index)); -+ Symbol* field_name = cp->name_ref_at(index); -+ Symbol* field_sig = cp->signature_ref_at(index); - - if (!SignatureVerifier::is_valid_type_signature(field_sig)) { - class_format_error( -@@ -1823,11 +1826,11 @@ - fieldDescriptor fd; - if (stack_object_type == VerificationType::uninitialized_this_type() && - target_class_type.equals(current_type()) && -- _klass->find_local_field(field_name(), field_sig(), &fd)) { -+ _klass->find_local_field(field_name, field_sig, &fd)) { - stack_object_type = current_type(); - } - is_assignable = target_class_type.is_assignable_from( -- stack_object_type, current_class(), CHECK_VERIFY(this)); -+ stack_object_type, this, CHECK_VERIFY(this)); - if (!is_assignable) { - verify_error(bci, "Bad type on operand stack in putfield"); - return; -@@ -1836,9 +1839,9 @@ - check_protected: { - if (_this_type == stack_object_type) - break; // stack_object_type must be assignable to _current_class_type -- symbolHandle ref_class_name = symbolHandle(THREAD, -- cp->klass_name_at(cp->klass_ref_index_at(index))); -- if (!name_in_supers(ref_class_name(), current_class())) -+ Symbol* ref_class_name = -+ cp->klass_name_at(cp->klass_ref_index_at(index)); -+ if (!name_in_supers(ref_class_name, current_class())) - // stack_object_type must be assignable to _current_class_type since: - // 1. stack_object_type must be assignable to ref_class. - // 2. ref_class must be _current_class or a subclass of it. It can't -@@ -1846,12 +1849,12 @@ - break; - - klassOop ref_class_oop = load_class(ref_class_name, CHECK); -- if (is_protected_access(current_class(), ref_class_oop, field_name(), -- field_sig(), false)) { -+ if (is_protected_access(current_class(), ref_class_oop, field_name, -+ field_sig, false)) { - // It's protected access, check if stack object is assignable to - // current class. - is_assignable = current_type().is_assignable_from( -- stack_object_type, current_class(), CHECK_VERIFY(this)); -+ stack_object_type, this, CHECK_VERIFY(this)); - if (!is_assignable) { - verify_error(bci, "Bad access to protected data in getfield"); - return; -@@ -1911,7 +1914,7 @@ - instanceKlassHandle mh(THREAD, m->method_holder()); - if (m->is_protected() && !mh->is_same_class_package(_klass())) { - bool assignable = current_type().is_assignable_from( -- objectref_type, current_class(), CHECK_VERIFY(this)); -+ objectref_type, this, CHECK_VERIFY(this)); - if (!assignable) { - verify_error(bci, "Bad access to protected <init> method"); - return; -@@ -1941,8 +1944,8 @@ - verify_cp_type(index, cp, types, CHECK_VERIFY(this)); - - // Get method name and signature -- symbolHandle method_name(THREAD, cp->name_ref_at(index)); -- symbolHandle method_sig(THREAD, cp->signature_ref_at(index)); -+ Symbol* method_name = cp->name_ref_at(index); -+ Symbol* method_sig = cp->signature_ref_at(index); - - if (!SignatureVerifier::is_valid_method_signature(method_sig)) { - class_format_error( -@@ -2035,7 +2038,7 @@ - if (method_name->byte_at(0) == '<') { - // Make sure <init> can only be invoked by invokespecial - if (opcode != Bytecodes::_invokespecial || -- method_name() != vmSymbols::object_initializer_name()) { -+ method_name != vmSymbols::object_initializer_name()) { - verify_error(bci, "Illegal call to internal method"); - return; - } -@@ -2044,7 +2047,7 @@ - && !ref_class_type.equals(VerificationType::reference_type( - current_class()->super()->klass_part()->name()))) { - bool subtype = ref_class_type.is_assignable_from( -- current_type(), current_class(), CHECK_VERIFY(this)); -+ current_type(), this, CHECK_VERIFY(this)); - if (!subtype) { - verify_error(bci, "Bad invokespecial instruction: " - "current class isn't assignable to reference class."); -@@ -2058,7 +2061,7 @@ - // Check objectref on operand stack - if (opcode != Bytecodes::_invokestatic && - opcode != Bytecodes::_invokedynamic) { -- if (method_name() == vmSymbols::object_initializer_name()) { // <init> method -+ if (method_name == vmSymbols::object_initializer_name()) { // <init> method - verify_invoke_init(bcs, ref_class_type, current_frame, - code_length, this_uninit, cp, CHECK_VERIFY(this)); - } else { // other methods -@@ -2070,22 +2073,22 @@ - current_frame->pop_stack(ref_class_type, CHECK_VERIFY(this)); - if (current_type() != stack_object_type) { - assert(cp->cache() == NULL, "not rewritten yet"); -- symbolHandle ref_class_name = symbolHandle(THREAD, -- cp->klass_name_at(cp->klass_ref_index_at(index))); -+ Symbol* ref_class_name = -+ cp->klass_name_at(cp->klass_ref_index_at(index)); - // See the comments in verify_field_instructions() for - // the rationale behind this. -- if (name_in_supers(ref_class_name(), current_class())) { -+ if (name_in_supers(ref_class_name, current_class())) { - klassOop ref_class = load_class(ref_class_name, CHECK); - if (is_protected_access( -- _klass, ref_class, method_name(), method_sig(), true)) { -+ _klass, ref_class, method_name, method_sig, true)) { - // It's protected access, check if stack object is - // assignable to current class. - bool is_assignable = current_type().is_assignable_from( -- stack_object_type, current_class(), CHECK_VERIFY(this)); -+ stack_object_type, this, CHECK_VERIFY(this)); - if (!is_assignable) { - if (ref_class_type.name() == vmSymbols::java_lang_Object() - && stack_object_type.is_array() -- && method_name() == vmSymbols::clone_name()) { -+ && method_name == vmSymbols::clone_name()) { - // Special case: arrays pretend to implement public Object - // clone(). - } else { -@@ -2105,7 +2108,7 @@ - } - // Push the result type. - if (sig_stream.type() != T_VOID) { -- if (method_name() == vmSymbols::object_initializer_name()) { -+ if (method_name == vmSymbols::object_initializer_name()) { - // <init> method must have a void return type - verify_error(bci, "Return type must be void in <init> method"); - return; -@@ -2130,7 +2133,7 @@ - } - - // from_bt[index] contains the array signature which has a length of 2 -- symbolHandle sig = oopFactory::new_symbol_handle( -+ Symbol* sig = create_temporary_symbol( - from_bt[index], 2, CHECK_(VerificationType::bogus_type())); - return VerificationType::reference_type(sig); - } -@@ -2143,7 +2146,6 @@ - - VerificationType component_type = - cp_index_to_type(index, cp, CHECK_VERIFY(this)); -- ResourceMark rm(THREAD); - int length; - char* arr_sig_str; - if (component_type.is_array()) { // it's an array -@@ -2163,7 +2165,7 @@ - strncpy(&arr_sig_str[2], component_name, length - 2); - arr_sig_str[length - 1] = ';'; - } -- symbolHandle arr_sig = oopFactory::new_symbol_handle( -+ Symbol* arr_sig = create_temporary_symbol( - arr_sig_str, length, CHECK_VERIFY(this)); - VerificationType new_array_type = VerificationType::reference_type(arr_sig); - current_frame->push_stack(new_array_type, CHECK_VERIFY(this)); -@@ -2256,9 +2258,25 @@ - verify_error(bci, "Method expects a return value"); - return; - } -- bool match = return_type.is_assignable_from(type, _klass, CHECK_VERIFY(this)); -+ bool match = return_type.is_assignable_from(type, this, CHECK_VERIFY(this)); - if (!match) { - verify_error(bci, "Bad return type"); - return; - } - } -+ -+// The verifier creates symbols which are substrings of Symbols. -+// These are stored in the verifier until the end of verification so that -+// they can be reference counted. -+Symbol* ClassVerifier::create_temporary_symbol(const Symbol *s, int begin, -+ int end, TRAPS) { -+ Symbol* sym = SymbolTable::new_symbol(s, begin, end, CHECK_NULL); -+ _symbols->push(sym); -+ return sym; -+} -+ -+Symbol* ClassVerifier::create_temporary_symbol(const char *s, int length, TRAPS) { -+ Symbol* sym = SymbolTable::new_symbol(s, length, CHECK_NULL); -+ _symbols->push(sym); -+ return sym; -+} -diff --git a/src/share/vm/classfile/verifier.hpp b/src/share/vm/classfile/verifier.hpp ---- openjdk/hotspot/src/share/vm/classfile/verifier.hpp -+++ openjdk/hotspot/src/share/vm/classfile/verifier.hpp -@@ -59,7 +59,7 @@ - - private: - static bool is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class); -- static symbolHandle inference_verify( -+ static Symbol* inference_verify( - instanceKlassHandle klass, char* msg, size_t msg_len, TRAPS); - }; - -@@ -69,8 +69,8 @@ - - // Summary of verifier's memory usage: - // StackMapTable is stack allocated. --// StackMapFrame are resource allocated. There is one ResourceMark --// for each method. -+// StackMapFrame are resource allocated. There is only one ResourceMark -+// for each class verification, which is created at the top level. - // There is one mutable StackMapFrame (current_frame) which is updated - // by abstract bytecode interpretation. frame_in_exception_handler() returns - // a frame that has a mutable one-item stack (ready for pushing the -@@ -80,8 +80,6 @@ - // locals/stack arrays in StackMapFrame are resource allocated. - // locals/stack arrays can be shared between StackMapFrame's, except - // the mutable StackMapFrame (current_frame). --// Care needs to be taken to make sure resource objects don't outlive --// the lifetime of their ResourceMark. - - // These macros are used similarly to CHECK macros but also check - // the status of the verifier and return if that has an error. -@@ -94,9 +92,10 @@ - class ClassVerifier : public StackObj { - private: - Thread* _thread; -- symbolHandle _exception_type; -+ Symbol* _exception_type; - char* _message; - size_t _message_buffer_len; -+ GrowableArray<Symbol*>* _symbols; // keep a list of symbols created - - void verify_method(methodHandle method, TRAPS); - char* generate_code_data(methodHandle m, u4 code_length, TRAPS); -@@ -110,7 +109,7 @@ - - bool is_protected_access( - instanceKlassHandle this_class, klassOop target_class, -- symbolOop field_name, symbolOop field_sig, bool is_method); -+ Symbol* field_name, Symbol* field_sig, bool is_method); - - void verify_cp_index(constantPoolHandle cp, int index, TRAPS); - void verify_cp_type( -@@ -165,7 +164,7 @@ - void verify_astore(u2 index, StackMapFrame* current_frame, TRAPS); - void verify_iinc (u2 index, StackMapFrame* current_frame, TRAPS); - -- bool name_in_supers(symbolOop ref_name, instanceKlassHandle current); -+ bool name_in_supers(Symbol* ref_name, instanceKlassHandle current); - - VerificationType object_type() const; - -@@ -206,8 +205,8 @@ - void verify_class(TRAPS); - - // Return status modes -- symbolHandle result() const { return _exception_type; } -- bool has_error() const { return !(result().is_null()); } -+ Symbol* result() const { return _exception_type; } -+ bool has_error() const { return result() != NULL; } - - // Called when verify or class format errors are encountered. - // May throw an exception based upon the mode. -@@ -216,16 +215,22 @@ - void class_format_error(const char* fmt, ...); - void format_error_message(const char* fmt, int offset, va_list args); - -- klassOop load_class(symbolHandle name, TRAPS); -+ klassOop load_class(Symbol* name, TRAPS); - - int change_sig_to_verificationType( - SignatureStream* sig_type, VerificationType* inference_type, TRAPS); - - VerificationType cp_index_to_type(int index, constantPoolHandle cp, TRAPS) { -- return VerificationType::reference_type( -- symbolHandle(THREAD, cp->klass_name_at(index))); -+ return VerificationType::reference_type(cp->klass_name_at(index)); - } - -+ // Keep a list of temporary symbols created during verification because -+ // their reference counts need to be decrememented when the verifier object -+ // goes out of scope. Since these symbols escape the scope in which they're -+ // created, we can't use a TempNewSymbol. -+ Symbol* create_temporary_symbol(const Symbol* s, int begin, int end, TRAPS); -+ Symbol* create_temporary_symbol(const char *s, int length, TRAPS); -+ - static bool _verify_verbose; // for debugging - }; - -@@ -236,9 +241,14 @@ - case T_OBJECT: - case T_ARRAY: - { -- symbolOop name = sig_type->as_symbol(CHECK_0); -+ Symbol* name = sig_type->as_symbol(CHECK_0); -+ // Create another symbol to save as signature stream unreferences -+ // this symbol. -+ Symbol* name_copy = -+ create_temporary_symbol(name, 0, name->utf8_length(), CHECK_0); -+ assert(name_copy == name, "symbols don't match"); - *inference_type = -- VerificationType::reference_type(symbolHandle(THREAD, name)); -+ VerificationType::reference_type(name_copy); - return 1; - } - case T_LONG: -diff --git a/src/share/vm/classfile/vmSymbols.cpp b/src/share/vm/classfile/vmSymbols.cpp ---- openjdk/hotspot/src/share/vm/classfile/vmSymbols.cpp -+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.cpp -@@ -30,11 +30,11 @@ - #include "utilities/xmlstream.hpp" - - --symbolOop vmSymbols::_symbols[vmSymbols::SID_LIMIT]; -+Symbol* vmSymbols::_symbols[vmSymbols::SID_LIMIT]; - --symbolOop vmSymbols::_type_signatures[T_VOID+1] = { NULL /*, NULL...*/ }; -+Symbol* vmSymbols::_type_signatures[T_VOID+1] = { NULL /*, NULL...*/ }; - --inline int compare_symbol(symbolOop a, symbolOop b) { -+inline int compare_symbol(Symbol* a, Symbol* b) { - if (a == b) return 0; - // follow the natural address order: - return (address)a > (address)b ? +1 : -1; -@@ -43,8 +43,8 @@ - static vmSymbols::SID vm_symbol_index[vmSymbols::SID_LIMIT]; - extern "C" { - static int compare_vmsymbol_sid(const void* void_a, const void* void_b) { -- symbolOop a = vmSymbols::symbol_at(*((vmSymbols::SID*) void_a)); -- symbolOop b = vmSymbols::symbol_at(*((vmSymbols::SID*) void_b)); -+ Symbol* a = vmSymbols::symbol_at(*((vmSymbols::SID*) void_a)); -+ Symbol* b = vmSymbols::symbol_at(*((vmSymbols::SID*) void_b)); - return compare_symbol(a, b); - } - } -@@ -79,7 +79,7 @@ - if (!UseSharedSpaces) { - const char* string = &vm_symbol_bodies[0]; - for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) { -- symbolOop sym = oopFactory::new_symbol(string, CHECK); -+ Symbol* sym = SymbolTable::new_symbol(string, CHECK); - _symbols[index] = sym; - string += strlen(string); // skip string body - string += 1; // skip trailing null -@@ -100,7 +100,7 @@ - #ifdef ASSERT - // Check for duplicates: - for (int i1 = (int)FIRST_SID; i1 < (int)SID_LIMIT; i1++) { -- symbolOop sym = symbol_at((SID)i1); -+ Symbol* sym = symbol_at((SID)i1); - for (int i2 = (int)FIRST_SID; i2 < i1; i2++) { - if (symbol_at((SID)i2) == sym) { - tty->print("*** Duplicate VM symbol SIDs %s(%d) and %s(%d): \"", -@@ -128,16 +128,16 @@ - // Spot-check correspondence between strings, symbols, and enums: - assert(_symbols[NO_SID] == NULL, "must be"); - const char* str = "java/lang/Object"; -- symbolOop sym = oopFactory::new_symbol(str, CHECK); -- assert(strcmp(str, (char*)sym->base()) == 0, ""); -- assert(sym == java_lang_Object(), ""); -+ TempNewSymbol jlo = SymbolTable::new_symbol(str, CHECK); -+ assert(strncmp(str, (char*)jlo->base(), jlo->utf8_length()) == 0, ""); -+ assert(jlo == java_lang_Object(), ""); - SID sid = VM_SYMBOL_ENUM_NAME(java_lang_Object); -- assert(find_sid(sym) == sid, ""); -- assert(symbol_at(sid) == sym, ""); -+ assert(find_sid(jlo) == sid, ""); -+ assert(symbol_at(sid) == jlo, ""); - - // Make sure find_sid produces the right answer in each case. - for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) { -- sym = symbol_at((SID)index); -+ Symbol* sym = symbol_at((SID)index); - sid = find_sid(sym); - assert(sid == (SID)index, "symbol index works"); - // Note: If there are duplicates, this assert will fail. -@@ -147,8 +147,8 @@ - // The string "format" happens (at the moment) not to be a vmSymbol, - // though it is a method name in java.lang.String. - str = "format"; -- sym = oopFactory::new_symbol(str, CHECK); -- sid = find_sid(sym); -+ TempNewSymbol fmt = SymbolTable::new_symbol(str, CHECK); -+ sid = find_sid(fmt); - assert(sid == NO_SID, "symbol index works (negative test)"); - } - #endif -@@ -172,22 +172,23 @@ - - - --void vmSymbols::oops_do(OopClosure* f, bool do_all) { -+void vmSymbols::symbols_do(SymbolClosure* f) { - for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) { -- f->do_oop((oop*) &_symbols[index]); -+ f->do_symbol(&_symbols[index]); - } - for (int i = 0; i < T_VOID+1; i++) { -- if (_type_signatures[i] != NULL) { -- assert(i >= T_BOOLEAN, "checking"); -- f->do_oop((oop*)&_type_signatures[i]); -- } else if (do_all) { -- f->do_oop((oop*)&_type_signatures[i]); -- } -+ f->do_symbol(&_type_signatures[i]); - } - } - -+void vmSymbols::serialize(SerializeOopClosure* soc) { -+ soc->do_region((u_char*)&_symbols[FIRST_SID], -+ (SID_LIMIT - FIRST_SID) * sizeof(_symbols[0])); -+ soc->do_region((u_char*)_type_signatures, sizeof(_type_signatures)); -+} - --BasicType vmSymbols::signature_type(symbolOop s) { -+ -+BasicType vmSymbols::signature_type(Symbol* s) { - assert(s != NULL, "checking"); - for (int i = T_BOOLEAN; i < T_VOID+1; i++) { - if (s == _type_signatures[i]) { -@@ -205,7 +206,7 @@ - // (Typical counts are calls=7000 and probes=17000.) - #endif - --vmSymbols::SID vmSymbols::find_sid(symbolOop symbol) { -+vmSymbols::SID vmSymbols::find_sid(Symbol* symbol) { - // Handle the majority of misses by a bounds check. - // Then, use a binary search over the index. - // Expected trip count is less than log2_SID_LIMIT, about eight. -@@ -260,7 +261,7 @@ - // (We have already proven that there are no duplicates in the list.) - SID sid2 = NO_SID; - for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) { -- symbolOop sym2 = symbol_at((SID)index); -+ Symbol* sym2 = symbol_at((SID)index); - if (sym2 == symbol) { - sid2 = (SID)index; - break; -@@ -319,9 +320,9 @@ - - methodOop vmIntrinsics::method_for(vmIntrinsics::ID id) { - if (id == _none) return NULL; -- symbolOop cname = vmSymbols::symbol_at(class_for(id)); -- symbolOop mname = vmSymbols::symbol_at(name_for(id)); -- symbolOop msig = vmSymbols::symbol_at(signature_for(id)); -+ Symbol* cname = vmSymbols::symbol_at(class_for(id)); -+ Symbol* mname = vmSymbols::symbol_at(name_for(id)); -+ Symbol* msig = vmSymbols::symbol_at(signature_for(id)); - if (cname == NULL || mname == NULL || msig == NULL) return NULL; - klassOop k = SystemDictionary::find_well_known_klass(cname); - if (k == NULL) return NULL; -@@ -490,17 +491,17 @@ - #ifndef PRODUCT - // verify_method performs an extra check on a matched intrinsic method - --static bool match_method(methodOop m, symbolOop n, symbolOop s) { -+static bool match_method(methodOop m, Symbol* n, Symbol* s) { - return (m->name() == n && - m->signature() == s); - } - --static vmIntrinsics::ID match_method_with_klass(methodOop m, symbolOop mk) { -+static vmIntrinsics::ID match_method_with_klass(methodOop m, Symbol* mk) { - #define VM_INTRINSIC_MATCH(id, klassname, namepart, sigpart, flags) \ -- { symbolOop k = vmSymbols::klassname(); \ -+ { Symbol* k = vmSymbols::klassname(); \ - if (mk == k) { \ -- symbolOop n = vmSymbols::namepart(); \ -- symbolOop s = vmSymbols::sigpart(); \ -+ Symbol* n = vmSymbols::namepart(); \ -+ Symbol* s = vmSymbols::sigpart(); \ - if (match_method(m, n, s)) \ - return vmIntrinsics::id; \ - } } -@@ -511,7 +512,7 @@ - } - - void vmIntrinsics::verify_method(ID actual_id, methodOop m) { -- symbolOop mk = Klass::cast(m->method_holder())->name(); -+ Symbol* mk = Klass::cast(m->method_holder())->name(); - ID declared_id = match_method_with_klass(m, mk); - - if (declared_id == actual_id) return; // success -diff --git a/src/share/vm/classfile/vmSymbols.hpp b/src/share/vm/classfile/vmSymbols.hpp ---- openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp -+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp -@@ -25,17 +25,15 @@ - #ifndef SHARE_VM_CLASSFILE_VMSYMBOLS_HPP - #define SHARE_VM_CLASSFILE_VMSYMBOLS_HPP - --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" -+#include "memory/iterator.hpp" - --// The classes vmSymbols and vmSymbolHandles are a name spaces for fast lookup of --// symbols commonly used in the VM. The first class return a symbolOop, while the --// second class returns a SymbolHandle. The underlying data structure is shared --// between the two classes. -+// The class vmSymbols is a name space for fast lookup of -+// symbols commonly used in the VM. - // - // Sample usage: - // --// symbolOop obj = vmSymbols::java_lang_Object()(); --// SymbolHandle handle = vmSymbolHandles::java_lang_Object(); -+// Symbol* obj = vmSymbols::java_lang_Object(); - - - // Useful sub-macros exported by this header file: -@@ -461,7 +459,7 @@ - VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, do_alias) \ - \ - /* returned by the C1 compiler in case there's not enough memory to allocate a new symbol*/ \ -- template(dummy_symbol_oop, "illegal symbol") \ -+ template(dummy_symbol, "illegal symbol") \ - \ - /* used by ClassFormatError when class name is not known yet */ \ - template(unknown_class_name, "<Unknown>") \ -@@ -940,10 +938,9 @@ - // Class vmSymbols - - class vmSymbols: AllStatic { -- friend class vmSymbolHandles; - friend class vmIntrinsics; - public: -- // enum for figuring positions and size of array holding symbolOops -+ // enum for figuring positions and size of array holding Symbol*s - enum SID { - NO_SID = 0, - -@@ -965,39 +962,42 @@ - - private: - // The symbol array -- static symbolOop _symbols[]; -+ static Symbol* _symbols[]; - - // Field signatures indexed by BasicType. -- static symbolOop _type_signatures[T_VOID+1]; -+ static Symbol* _type_signatures[T_VOID+1]; - - public: - // Initialization - static void initialize(TRAPS); - // Accessing -- #define VM_SYMBOL_DECLARE(name, ignore) \ -- static symbolOop name() { return _symbols[VM_SYMBOL_ENUM_NAME(name)]; } -+ #define VM_SYMBOL_DECLARE(name, ignore) \ -+ static Symbol* name() { \ -+ return _symbols[VM_SYMBOL_ENUM_NAME(name)]; \ -+ } - VM_SYMBOLS_DO(VM_SYMBOL_DECLARE, VM_SYMBOL_DECLARE) - #undef VM_SYMBOL_DECLARE - -- // GC support -- static void oops_do(OopClosure* f, bool do_all = false); -+ // Sharing support -+ static void symbols_do(SymbolClosure* f); -+ static void serialize(SerializeOopClosure* soc); - -- static symbolOop type_signature(BasicType t) { -+ static Symbol* type_signature(BasicType t) { - assert((uint)t < T_VOID+1, "range check"); - assert(_type_signatures[t] != NULL, "domain check"); - return _type_signatures[t]; - } - // inverse of type_signature; returns T_OBJECT if s is not recognized -- static BasicType signature_type(symbolOop s); -+ static BasicType signature_type(Symbol* s); - -- static symbolOop symbol_at(SID id) { -+ static Symbol* symbol_at(SID id) { - assert(id >= FIRST_SID && id < SID_LIMIT, "oob"); - assert(_symbols[id] != NULL, "init"); - return _symbols[id]; - } - - // Returns symbol's SID if one is assigned, else NO_SID. -- static SID find_sid(symbolOop symbol); -+ static SID find_sid(Symbol* symbol); - - #ifndef PRODUCT - // No need for this in the product: -@@ -1005,34 +1005,6 @@ - #endif //PRODUCT - }; - -- --// Class vmSymbolHandles -- --class vmSymbolHandles: AllStatic { -- friend class vmIntrinsics; -- friend class ciObjectFactory; -- -- public: -- // Accessing -- #define VM_SYMBOL_HANDLE_DECLARE(name, ignore) \ -- static symbolHandle name() { return symbol_handle_at(vmSymbols::VM_SYMBOL_ENUM_NAME(name)); } -- VM_SYMBOLS_DO(VM_SYMBOL_HANDLE_DECLARE, VM_SYMBOL_HANDLE_DECLARE) -- #undef VM_SYMBOL_HANDLE_DECLARE -- -- static symbolHandle symbol_handle_at(vmSymbols::SID id) { -- return symbolHandle(&vmSymbols::_symbols[(int)id], false); -- } -- -- static symbolHandle type_signature(BasicType t) { -- assert(vmSymbols::type_signature(t) != NULL, "domain check"); -- return symbolHandle(&vmSymbols::_type_signatures[t], false); -- } -- // inverse of type_signature; returns T_OBJECT if s is not recognized -- static BasicType signature_type(symbolHandle s) { -- return vmSymbols::signature_type(s()); -- } --}; -- - // VM Intrinsic ID's uniquely identify some very special methods - class vmIntrinsics: AllStatic { - friend class vmSymbols; -diff --git a/src/share/vm/code/compiledIC.cpp b/src/share/vm/code/compiledIC.cpp ---- openjdk/hotspot/src/share/vm/code/compiledIC.cpp -+++ openjdk/hotspot/src/share/vm/code/compiledIC.cpp -@@ -34,7 +34,7 @@ - #include "memory/oopFactory.hpp" - #include "oops/methodOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/icache.hpp" - #include "runtime/sharedRuntime.hpp" - #include "runtime/stubRoutines.hpp" -diff --git a/src/share/vm/code/dependencies.cpp b/src/share/vm/code/dependencies.cpp ---- openjdk/hotspot/src/share/vm/code/dependencies.cpp -+++ openjdk/hotspot/src/share/vm/code/dependencies.cpp -@@ -628,8 +628,8 @@ - - private: - // optional method descriptor to check for: -- symbolOop _name; -- symbolOop _signature; -+ Symbol* _name; -+ Symbol* _signature; - - // special classes which are not allowed to be witnesses: - klassOop _participants[PARTICIPANT_LIMIT+1]; -diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp ---- openjdk/hotspot/src/share/vm/code/nmethod.cpp -+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp -@@ -57,9 +57,9 @@ - { \ - methodOop m = (method); \ - if (m != NULL) { \ -- symbolOop klass_name = m->klass_name(); \ -- symbolOop name = m->name(); \ -- symbolOop signature = m->signature(); \ -+ Symbol* klass_name = m->klass_name(); \ -+ Symbol* name = m->name(); \ -+ Symbol* signature = m->signature(); \ - HS_DTRACE_PROBE6(hotspot, compiled__method__unload, \ - klass_name->bytes(), klass_name->utf8_length(), \ - name->bytes(), name->utf8_length(), \ -@@ -1868,7 +1868,7 @@ - SimpleScopeDesc ssd(this, fr.pc()); - Bytecode_invoke call(ssd.method(), ssd.bci()); - bool has_receiver = call.has_receiver(); -- symbolOop signature = call.signature(); -+ Symbol* signature = call.signature(); - fr.oops_compiled_arguments_do(signature, has_receiver, reg_map, f); - } - #endif // !SHARK -@@ -2639,7 +2639,7 @@ - } else { - bool did_name = false; - if (!at_this && ss.is_object()) { -- symbolOop name = ss.as_symbol_or_null(); -+ Symbol* name = ss.as_symbol_or_null(); - if (name != NULL) { - name->print_value_on(stream); - did_name = true; -diff --git a/src/share/vm/compiler/compileBroker.cpp b/src/share/vm/compiler/compileBroker.cpp ---- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp -+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp -@@ -66,9 +66,9 @@ - #define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method) \ - { \ - char* comp_name = (char*)(compiler)->name(); \ -- symbolOop klass_name = (method)->klass_name(); \ -- symbolOop name = (method)->name(); \ -- symbolOop signature = (method)->signature(); \ -+ Symbol* klass_name = (method)->klass_name(); \ -+ Symbol* name = (method)->name(); \ -+ Symbol* signature = (method)->signature(); \ - HS_DTRACE_PROBE8(hotspot, method__compile__begin, \ - comp_name, strlen(comp_name), \ - klass_name->bytes(), klass_name->utf8_length(), \ -@@ -79,9 +79,9 @@ - #define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success) \ - { \ - char* comp_name = (char*)(compiler)->name(); \ -- symbolOop klass_name = (method)->klass_name(); \ -- symbolOop name = (method)->name(); \ -- symbolOop signature = (method)->signature(); \ -+ Symbol* klass_name = (method)->klass_name(); \ -+ Symbol* name = (method)->name(); \ -+ Symbol* signature = (method)->signature(); \ - HS_DTRACE_PROBE9(hotspot, method__compile__end, \ - comp_name, strlen(comp_name), \ - klass_name->bytes(), klass_name->utf8_length(), \ -@@ -689,7 +689,7 @@ - CompilerThread* compiler_thread = NULL; - - klassOop k = -- SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), -+ SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), - true, CHECK_0); - instanceKlassHandle klass (THREAD, k); - instanceHandle thread_oop = klass->allocate_instance_handle(CHECK_0); -@@ -700,8 +700,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_special(&result, thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - thread_group, - string, - CHECK_0); -diff --git a/src/share/vm/compiler/compileLog.hpp b/src/share/vm/compiler/compileLog.hpp ---- openjdk/hotspot/src/share/vm/compiler/compileLog.hpp -+++ openjdk/hotspot/src/share/vm/compiler/compileLog.hpp -@@ -63,7 +63,7 @@ - stringStream* context() { return &_context; } - - void name(ciSymbol* s); // name='s' -- void name(symbolHandle s) { xmlStream::name(s); } -+ void name(Symbol* s) { xmlStream::name(s); } - - // Output an object description, return obj->ident(). - int identify(ciObject* obj); -diff --git a/src/share/vm/compiler/compilerOracle.cpp b/src/share/vm/compiler/compilerOracle.cpp ---- openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp -+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp -@@ -30,7 +30,7 @@ - #include "oops/klass.hpp" - #include "oops/methodOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.inline.hpp" - #include "runtime/jniHandles.hpp" - -@@ -46,33 +46,33 @@ - }; - - protected: -- jobject _class_name; -+ Symbol* _class_name; -+ Symbol* _method_name; -+ Symbol* _signature; - Mode _class_mode; -- jobject _method_name; - Mode _method_mode; -- jobject _signature; - MethodMatcher* _next; - -- static bool match(symbolHandle candidate, symbolHandle match, Mode match_mode); -+ static bool match(Symbol* candidate, Symbol* match, Mode match_mode); - -- symbolHandle class_name() const { return (symbolOop)JNIHandles::resolve_non_null(_class_name); } -- symbolHandle method_name() const { return (symbolOop)JNIHandles::resolve_non_null(_method_name); } -- symbolHandle signature() const { return (symbolOop)JNIHandles::resolve(_signature); } -+ Symbol* class_name() const { return _class_name; } -+ Symbol* method_name() const { return _method_name; } -+ Symbol* signature() const { return _signature; } - - public: -- MethodMatcher(symbolHandle class_name, Mode class_mode, -- symbolHandle method_name, Mode method_mode, -- symbolHandle signature, MethodMatcher* next); -- MethodMatcher(symbolHandle class_name, symbolHandle method_name, MethodMatcher* next); -+ MethodMatcher(Symbol* class_name, Mode class_mode, -+ Symbol* method_name, Mode method_mode, -+ Symbol* signature, MethodMatcher* next); -+ MethodMatcher(Symbol* class_name, Symbol* method_name, MethodMatcher* next); - - // utility method - MethodMatcher* find(methodHandle method) { -- symbolHandle class_name = Klass::cast(method->method_holder())->name(); -- symbolHandle method_name = method->name(); -+ Symbol* class_name = Klass::cast(method->method_holder())->name(); -+ Symbol* method_name = method->name(); - for (MethodMatcher* current = this; current != NULL; current = current->_next) { - if (match(class_name, current->class_name(), current->_class_mode) && - match(method_name, current->method_name(), current->_method_mode) && -- (current->signature().is_null() || current->signature()() == method->signature())) { -+ (current->signature() == NULL || current->signature() == method->signature())) { - return current; - } - } -@@ -85,14 +85,14 @@ - - MethodMatcher* next() const { return _next; } - -- static void print_symbol(symbolHandle h, Mode mode) { -+ static void print_symbol(Symbol* h, Mode mode) { - ResourceMark rm; - - if (mode == Suffix || mode == Substring || mode == Any) { - tty->print("*"); - } - if (mode != Any) { -- h()->print_symbol_on(tty); -+ h->print_symbol_on(tty); - } - if (mode == Prefix || mode == Substring) { - tty->print("*"); -@@ -103,7 +103,7 @@ - print_symbol(class_name(), _class_mode); - tty->print("."); - print_symbol(method_name(), _method_mode); -- if (!signature().is_null()) { -+ if (signature() != NULL) { - tty->print(" "); - signature()->print_symbol_on(tty); - } -@@ -115,9 +115,9 @@ - } - }; - --MethodMatcher::MethodMatcher(symbolHandle class_name, symbolHandle method_name, MethodMatcher* next) { -- _class_name = JNIHandles::make_global(class_name); -- _method_name = JNIHandles::make_global(method_name); -+MethodMatcher::MethodMatcher(Symbol* class_name, Symbol* method_name, MethodMatcher* next) { -+ _class_name = class_name; -+ _method_name = method_name; - _next = next; - _class_mode = MethodMatcher::Exact; - _method_mode = MethodMatcher::Exact; -@@ -125,24 +125,24 @@ - } - - --MethodMatcher::MethodMatcher(symbolHandle class_name, Mode class_mode, -- symbolHandle method_name, Mode method_mode, -- symbolHandle signature, MethodMatcher* next): -+MethodMatcher::MethodMatcher(Symbol* class_name, Mode class_mode, -+ Symbol* method_name, Mode method_mode, -+ Symbol* signature, MethodMatcher* next): - _class_mode(class_mode) - , _method_mode(method_mode) - , _next(next) -- , _class_name(JNIHandles::make_global(class_name())) -- , _method_name(JNIHandles::make_global(method_name())) -- , _signature(JNIHandles::make_global(signature())) { -+ , _class_name(class_name) -+ , _method_name(method_name) -+ , _signature(signature) { - } - --bool MethodMatcher::match(symbolHandle candidate, symbolHandle match, Mode match_mode) { -+bool MethodMatcher::match(Symbol* candidate, Symbol* match, Mode match_mode) { - if (match_mode == Any) { - return true; - } - - if (match_mode == Exact) { -- return candidate() == match(); -+ return candidate == match; - } - - ResourceMark rm; -@@ -171,9 +171,9 @@ - class MethodOptionMatcher: public MethodMatcher { - const char * option; - public: -- MethodOptionMatcher(symbolHandle class_name, Mode class_mode, -- symbolHandle method_name, Mode method_mode, -- symbolHandle signature, const char * opt, MethodMatcher* next): -+ MethodOptionMatcher(Symbol* class_name, Mode class_mode, -+ Symbol* method_name, Mode method_mode, -+ Symbol* signature, const char * opt, MethodMatcher* next): - MethodMatcher(class_name, class_mode, method_name, method_mode, signature, next) { - option = opt; - } -@@ -256,9 +256,9 @@ - - - static MethodMatcher* add_predicate(OracleCommand command, -- symbolHandle class_name, MethodMatcher::Mode c_mode, -- symbolHandle method_name, MethodMatcher::Mode m_mode, -- symbolHandle signature) { -+ Symbol* class_name, MethodMatcher::Mode c_mode, -+ Symbol* method_name, MethodMatcher::Mode m_mode, -+ Symbol* signature) { - assert(command != OptionCommand, "must use add_option_string"); - if (command == LogCommand && !LogCompilation && lists[LogCommand] == NULL) - tty->print_cr("Warning: +LogCompilation must be enabled in order for individual methods to be logged."); -@@ -268,9 +268,9 @@ - - - --static MethodMatcher* add_option_string(symbolHandle class_name, MethodMatcher::Mode c_mode, -- symbolHandle method_name, MethodMatcher::Mode m_mode, -- symbolHandle signature, -+static MethodMatcher* add_option_string(Symbol* class_name, MethodMatcher::Mode c_mode, -+ Symbol* method_name, MethodMatcher::Mode m_mode, -+ Symbol* signature, - const char* option) { - lists[OptionCommand] = new MethodOptionMatcher(class_name, c_mode, method_name, m_mode, - signature, option, lists[OptionCommand]); -@@ -497,9 +497,9 @@ - - if (scan_line(line, class_name, &c_match, method_name, &m_match, &bytes_read, error_msg)) { - EXCEPTION_MARK; -- symbolHandle c_name = oopFactory::new_symbol_handle(class_name, CHECK); -- symbolHandle m_name = oopFactory::new_symbol_handle(method_name, CHECK); -- symbolHandle signature; -+ Symbol* c_name = SymbolTable::new_symbol(class_name, CHECK); -+ Symbol* m_name = SymbolTable::new_symbol(method_name, CHECK); -+ Symbol* signature = NULL; - - line += bytes_read; - // there might be a signature following the method. -@@ -507,7 +507,7 @@ - if (1 == sscanf(line, "%*[ \t](%254[[);/" RANGEBASE "]%n", sig + 1, &bytes_read)) { - sig[0] = '('; - line += bytes_read; -- signature = oopFactory::new_symbol_handle(sig, CHECK); -+ signature = SymbolTable::new_symbol(sig, CHECK); - } - - if (command == OptionCommand) { -@@ -727,9 +727,9 @@ - } - - EXCEPTION_MARK; -- symbolHandle c_name = oopFactory::new_symbol_handle(className, CHECK); -- symbolHandle m_name = oopFactory::new_symbol_handle(methodName, CHECK); -- symbolHandle signature; -+ Symbol* c_name = SymbolTable::new_symbol(className, CHECK); -+ Symbol* m_name = SymbolTable::new_symbol(methodName, CHECK); -+ Symbol* signature = NULL; - - add_predicate(CompileOnlyCommand, c_name, c_match, m_name, m_match, signature); - if (PrintVMOptions) { -diff --git a/src/share/vm/compiler/compilerOracle.hpp b/src/share/vm/compiler/compilerOracle.hpp ---- openjdk/hotspot/src/share/vm/compiler/compilerOracle.hpp -+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.hpp -@@ -31,8 +31,6 @@ - // CompilerOracle is an interface for turning on and off compilation - // for some methods - --class symbolHandle; -- - class CompilerOracle : AllStatic { - private: - static bool _quiet; -diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp -@@ -5921,9 +5921,10 @@ - - { - TraceTime t("scrub symbol & string tables", PrintGCDetails, false, gclog_or_tty); -- // Now clean up stale oops in SymbolTable and StringTable -- SymbolTable::unlink(&_is_alive_closure); -+ // Now clean up stale oops in StringTable - StringTable::unlink(&_is_alive_closure); -+ // Clean up unreferenced symbols in symbol table. -+ SymbolTable::unlink(); - } - } - -diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -@@ -1944,9 +1944,10 @@ - rp->verify_no_references_recorded(); - assert(!rp->discovery_enabled(), "should have been disabled"); - -- // Now clean up stale oops in SymbolTable and StringTable -- SymbolTable::unlink(&g1_is_alive); -+ // Now clean up stale oops in StringTable - StringTable::unlink(&g1_is_alive); -+ // Clean up unreferenced symbols in symbol table. -+ SymbolTable::unlink(); - } - - void ConcurrentMark::swapMarkBitMaps() { -diff --git a/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp -@@ -172,9 +172,10 @@ - assert(GenMarkSweep::_marking_stack.is_empty(), "just drained"); - - -- // Visit symbol and interned string tables and delete unmarked oops -- SymbolTable::unlink(&GenMarkSweep::is_alive); -+ // Visit interned string tables and delete unmarked oops - StringTable::unlink(&GenMarkSweep::is_alive); -+ // Clean up unreferenced symbols in symbol table. -+ SymbolTable::unlink(); - - assert(GenMarkSweep::_marking_stack.is_empty(), - "stack should be empty by now"); -diff --git a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp -@@ -116,10 +116,6 @@ - SystemDictionary::always_strong_oops_do(&mark_and_push_closure); - break; - -- case vm_symbols: -- vmSymbols::oops_do(&mark_and_push_closure); -- break; -- - case code_cache: - // Do not treat nmethods as strong roots for mark/sweep, since we can unload them. - //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(&mark_and_push_closure)); -diff --git a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp -@@ -98,9 +98,8 @@ - management = 6, - jvmti = 7, - system_dictionary = 8, -- vm_symbols = 9, -- reference_processing = 10, -- code_cache = 11 -+ reference_processing = 9, -+ code_cache = 10 - }; - private: - RootType _root_type; -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp -@@ -527,7 +527,6 @@ - Management::oops_do(mark_and_push_closure()); - JvmtiExport::oops_do(mark_and_push_closure()); - SystemDictionary::always_strong_oops_do(mark_and_push_closure()); -- vmSymbols::oops_do(mark_and_push_closure()); - // Do not treat nmethods as strong roots for mark/sweep, since we can unload them. - //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure())); - } -@@ -558,9 +557,10 @@ - follow_mdo_weak_refs(); - assert(_marking_stack.is_empty(), "just drained"); - -- // Visit symbol and interned string tables and delete unmarked oops -- SymbolTable::unlink(is_alive_closure()); -+ // Visit interned string tables and delete unmarked oops - StringTable::unlink(is_alive_closure()); -+ // Clean up unreferenced symbols in symbol table. -+ SymbolTable::unlink(); - - assert(_marking_stack.is_empty(), "stack should be empty by now"); - } -@@ -634,7 +634,6 @@ - JvmtiExport::oops_do(adjust_root_pointer_closure()); - // SO_AllClasses - SystemDictionary::oops_do(adjust_root_pointer_closure()); -- vmSymbols::oops_do(adjust_root_pointer_closure()); - //CodeCache::scavenge_root_nmethods_oops_do(adjust_root_pointer_closure()); - - // Now adjust pointers in remaining weak roots. (All of which should -@@ -643,7 +642,6 @@ - JNIHandles::weak_oops_do(&always_true, adjust_root_pointer_closure()); - - CodeCache::oops_do(adjust_pointer_closure()); -- SymbolTable::oops_do(adjust_root_pointer_closure()); - StringTable::oops_do(adjust_root_pointer_closure()); - ref_processor()->weak_oops_do(adjust_root_pointer_closure()); - PSScavenge::reference_processor()->weak_oops_do(adjust_root_pointer_closure()); -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp -@@ -2375,7 +2375,6 @@ - q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::management)); - q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::system_dictionary)); - q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::jvmti)); -- q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::vm_symbols)); - q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::code_cache)); - - if (parallel_gc_threads > 1) { -@@ -2425,9 +2424,10 @@ - // Revisit memoized MDO's and clear any unmarked weak refs - follow_mdo_weak_refs(); - -- // Visit symbol and interned string tables and delete unmarked oops -- SymbolTable::unlink(is_alive_closure()); -+ // Visit interned string tables and delete unmarked oops - StringTable::unlink(is_alive_closure()); -+ // Clean up unreferenced symbols in symbol table. -+ SymbolTable::unlink(); - - assert(cm->marking_stacks_empty(), "marking stacks should be empty"); - } -@@ -2456,7 +2456,6 @@ - JvmtiExport::oops_do(adjust_root_pointer_closure()); - // SO_AllClasses - SystemDictionary::oops_do(adjust_root_pointer_closure()); -- vmSymbols::oops_do(adjust_root_pointer_closure()); - - // Now adjust pointers in remaining weak roots. (All of which should - // have been cleared if they pointed to non-surviving objects.) -@@ -2464,7 +2463,6 @@ - JNIHandles::weak_oops_do(&always_true, adjust_root_pointer_closure()); - - CodeCache::oops_do(adjust_pointer_closure()); -- SymbolTable::oops_do(adjust_root_pointer_closure()); - StringTable::oops_do(adjust_root_pointer_closure()); - ref_processor()->weak_oops_do(adjust_root_pointer_closure()); - // Roots were visited so references into the young gen in roots -diff --git a/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp b/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp -@@ -187,7 +187,7 @@ - - SurrogateLockerThread* SurrogateLockerThread::make(TRAPS) { - klassOop k = -- SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), -+ SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), - true, CHECK_NULL); - instanceKlassHandle klass (THREAD, k); - instanceHandle thread_oop = klass->allocate_instance_handle(CHECK_NULL); -@@ -200,8 +200,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_special(&result, thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - thread_group, - string, - CHECK_NULL); -diff --git a/src/share/vm/gc_implementation/shared/markSweep.cpp b/src/share/vm/gc_implementation/shared/markSweep.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp -@@ -111,7 +111,7 @@ - - MarkSweep::MarkAndPushClosure MarkSweep::mark_and_push_closure; - --void MarkSweep::MarkAndPushClosure::do_oop(oop* p) { mark_and_push(p); } -+void MarkSweep::MarkAndPushClosure::do_oop(oop* p) { assert(*p == NULL || (*p)->is_oop(), ""); mark_and_push(p); } - void MarkSweep::MarkAndPushClosure::do_oop(narrowOop* p) { mark_and_push(p); } - - void MarkSweep::follow_stack() { -diff --git a/src/share/vm/interpreter/bytecode.cpp b/src/share/vm/interpreter/bytecode.cpp ---- openjdk/hotspot/src/share/vm/interpreter/bytecode.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/bytecode.cpp -@@ -124,21 +124,20 @@ - } - - --symbolOop Bytecode_member_ref::signature() const { -+Symbol* Bytecode_member_ref::signature() const { - constantPoolOop constants = method()->constants(); - return constants->signature_ref_at(index()); - } - - --symbolOop Bytecode_member_ref::name() const { -+Symbol* Bytecode_member_ref::name() const { - constantPoolOop constants = method()->constants(); - return constants->name_ref_at(index()); - } - - --BasicType Bytecode_member_ref::result_type(Thread *thread) const { -- symbolHandle sh(thread, signature()); -- ResultTypeFinder rts(sh); -+BasicType Bytecode_member_ref::result_type() const { -+ ResultTypeFinder rts(signature()); - rts.iterate(); - return rts.type(); - } -diff --git a/src/share/vm/interpreter/bytecode.hpp b/src/share/vm/interpreter/bytecode.hpp ---- openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp -+++ openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp -@@ -193,10 +193,10 @@ - public: - int index() const; // cache index (loaded from instruction) - int pool_index() const; // constant pool index -- symbolOop name() const; // returns the name of the method or field -- symbolOop signature() const; // returns the signature of the method or field -+ Symbol* name() const; // returns the name of the method or field -+ Symbol* signature() const; // returns the signature of the method or field - -- BasicType result_type(Thread* thread) const; // returns the result type of the getfield or invoke -+ BasicType result_type() const; // returns the result type of the getfield or invoke - }; - - // Abstraction for invoke_{virtual, static, interface, special} -diff --git a/src/share/vm/interpreter/bytecodeTracer.cpp b/src/share/vm/interpreter/bytecodeTracer.cpp ---- openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp -@@ -188,7 +188,7 @@ - _closure->trace(method, bcp, st); - } - --void print_symbol(symbolOop sym, outputStream* st) { -+void print_symbol(Symbol* sym, outputStream* st) { - char buf[40]; - int len = sym->utf8_length(); - if (len >= (int)sizeof(buf)) { -@@ -205,10 +205,9 @@ - } else if (java_lang_String::is_instance(value)) { - EXCEPTION_MARK; - Handle h_value (THREAD, value); -- symbolHandle sym = java_lang_String::as_symbol(h_value, CATCH); -- print_symbol(sym(), st); -- } else if (value->is_symbol()) { -- print_symbol(symbolOop(value), st); -+ Symbol* sym = java_lang_String::as_symbol(h_value, CATCH); -+ print_symbol(sym, st); -+ sym->decrement_refcount(); - } else { - st->print_cr(" " PTR_FORMAT, (intptr_t) value); - } -@@ -316,7 +315,7 @@ - } else if (tag.is_method_type()) { - int i2 = constants->method_type_index_at(i); - st->print(" <MethodType> %d", i2); -- print_oop(constants->symbol_at(i2), st); -+ print_symbol(constants->symbol_at(i2), st); - } else if (tag.is_method_handle()) { - int kind = constants->method_handle_ref_kind_at(i); - int i2 = constants->method_handle_index_at(i); -@@ -354,11 +353,11 @@ - return; - } - -- symbolOop name = constants->uncached_name_ref_at(i); -- symbolOop signature = constants->uncached_signature_ref_at(i); -+ Symbol* name = constants->uncached_name_ref_at(i); -+ Symbol* signature = constants->uncached_signature_ref_at(i); - const char* sep = (tag.is_field() ? "/" : ""); - if (has_klass) { -- symbolOop klass = constants->klass_name_at(constants->uncached_klass_ref_index_at(i)); -+ Symbol* klass = constants->klass_name_at(constants->uncached_klass_ref_index_at(i)); - st->print_cr(" %d <%s.%s%s%s> ", i, klass->as_C_string(), name->as_C_string(), sep, signature->as_C_string()); - } else { - if (tag.is_invoke_dynamic()) { -@@ -438,7 +437,7 @@ - case Bytecodes::_anewarray: { - int klass_index = get_index_u2(); - constantPoolOop constants = method()->constants(); -- symbolOop name = constants->klass_name_at(klass_index); -+ Symbol* name = constants->klass_name_at(klass_index); - st->print_cr(" %s ", name->as_C_string()); - } - break; -@@ -446,7 +445,7 @@ - int klass_index = get_index_u2(); - int nof_dims = get_index_u1(); - constantPoolOop constants = method()->constants(); -- symbolOop name = constants->klass_name_at(klass_index); -+ Symbol* name = constants->klass_name_at(klass_index); - st->print_cr(" %s %d", name->as_C_string(), nof_dims); - } - break; -@@ -552,7 +551,7 @@ - case Bytecodes::_instanceof: - { int i = get_index_u2(); - constantPoolOop constants = method()->constants(); -- symbolOop name = constants->klass_name_at(i); -+ Symbol* name = constants->klass_name_at(i); - st->print_cr(" %d <%s>", i, name->as_C_string()); - } - break; -diff --git a/src/share/vm/interpreter/interpreter.cpp b/src/share/vm/interpreter/interpreter.cpp ---- openjdk/hotspot/src/share/vm/interpreter/interpreter.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/interpreter.cpp -@@ -302,7 +302,7 @@ - Thread *thread = Thread::current(); - ResourceMark rm(thread); - methodHandle mh(thread, method); -- type = Bytecode_invoke(mh, bci).result_type(thread); -+ type = Bytecode_invoke(mh, bci).result_type(); - // since the cache entry might not be initialized: - // (NOT needed for the old calling convension) - if (!is_top_frame) { -@@ -316,7 +316,7 @@ - Thread *thread = Thread::current(); - ResourceMark rm(thread); - methodHandle mh(thread, method); -- type = Bytecode_invoke(mh, bci).result_type(thread); -+ type = Bytecode_invoke(mh, bci).result_type(); - // since the cache entry might not be initialized: - // (NOT needed for the old calling convension) - if (!is_top_frame) { -diff --git a/src/share/vm/interpreter/interpreterRuntime.cpp b/src/share/vm/interpreter/interpreterRuntime.cpp ---- openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp -@@ -39,7 +39,7 @@ - #include "oops/methodDataOop.hpp" - #include "oops/objArrayKlass.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvmtiExport.hpp" - #include "prims/nativeLookup.hpp" - #include "runtime/biasedLocking.hpp" -@@ -295,7 +295,7 @@ - - IRT_ENTRY(void, InterpreterRuntime::create_exception(JavaThread* thread, char* name, char* message)) - // lookup exception klass -- symbolHandle s = oopFactory::new_symbol_handle(name, CHECK); -+ TempNewSymbol s = SymbolTable::new_symbol(name, CHECK); - if (ProfileTraps) { - if (s == vmSymbols::java_lang_ArithmeticException()) { - note_trap(thread, Deoptimization::Reason_div0_check, CHECK); -@@ -304,7 +304,7 @@ - } - } - // create exception -- Handle exception = Exceptions::new_exception(thread, s(), message); -+ Handle exception = Exceptions::new_exception(thread, s, message); - thread->set_vm_result(exception()); - IRT_END - -@@ -313,12 +313,12 @@ - ResourceMark rm(thread); - const char* klass_name = Klass::cast(obj->klass())->external_name(); - // lookup exception klass -- symbolHandle s = oopFactory::new_symbol_handle(name, CHECK); -+ TempNewSymbol s = SymbolTable::new_symbol(name, CHECK); - if (ProfileTraps) { - note_trap(thread, Deoptimization::Reason_class_check, CHECK); - } - // create exception, with klass name as detail message -- Handle exception = Exceptions::new_exception(thread, s(), klass_name); -+ Handle exception = Exceptions::new_exception(thread, s, klass_name); - thread->set_vm_result(exception()); - IRT_END - -@@ -326,13 +326,13 @@ - IRT_ENTRY(void, InterpreterRuntime::throw_ArrayIndexOutOfBoundsException(JavaThread* thread, char* name, jint index)) - char message[jintAsStringSize]; - // lookup exception klass -- symbolHandle s = oopFactory::new_symbol_handle(name, CHECK); -+ TempNewSymbol s = SymbolTable::new_symbol(name, CHECK); - if (ProfileTraps) { - note_trap(thread, Deoptimization::Reason_range_check, CHECK); - } - // create exception - sprintf(message, "%d", index); -- THROW_MSG(s(), message); -+ THROW_MSG(s, message); - IRT_END - - IRT_ENTRY(void, InterpreterRuntime::throw_ClassCastException( -@@ -673,7 +673,7 @@ - ResourceMark rm(thread); - methodHandle m (thread, method(thread)); - Bytecode_invoke call(m, bci(thread)); -- symbolHandle signature (thread, call.signature()); -+ Symbol* signature = call.signature(); - receiver = Handle(thread, - thread->last_frame().interpreter_callee_receiver(signature)); - assert(Universe::heap()->is_in_reserved_or_null(receiver()), -@@ -797,7 +797,7 @@ - if (!pool->cache()->secondary_entry_at(site_index)->is_f1_null()) - return; - -- symbolHandle call_site_name(THREAD, pool->name_ref_at(site_index)); -+ Symbol* call_site_name = pool->name_ref_at(site_index); - - Handle call_site - = SystemDictionary::make_dynamic_call_site(bootm, -diff --git a/src/share/vm/interpreter/linkResolver.cpp b/src/share/vm/interpreter/linkResolver.cpp ---- openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp -@@ -56,7 +56,7 @@ - //------------------------------------------------------------------------------------------------------------------------ - // Implementation of FieldAccessInfo - --void FieldAccessInfo::set(KlassHandle klass, symbolHandle name, int field_index, int field_offset, -+void FieldAccessInfo::set(KlassHandle klass, Symbol* name, int field_index, int field_offset, - BasicType field_type, AccessFlags access_flags) { - _klass = klass; - _name = name; -@@ -148,7 +148,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IllegalAccessError(), -+ vmSymbols::java_lang_IllegalAccessError(), - "tried to access class %s from class %s", - sel_klass->external_name(), - ref_klass->external_name() -@@ -174,8 +174,8 @@ - // - // According to JVM spec. $5.4.3c & $5.4.3d - --void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) { -- methodOop result_oop = klass->uncached_lookup_method(name(), signature()); -+void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) { -+ methodOop result_oop = klass->uncached_lookup_method(name, signature); - if (EnableMethodHandles && result_oop != NULL) { - switch (result_oop->intrinsic_id()) { - case vmIntrinsics::_invokeExact: -@@ -189,39 +189,39 @@ - } - - // returns first instance method --void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) { -- methodOop result_oop = klass->uncached_lookup_method(name(), signature()); -+void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) { -+ methodOop result_oop = klass->uncached_lookup_method(name, signature); - result = methodHandle(THREAD, result_oop); - while (!result.is_null() && result->is_static()) { - klass = KlassHandle(THREAD, Klass::cast(result->method_holder())->super()); -- result = methodHandle(THREAD, klass->uncached_lookup_method(name(), signature())); -+ result = methodHandle(THREAD, klass->uncached_lookup_method(name, signature)); - } - } - - --int LinkResolver::vtable_index_of_miranda_method(KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) { -+int LinkResolver::vtable_index_of_miranda_method(KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) { - ResourceMark rm(THREAD); - klassVtable *vt = instanceKlass::cast(klass())->vtable(); -- return vt->index_of_miranda(name(), signature()); -+ return vt->index_of_miranda(name, signature); - } - --void LinkResolver::lookup_method_in_interfaces(methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) { -+void LinkResolver::lookup_method_in_interfaces(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) { - instanceKlass *ik = instanceKlass::cast(klass()); -- result = methodHandle(THREAD, ik->lookup_method_in_all_interfaces(name(), signature())); -+ result = methodHandle(THREAD, ik->lookup_method_in_all_interfaces(name, signature)); - } - - void LinkResolver::lookup_implicit_method(methodHandle& result, -- KlassHandle klass, symbolHandle name, symbolHandle signature, -+ KlassHandle klass, Symbol* name, Symbol* signature, - KlassHandle current_klass, - TRAPS) { - if (EnableMethodHandles && - klass() == SystemDictionary::MethodHandle_klass() && -- methodOopDesc::is_method_handle_invoke_name(name())) { -+ methodOopDesc::is_method_handle_invoke_name(name)) { - if (!MethodHandles::enabled()) { - // Make sure the Java part of the runtime has been booted up. - klassOop natives = SystemDictionary::MethodHandleNatives_klass(); - if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) { -- SystemDictionary::resolve_or_fail(vmSymbolHandles::sun_dyn_MethodHandleNatives(), -+ SystemDictionary::resolve_or_fail(vmSymbols::sun_dyn_MethodHandleNatives(), - Handle(), - Handle(), - true, -@@ -233,7 +233,7 @@ - current_klass, - CHECK); - if (result_oop != NULL) { -- assert(result_oop->is_method_handle_invoke() && result_oop->signature() == signature(), "consistent"); -+ assert(result_oop->is_method_handle_invoke() && result_oop->signature() == signature, "consistent"); - result = methodHandle(THREAD, result_oop); - } - } -@@ -273,7 +273,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IllegalAccessError(), -+ vmSymbols::java_lang_IllegalAccessError(), - "tried to access method %s.%s%s from class %s", - sel_klass->external_name(), - sel_method->name()->as_C_string(), -@@ -290,8 +290,8 @@ - // resolve klass - resolve_klass(resolved_klass, pool, index, CHECK); - -- symbolHandle method_name (THREAD, pool->name_ref_at(index)); -- symbolHandle method_signature (THREAD, pool->signature_ref_at(index)); -+ Symbol* method_name = pool->name_ref_at(index); -+ Symbol* method_signature = pool->signature_ref_at(index); - KlassHandle current_klass(THREAD, pool->pool_holder()); - - resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK); -@@ -301,9 +301,9 @@ - // The class is java.dyn.MethodHandle - resolved_klass = SystemDictionaryHandles::MethodHandle_klass(); - -- symbolHandle method_name = vmSymbolHandles::invokeExact_name(); -+ Symbol* method_name = vmSymbols::invokeExact_name(); - -- symbolHandle method_signature(THREAD, pool->signature_ref_at(index)); -+ Symbol* method_signature = pool->signature_ref_at(index); - KlassHandle current_klass (THREAD, pool->pool_holder()); - - resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK); -@@ -313,8 +313,8 @@ - - // resolve klass - resolve_klass(resolved_klass, pool, index, CHECK); -- symbolHandle method_name (THREAD, pool->name_ref_at(index)); -- symbolHandle method_signature (THREAD, pool->signature_ref_at(index)); -+ Symbol* method_name = pool->name_ref_at(index); -+ Symbol* method_signature = pool->signature_ref_at(index); - KlassHandle current_klass(THREAD, pool->pool_holder()); - - resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK); -@@ -322,7 +322,7 @@ - - - void LinkResolver::resolve_method(methodHandle& resolved_method, KlassHandle resolved_klass, -- symbolHandle method_name, symbolHandle method_signature, -+ Symbol* method_name, Symbol* method_signature, - KlassHandle current_klass, bool check_access, TRAPS) { - - // 1. check if klass is not interface -@@ -349,8 +349,8 @@ - ResourceMark rm(THREAD); - THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(), - methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()), -- method_name(), -- method_signature())); -+ method_name, -+ method_signature)); - } - } - -@@ -359,8 +359,8 @@ - ResourceMark rm(THREAD); - THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), - methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()), -- method_name(), -- method_signature())); -+ method_name, -+ method_signature)); - } - - // 6. access checks, access checking may be turned off when calling from within the VM. -@@ -387,7 +387,7 @@ - " \"%s\" the class loader (instance of %s) of the current class, %s," - " and the class loader (instance of %s) for resolved class, %s, have" - " different Class objects for the type %s used in the signature"; -- char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name(),method_signature()); -+ char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name,method_signature); - const char* loader1 = SystemDictionary::loader_name(loader()); - char* current = instanceKlass::cast(current_klass())->name()->as_C_string(); - const char* loader2 = SystemDictionary::loader_name(class_loader()); -@@ -406,8 +406,8 @@ - - void LinkResolver::resolve_interface_method(methodHandle& resolved_method, - KlassHandle resolved_klass, -- symbolHandle method_name, -- symbolHandle method_signature, -+ Symbol* method_name, -+ Symbol* method_signature, - KlassHandle current_klass, - bool check_access, TRAPS) { - -@@ -429,8 +429,8 @@ - ResourceMark rm(THREAD); - THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(), - methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()), -- method_name(), -- method_signature())); -+ method_name, -+ method_signature)); - } - } - -@@ -449,7 +449,7 @@ - "current class, %s, and the class loader (instance of %s) for " - "resolved class, %s, have different Class objects for the type %s " - "used in the signature"; -- char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name(),method_signature()); -+ char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name,method_signature); - const char* loader1 = SystemDictionary::loader_name(loader()); - char* current = instanceKlass::cast(current_klass())->name()->as_C_string(); - const char* loader2 = SystemDictionary::loader_name(class_loader()); -@@ -482,7 +482,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IllegalAccessError(), -+ vmSymbols::java_lang_IllegalAccessError(), - "tried to access field %s.%s from class %s", - sel_klass->external_name(), - fd.name()->as_C_string(), -@@ -511,9 +511,8 @@ - resolve_klass_no_update(resolved_klass, pool, index, CHECK); - } - // Load these early in case the resolve of the containing klass fails -- symbolOop field = pool->name_ref_at(index); -- symbolHandle field_h (THREAD, field); // preserve in case we need the name -- symbolOop sig = pool->signature_ref_at(index); -+ Symbol* field = pool->name_ref_at(index); -+ Symbol* sig = pool->signature_ref_at(index); - // Check if there's a resolved klass containing the field - if( resolved_klass.is_null() ) { - ResourceMark rm(THREAD); -@@ -559,7 +558,7 @@ - HandleMark hm(THREAD); - Handle ref_loader (THREAD, instanceKlass::cast(ref_klass())->class_loader()); - Handle sel_loader (THREAD, instanceKlass::cast(sel_klass())->class_loader()); -- symbolHandle signature_ref (THREAD, pool->signature_ref_at(index)); -+ Symbol* signature_ref = pool->signature_ref_at(index); - { - ResourceMark rm(THREAD); - char* failed_type_name = -@@ -572,7 +571,7 @@ - " \"%s\" the class loader (instance of %s) of the referring class, " - "%s, and the class loader (instance of %s) for the field's resolved " - "type, %s, have different Class objects for that type"; -- char* field_name = field_h()->as_C_string(); -+ char* field_name = field->as_C_string(); - const char* loader1 = SystemDictionary::loader_name(ref_loader()); - char* sel = instanceKlass::cast(sel_klass())->name()->as_C_string(); - const char* loader2 = SystemDictionary::loader_name(sel_loader()); -@@ -589,7 +588,7 @@ - // return information. note that the klass is set to the actual klass containing the - // field, otherwise access of static fields in superclasses will not work. - KlassHandle holder (THREAD, fd.field_holder()); -- symbolHandle name (THREAD, fd.name()); -+ Symbol* name = fd.name(); - result.set(holder, name, fd.index(), fd.offset(), fd.field_type(), fd.access_flags()); - } - -@@ -605,8 +604,8 @@ - // recv_klass the receiver klass - - --void LinkResolver::resolve_static_call(CallInfo& result, KlassHandle& resolved_klass, symbolHandle method_name, -- symbolHandle method_signature, KlassHandle current_klass, -+void LinkResolver::resolve_static_call(CallInfo& result, KlassHandle& resolved_klass, Symbol* method_name, -+ Symbol* method_signature, KlassHandle current_klass, - bool check_access, bool initialize_class, TRAPS) { - methodHandle resolved_method; - linktime_resolve_static_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); -@@ -624,7 +623,7 @@ - - // throws linktime exceptions - void LinkResolver::linktime_resolve_static_method(methodHandle& resolved_method, KlassHandle resolved_klass, -- symbolHandle method_name, symbolHandle method_signature, -+ Symbol* method_name, Symbol* method_signature, - KlassHandle current_klass, bool check_access, TRAPS) { - - resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); -@@ -641,8 +640,8 @@ - } - - --void LinkResolver::resolve_special_call(CallInfo& result, KlassHandle resolved_klass, symbolHandle method_name, -- symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS) { -+void LinkResolver::resolve_special_call(CallInfo& result, KlassHandle resolved_klass, Symbol* method_name, -+ Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS) { - methodHandle resolved_method; - linktime_resolve_special_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); - runtime_resolve_special_method(result, resolved_method, resolved_klass, current_klass, check_access, CHECK); -@@ -650,7 +649,7 @@ - - // throws linktime exceptions - void LinkResolver::linktime_resolve_special_method(methodHandle& resolved_method, KlassHandle resolved_klass, -- symbolHandle method_name, symbolHandle method_signature, -+ Symbol* method_name, Symbol* method_signature, - KlassHandle current_klass, bool check_access, TRAPS) { - - resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); -@@ -661,7 +660,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_NoSuchMethodError(), -+ vmSymbols::java_lang_NoSuchMethodError(), - "%s: method %s%s not found", - resolved_klass->external_name(), - resolved_method->name()->as_C_string(), -@@ -703,8 +702,8 @@ - // Lookup super method - KlassHandle super_klass(THREAD, current_klass->super()); - lookup_instance_method_in_klasses(sel_method, super_klass, -- symbolHandle(THREAD, resolved_method->name()), -- symbolHandle(THREAD, resolved_method->signature()), CHECK); -+ resolved_method->name(), -+ resolved_method->signature(), CHECK); - // check if found - if (sel_method.is_null()) { - ResourceMark rm(THREAD); -@@ -739,7 +738,7 @@ - } - - void LinkResolver::resolve_virtual_call(CallInfo& result, Handle recv, KlassHandle receiver_klass, KlassHandle resolved_klass, -- symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, -+ Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, - bool check_access, bool check_null_and_abstract, TRAPS) { - methodHandle resolved_method; - linktime_resolve_virtual_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); -@@ -748,7 +747,7 @@ - - // throws linktime exceptions - void LinkResolver::linktime_resolve_virtual_method(methodHandle &resolved_method, KlassHandle resolved_klass, -- symbolHandle method_name, symbolHandle method_signature, -+ Symbol* method_name, Symbol* method_signature, - KlassHandle current_klass, bool check_access, TRAPS) { - // normal method resolution - resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); -@@ -798,8 +797,8 @@ - // do lookup based on receiver klass using the vtable index - if (resolved_method->method_holder()->klass_part()->is_interface()) { // miranda method - vtable_index = vtable_index_of_miranda_method(resolved_klass, -- symbolHandle(THREAD, resolved_method->name()), -- symbolHandle(THREAD, resolved_method->signature()), CHECK); -+ resolved_method->name(), -+ resolved_method->signature(), CHECK); - assert(vtable_index >= 0 , "we should have valid vtable index at this point"); - - instanceKlass* inst = instanceKlass::cast(recv_klass()); -@@ -847,7 +846,7 @@ - } - - void LinkResolver::resolve_interface_call(CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass, -- symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, -+ Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, - bool check_access, bool check_null_and_abstract, TRAPS) { - methodHandle resolved_method; - linktime_resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); -@@ -855,8 +854,8 @@ - } - - // throws linktime exceptions --void LinkResolver::linktime_resolve_interface_method(methodHandle& resolved_method, KlassHandle resolved_klass, symbolHandle method_name, -- symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS) { -+void LinkResolver::linktime_resolve_interface_method(methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, -+ Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS) { - // normal interface method resolution - resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK); - -@@ -883,8 +882,8 @@ - // do lookup based on receiver klass - methodHandle sel_method; - lookup_instance_method_in_klasses(sel_method, recv_klass, -- symbolHandle(THREAD, resolved_method->name()), -- symbolHandle(THREAD, resolved_method->signature()), CHECK); -+ resolved_method->name(), -+ resolved_method->signature(), CHECK); - // check if method exists - if (sel_method.is_null()) { - ResourceMark rm(THREAD); -@@ -916,8 +915,8 @@ - - methodHandle LinkResolver::linktime_resolve_interface_method_or_null( - KlassHandle resolved_klass, -- symbolHandle method_name, -- symbolHandle method_signature, -+ Symbol* method_name, -+ Symbol* method_signature, - KlassHandle current_klass, - bool check_access) { - EXCEPTION_MARK; -@@ -933,8 +932,8 @@ - - methodHandle LinkResolver::linktime_resolve_virtual_method_or_null( - KlassHandle resolved_klass, -- symbolHandle method_name, -- symbolHandle method_signature, -+ Symbol* method_name, -+ Symbol* method_signature, - KlassHandle current_klass, - bool check_access) { - EXCEPTION_MARK; -@@ -951,8 +950,8 @@ - methodHandle LinkResolver::resolve_virtual_call_or_null( - KlassHandle receiver_klass, - KlassHandle resolved_klass, -- symbolHandle name, -- symbolHandle signature, -+ Symbol* name, -+ Symbol* signature, - KlassHandle current_klass) { - EXCEPTION_MARK; - CallInfo info; -@@ -967,8 +966,8 @@ - methodHandle LinkResolver::resolve_interface_call_or_null( - KlassHandle receiver_klass, - KlassHandle resolved_klass, -- symbolHandle name, -- symbolHandle signature, -+ Symbol* name, -+ Symbol* signature, - KlassHandle current_klass) { - EXCEPTION_MARK; - CallInfo info; -@@ -983,8 +982,8 @@ - int LinkResolver::resolve_virtual_vtable_index( - KlassHandle receiver_klass, - KlassHandle resolved_klass, -- symbolHandle name, -- symbolHandle signature, -+ Symbol* name, -+ Symbol* signature, - KlassHandle current_klass) { - EXCEPTION_MARK; - CallInfo info; -@@ -998,8 +997,8 @@ - - methodHandle LinkResolver::resolve_static_call_or_null( - KlassHandle resolved_klass, -- symbolHandle name, -- symbolHandle signature, -+ Symbol* name, -+ Symbol* signature, - KlassHandle current_klass) { - EXCEPTION_MARK; - CallInfo info; -@@ -1011,7 +1010,7 @@ - return info.selected_method(); - } - --methodHandle LinkResolver::resolve_special_call_or_null(KlassHandle resolved_klass, symbolHandle name, symbolHandle signature, -+methodHandle LinkResolver::resolve_special_call_or_null(KlassHandle resolved_klass, Symbol* name, Symbol* signature, - KlassHandle current_klass) { - EXCEPTION_MARK; - CallInfo info; -@@ -1039,22 +1038,22 @@ - return; - } - --void LinkResolver::resolve_pool(KlassHandle& resolved_klass, symbolHandle& method_name, symbolHandle& method_signature, -+void LinkResolver::resolve_pool(KlassHandle& resolved_klass, Symbol*& method_name, Symbol*& method_signature, - KlassHandle& current_klass, constantPoolHandle pool, int index, TRAPS) { - // resolve klass - resolve_klass(resolved_klass, pool, index, CHECK); - - // Get name, signature, and static klass -- method_name = symbolHandle(THREAD, pool->name_ref_at(index)); -- method_signature = symbolHandle(THREAD, pool->signature_ref_at(index)); -+ method_name = pool->name_ref_at(index); -+ method_signature = pool->signature_ref_at(index); - current_klass = KlassHandle(THREAD, pool->pool_holder()); - } - - - void LinkResolver::resolve_invokestatic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) { - KlassHandle resolved_klass; -- symbolHandle method_name; -- symbolHandle method_signature; -+ Symbol* method_name = NULL; -+ Symbol* method_signature = NULL; - KlassHandle current_klass; - resolve_pool(resolved_klass, method_name, method_signature, current_klass, pool, index, CHECK); - resolve_static_call(result, resolved_klass, method_name, method_signature, current_klass, true, true, CHECK); -@@ -1063,8 +1062,8 @@ - - void LinkResolver::resolve_invokespecial(CallInfo& result, constantPoolHandle pool, int index, TRAPS) { - KlassHandle resolved_klass; -- symbolHandle method_name; -- symbolHandle method_signature; -+ Symbol* method_name = NULL; -+ Symbol* method_signature = NULL; - KlassHandle current_klass; - resolve_pool(resolved_klass, method_name, method_signature, current_klass, pool, index, CHECK); - resolve_special_call(result, resolved_klass, method_name, method_signature, current_klass, true, CHECK); -@@ -1076,8 +1075,8 @@ - TRAPS) { - - KlassHandle resolved_klass; -- symbolHandle method_name; -- symbolHandle method_signature; -+ Symbol* method_name = NULL; -+ Symbol* method_signature = NULL; - KlassHandle current_klass; - resolve_pool(resolved_klass, method_name, method_signature, current_klass, pool, index, CHECK); - KlassHandle recvrKlass (THREAD, recv.is_null() ? (klassOop)NULL : recv->klass()); -@@ -1087,8 +1086,8 @@ - - void LinkResolver::resolve_invokeinterface(CallInfo& result, Handle recv, constantPoolHandle pool, int index, TRAPS) { - KlassHandle resolved_klass; -- symbolHandle method_name; -- symbolHandle method_signature; -+ Symbol* method_name = NULL; -+ Symbol* method_signature = NULL; - KlassHandle current_klass; - resolve_pool(resolved_klass, method_name, method_signature, current_klass, pool, index, CHECK); - KlassHandle recvrKlass (THREAD, recv.is_null() ? (klassOop)NULL : recv->klass()); -@@ -1102,8 +1101,8 @@ - // This guy is reached from InterpreterRuntime::resolve_invokedynamic. - - // At this point, we only need the signature, and can ignore the name. -- symbolHandle method_signature(THREAD, pool->signature_ref_at(raw_index)); // raw_index works directly -- symbolHandle method_name = vmSymbolHandles::invokeExact_name(); -+ Symbol* method_signature = pool->signature_ref_at(raw_index); // raw_index works directly -+ Symbol* method_name = vmSymbols::invokeExact_name(); - KlassHandle resolved_klass = SystemDictionaryHandles::MethodHandle_klass(); - - // JSR 292: this must be an implicitly generated method MethodHandle.invokeExact(*...) -diff --git a/src/share/vm/interpreter/linkResolver.hpp b/src/share/vm/interpreter/linkResolver.hpp ---- openjdk/hotspot/src/share/vm/interpreter/linkResolver.hpp -+++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.hpp -@@ -45,17 +45,17 @@ - class FieldAccessInfo: public LinkInfo { - protected: - KlassHandle _klass; -- symbolHandle _name; -+ Symbol* _name; - AccessFlags _access_flags; - int _field_index; // original index in the klass - int _field_offset; - BasicType _field_type; - - public: -- void set(KlassHandle klass, symbolHandle name, int field_index, int field_offset, -+ void set(KlassHandle klass, Symbol* name, int field_index, int field_offset, - BasicType field_type, AccessFlags access_flags); - KlassHandle klass() const { return _klass; } -- symbolHandle name() const { return _name; } -+ Symbol* name() const { return _name; } - int field_index() const { return _field_index; } - int field_offset() const { return _field_offset; } - BasicType field_type() const { return _field_type; } -@@ -107,26 +107,26 @@ - - class LinkResolver: AllStatic { - private: -- static void lookup_method_in_klasses (methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS); -- static void lookup_instance_method_in_klasses (methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS); -- static void lookup_method_in_interfaces (methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS); -- static void lookup_implicit_method (methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, -+ static void lookup_method_in_klasses (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); -+ static void lookup_instance_method_in_klasses (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); -+ static void lookup_method_in_interfaces (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); -+ static void lookup_implicit_method (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, - KlassHandle current_klass, TRAPS); - -- static int vtable_index_of_miranda_method(KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS); -+ static int vtable_index_of_miranda_method(KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); - - static void resolve_klass (KlassHandle& result, constantPoolHandle pool, int index, TRAPS); - static void resolve_klass_no_update (KlassHandle& result, constantPoolHandle pool, int index, TRAPS); // no update of constantPool entry - -- static void resolve_pool (KlassHandle& resolved_klass, symbolHandle& method_name, symbolHandle& method_signature, KlassHandle& current_klass, constantPoolHandle pool, int index, TRAPS); -+ static void resolve_pool (KlassHandle& resolved_klass, Symbol*& method_name, Symbol*& method_signature, KlassHandle& current_klass, constantPoolHandle pool, int index, TRAPS); - -- static void resolve_interface_method(methodHandle& resolved_method, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS); -- static void resolve_method (methodHandle& resolved_method, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS); -+ static void resolve_interface_method(methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS); -+ static void resolve_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS); - -- static void linktime_resolve_static_method (methodHandle& resolved_method, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS); -- static void linktime_resolve_special_method (methodHandle& resolved_method, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS); -- static void linktime_resolve_virtual_method (methodHandle &resolved_method, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature,KlassHandle current_klass, bool check_access, TRAPS); -- static void linktime_resolve_interface_method (methodHandle& resolved_method, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS); -+ static void linktime_resolve_static_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS); -+ static void linktime_resolve_special_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS); -+ static void linktime_resolve_virtual_method (methodHandle &resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature,KlassHandle current_klass, bool check_access, TRAPS); -+ static void linktime_resolve_interface_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS); - - static void runtime_resolve_special_method (CallInfo& result, methodHandle resolved_method, KlassHandle resolved_klass, KlassHandle current_klass, bool check_access, TRAPS); - static void runtime_resolve_virtual_method (CallInfo& result, methodHandle resolved_method, KlassHandle resolved_klass, Handle recv, KlassHandle recv_klass, bool check_null_and_abstract, TRAPS); -@@ -152,24 +152,24 @@ - // runtime resolving: - // resolved_klass = specified class (i.e., static receiver class) - // current_klass = sending method holder (i.e., class containing the method containing the call being resolved) -- static void resolve_static_call (CallInfo& result, KlassHandle& resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, bool initialize_klass, TRAPS); -- static void resolve_special_call (CallInfo& result, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS); -- static void resolve_virtual_call (CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, bool check_null_and_abstract, TRAPS); -- static void resolve_interface_call(CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access, bool check_null_and_abstract, TRAPS); -+ static void resolve_static_call (CallInfo& result, KlassHandle& resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool initialize_klass, TRAPS); -+ static void resolve_special_call (CallInfo& result, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS); -+ static void resolve_virtual_call (CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool check_null_and_abstract, TRAPS); -+ static void resolve_interface_call(CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool check_null_and_abstract, TRAPS); - - // same as above for compile-time resolution; but returns null handle instead of throwing an exception on error - // also, does not initialize klass (i.e., no side effects) -- static methodHandle resolve_virtual_call_or_null (KlassHandle receiver_klass, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass); -- static methodHandle resolve_interface_call_or_null(KlassHandle receiver_klass, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass); -- static methodHandle resolve_static_call_or_null (KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass); -- static methodHandle resolve_special_call_or_null (KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass); -+ static methodHandle resolve_virtual_call_or_null (KlassHandle receiver_klass, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass); -+ static methodHandle resolve_interface_call_or_null(KlassHandle receiver_klass, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass); -+ static methodHandle resolve_static_call_or_null (KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass); -+ static methodHandle resolve_special_call_or_null (KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass); - - // same as above for compile-time resolution; returns vtable_index if current_klass if linked -- static int resolve_virtual_vtable_index (KlassHandle receiver_klass, KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass); -+ static int resolve_virtual_vtable_index (KlassHandle receiver_klass, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass); - - // static resolving for compiler (does not throw exceptions, returns null handle if unsuccessful) -- static methodHandle linktime_resolve_virtual_method_or_null (KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access); -- static methodHandle linktime_resolve_interface_method_or_null(KlassHandle resolved_klass, symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass, bool check_access); -+ static methodHandle linktime_resolve_virtual_method_or_null (KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access); -+ static methodHandle linktime_resolve_interface_method_or_null(KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access); - - // runtime resolving from constant pool - static void resolve_invokestatic (CallInfo& result, constantPoolHandle pool, int index, TRAPS); -diff --git a/src/share/vm/memory/classify.cpp b/src/share/vm/memory/classify.cpp ---- openjdk/hotspot/src/share/vm/memory/classify.cpp -+++ openjdk/hotspot/src/share/vm/memory/classify.cpp -@@ -68,8 +68,6 @@ - type = typeArray_type; - } else if (obj->is_objArray()) { - type = objArray_type; -- } else if (obj->is_symbol()) { -- type = symbol_type; - } else if (obj->is_klass()) { - Klass* k = ((klassOop)obj)->klass_part(); - if (k->oop_is_instance()) { -@@ -158,8 +156,6 @@ - name = "_typeArrayKlassKlassObj"; - } else if (obj == Universe::instanceKlassKlassObj()) { - name = "_instanceKlassKlassObj"; -- } else if (obj == Universe::symbolKlassObj()) { -- name = "_symbolKlassObj"; - } else if (obj == Universe::methodKlassObj()) { - name = "_methodKlassObj"; - } else if (obj == Universe::constMethodKlassObj()) { -diff --git a/src/share/vm/memory/compactingPermGenGen.cpp b/src/share/vm/memory/compactingPermGenGen.cpp ---- openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.cpp -+++ openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.cpp -@@ -95,17 +95,11 @@ - // their stack to the class without having added the class to the - // dictionary yet. This means the class will be marked during phase 1 - // but will not be unmarked during the application of the --// RecursiveAdjustSharedObjectClosure to the SystemDictionary. Note --// that we must not call find_shared_class with non-read-only symbols --// as doing so can cause hash codes to be computed, destroying --// forwarding pointers. --class TraversePlaceholdersClosure : public OopClosure { -- protected: -- template <class T> inline void do_oop_work(T* p) { -- oop obj = oopDesc::load_decode_heap_oop_not_null(p); -- if (obj->klass() == Universe::symbolKlassObj() && -- obj->is_shared_readonly()) { -- symbolHandle sym((symbolOop) obj); -+// RecursiveAdjustSharedObjectClosure to the SystemDictionary. -+class TraversePlaceholdersClosure { -+ public: -+ static void placeholders_do(Symbol* sym, oop loader) { -+ if (CompactingPermGenGen::is_shared(sym)) { - oop k = SystemDictionary::find_shared_class(sym); - if (k != NULL) { - RecursiveAdjustSharedObjectClosure clo; -@@ -113,13 +107,8 @@ - } - } - } -- public: -- virtual void do_oop(oop* p) { TraversePlaceholdersClosure::do_oop_work(p); } -- virtual void do_oop(narrowOop* p) { TraversePlaceholdersClosure::do_oop_work(p); } -- - }; - -- - void CompactingPermGenGen::initialize_performance_counters() { - - const char* gen_name = "perm"; -@@ -335,8 +324,7 @@ - Universe::oops_do(&blk); - StringTable::oops_do(&blk); - SystemDictionary::always_strong_classes_do(&blk); -- TraversePlaceholdersClosure tpc; -- SystemDictionary::placeholders_do(&tpc); -+ SystemDictionary::placeholders_do(TraversePlaceholdersClosure::placeholders_do); - } - } - } -@@ -490,5 +478,3 @@ - } - return true; - } -- --void** CompactingPermGenGen::_vtbl_list; -diff --git a/src/share/vm/memory/compactingPermGenGen.hpp b/src/share/vm/memory/compactingPermGenGen.hpp ---- openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp -+++ openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp -@@ -96,9 +96,6 @@ - static HeapWord* misccode_end; - static HeapWord* shared_end; - -- // List of klassOops whose vtbl entries are used to patch others. -- static void** _vtbl_list; -- - // Performance Counters - GenerationCounters* _gen_counters; - CSpaceCounters* _space_counters; -@@ -153,32 +150,25 @@ - VirtualSpace* mc_space() { return &_mc_vs; } - ContiguousSpace* unshared_space() const { return _the_space; } - -- static bool inline is_shared(const oopDesc* p) { -- return (HeapWord*)p >= shared_bottom && (HeapWord*)p < shared_end; -+ static bool inline is_shared(const void* p) { -+ return p >= shared_bottom && p < shared_end; - } - // RedefineClasses note: this tester is used to check residence of - // the specified oop in the shared readonly space and not whether - // the oop is readonly. -- static bool inline is_shared_readonly(const oopDesc* p) { -- return (HeapWord*)p >= readonly_bottom && (HeapWord*)p < readonly_end; -+ static bool inline is_shared_readonly(const void* p) { -+ return p >= readonly_bottom && p < readonly_end; - } - // RedefineClasses note: this tester is used to check residence of - // the specified oop in the shared readwrite space and not whether - // the oop is readwrite. -- static bool inline is_shared_readwrite(const oopDesc* p) { -- return (HeapWord*)p >= readwrite_bottom && (HeapWord*)p < readwrite_end; -+ static bool inline is_shared_readwrite(const void* p) { -+ return p >= readwrite_bottom && p < readwrite_end; - } - -- bool is_in_unshared(const void* p) const { -- return OneContigSpaceCardGeneration::is_in(p); -- } -- -- bool is_in_shared(const void* p) const { -- return p >= shared_bottom && p < shared_end; -- } -- -+ // Checks if the pointer is either in unshared space or in shared space - inline bool is_in(const void* p) const { -- return is_in_unshared(p) || is_in_shared(p); -+ return OneContigSpaceCardGeneration::is_in(p) || is_shared(p); - } - - inline PermanentGenerationSpec* spec() const { return _spec; } -@@ -236,6 +226,9 @@ - void** vtable, - char** md_top, char* md_end, - char** mc_top, char* mc_end); -+ static void* find_matching_vtbl_ptr(void** vtbl_list, -+ void* new_vtable_start, -+ void* obj); - - void verify(bool allow_dirty); - -diff --git a/src/share/vm/memory/dump.cpp b/src/share/vm/memory/dump.cpp ---- openjdk/hotspot/src/share/vm/memory/dump.cpp -+++ openjdk/hotspot/src/share/vm/memory/dump.cpp -@@ -133,6 +133,69 @@ - return false; - } - -+ -+class MoveSymbols : public SymbolClosure { -+private: -+ char* _start; -+ char* _end; -+ char* _top; -+ int _count; -+ -+ bool in_shared_space(Symbol* sym) const { -+ return (char*)sym >= _start && (char*)sym < _end; -+ } -+ -+ Symbol* get_shared_copy(Symbol* sym) { -+ return sym->refcount() > 0 ? NULL : (Symbol*)(_start - sym->refcount()); -+ } -+ -+ Symbol* make_shared_copy(Symbol* sym) { -+ Symbol* new_sym = (Symbol*)_top; -+ int size = sym->object_size(); -+ _top += size * HeapWordSize; -+ if (_top <= _end) { -+ Copy::disjoint_words((HeapWord*)sym, (HeapWord*)new_sym, size); -+ // Encode a reference to the copy as a negative distance from _start -+ // When a symbol is being copied to a shared space -+ // during CDS archive creation, the original symbol is marked -+ // as relocated by putting a negative value to its _refcount field, -+ // This value is also used to find where exactly the shared copy is -+ // (see MoveSymbols::get_shared_copy), so that the other references -+ // to this symbol could be changed to point to the shared copy. -+ sym->_refcount = (int)(_start - (char*)new_sym); -+ // Mark the symbol in the shared archive as immortal so it is read only -+ // and not refcounted. -+ new_sym->_refcount = -1; -+ _count++; -+ } else { -+ report_out_of_shared_space(SharedMiscData); -+ } -+ return new_sym; -+ } -+ -+public: -+ MoveSymbols(char* top, char* end) : -+ _start(top), _end(end), _top(top), _count(0) { } -+ -+ char* get_top() const { return _top; } -+ int count() const { return _count; } -+ -+ void do_symbol(Symbol** p) { -+ Symbol* sym = load_symbol(p); -+ if (sym != NULL && !in_shared_space(sym)) { -+ Symbol* new_sym = get_shared_copy(sym); -+ if (new_sym == NULL) { -+ // The symbol has not been relocated yet; copy it to _top address -+ assert(sym->refcount() > 0, "should have positive reference count"); -+ new_sym = make_shared_copy(sym); -+ } -+ // Make the reference point to the shared copy of the symbol -+ store_symbol(p, new_sym); -+ } -+ } -+}; -+ -+ - // Closure: mark objects closure. - - class MarkObjectsOopClosure : public OopClosure { -@@ -164,7 +227,7 @@ - } - - --// Closure: mark common read-only objects, excluding symbols -+// Closure: mark common read-only objects - - class MarkCommonReadOnly : public ObjectClosure { - private: -@@ -216,54 +279,52 @@ - }; - - --// Closure: mark common symbols -+// Closure: find symbol references in Java Heap objects - --class MarkCommonSymbols : public ObjectClosure { -+class CommonSymbolsClosure : public ObjectClosure { - private: -- MarkObjectsOopClosure mark_all; -+ SymbolClosure* _closure; - public: -+ CommonSymbolsClosure(SymbolClosure* closure) : _closure(closure) { } -+ - void do_object(oop obj) { - -- // Mark symbols refered to by method objects. -+ // Traverse symbols referenced by method objects. - - if (obj->is_method()) { - methodOop m = methodOop(obj); -- mark_object(m->name()); -- mark_object(m->signature()); -+ constantPoolOop constants = m->constants(); -+ _closure->do_symbol(constants->symbol_at_addr(m->name_index())); -+ _closure->do_symbol(constants->symbol_at_addr(m->signature_index())); - } - -- // Mark symbols referenced by klass objects which are read-only. -+ // Traverse symbols referenced by klass objects which are read-only. - - else if (obj->is_klass()) { -+ Klass* k = Klass::cast((klassOop)obj); -+ k->shared_symbols_iterate(_closure); - - if (obj->blueprint()->oop_is_instanceKlass()) { - instanceKlass* ik = instanceKlass::cast((klassOop)obj); -- mark_object(ik->name()); -- mark_object(ik->generic_signature()); -- mark_object(ik->source_file_name()); -- mark_object(ik->source_debug_extension()); -- - typeArrayOop inner_classes = ik->inner_classes(); - if (inner_classes != NULL) { -- int length = inner_classes->length(); -- for (int i = 0; -- i < length; -- i += instanceKlass::inner_class_next_offset) { -+ constantPoolOop constants = ik->constants(); -+ int n = inner_classes->length(); -+ for (int i = 0; i < n; i += instanceKlass::inner_class_next_offset) { - int ioff = i + instanceKlass::inner_class_inner_name_offset; - int index = inner_classes->ushort_at(ioff); - if (index != 0) { -- mark_object(ik->constants()->symbol_at(index)); -+ _closure->do_symbol(constants->symbol_at_addr(index)); - } - } - } -- ik->field_names_and_sigs_iterate(&mark_all); - } - } - -- // Mark symbols referenced by other constantpool entries. -+ // Traverse symbols referenced by other constantpool entries. - -- if (obj->is_constantPool()) { -- constantPoolOop(obj)->shared_symbols_iterate(&mark_all); -+ else if (obj->is_constantPool()) { -+ constantPoolOop(obj)->shared_symbols_iterate(_closure); - } - } - }; -@@ -404,18 +465,7 @@ - int s = obj->size(); - oop sh_obj = (oop)_space->allocate(s); - if (sh_obj == NULL) { -- if (_read_only) { -- warning("\nThe permanent generation read only space is not large " -- "enough to \npreload requested classes. Use " -- "-XX:SharedReadOnlySize= to increase \nthe initial " -- "size of the read only space.\n"); -- } else { -- warning("\nThe permanent generation read write space is not large " -- "enough to \npreload requested classes. Use " -- "-XX:SharedReadWriteSize= to increase \nthe initial " -- "size of the read write space.\n"); -- } -- exit(2); -+ report_out_of_shared_space(_read_only ? SharedReadOnly : SharedReadWrite); - } - if (PrintSharedSpaces && Verbose && WizardMode) { - tty->print_cr("\nMoveMarkedObjects: " PTR_FORMAT " -> " PTR_FORMAT " %s", obj, sh_obj, -@@ -459,8 +509,6 @@ - instanceKlass* ik = instanceKlass::cast((klassOop)obj); - int i; - -- mark_and_move_for_policy(OP_favor_startup, ik->name(), _move_ro); -- - if (ik->super() != NULL) { - do_object(ik->super()); - } -@@ -469,7 +517,6 @@ - mark_and_move_for_policy(OP_favor_startup, interfaces, _move_ro); - for(i = 0; i < interfaces->length(); i++) { - klassOop k = klassOop(interfaces->obj_at(i)); -- mark_and_move_for_policy(OP_favor_startup, k->klass_part()->name(), _move_ro); - do_object(k); - } - -@@ -479,14 +526,6 @@ - mark_and_move_for_policy(OP_favor_startup, m->constMethod(), _move_ro); - mark_and_move_for_policy(OP_favor_runtime, m->constMethod()->exception_table(), _move_ro); - mark_and_move_for_policy(OP_favor_runtime, m->constMethod()->stackmap_data(), _move_ro); -- -- // We don't move the name symbolOop here because it may invalidate -- // method ordering, which is dependent on the address of the name -- // symbolOop. It will get promoted later with the other symbols. -- // Method name is rarely accessed during classloading anyway. -- // mark_and_move_for_policy(OP_balanced, m->name(), _move_ro); -- -- mark_and_move_for_policy(OP_favor_startup, m->signature(), _move_ro); - } - - mark_and_move_for_policy(OP_favor_startup, ik->transitive_interfaces(), _move_ro); -@@ -574,45 +613,43 @@ - }; - - --void sort_methods(instanceKlass* ik, TRAPS) { -- klassOop super = ik->super(); -- if (super != NULL) { -- sort_methods(instanceKlass::cast(super), THREAD); -- } -- -- // The methods array must be ordered by symbolOop address. (See -- // classFileParser.cpp where methods in a class are originally -- // sorted.) Since objects have just be reordered, this must be -- // corrected. -- methodOopDesc::sort_methods(ik->methods(), -- ik->methods_annotations(), -- ik->methods_parameter_annotations(), -- ik->methods_default_annotations(), -- true /* idempotent, slow */); -- -- // Itable indices are calculated based on methods array order -- // (see klassItable::compute_itable_index()). Must reinitialize. -- // We assume that since checkconstraints is false, this method -- // cannot throw an exception. An exception here would be -- // problematic since this is the VMThread, not a JavaThread. -- ik->itable()->initialize_itable(false, THREAD); --} -- --// Sort methods if the oop is an instanceKlass. -+// The methods array must be reordered by Symbol* address. -+// (See classFileParser.cpp where methods in a class are originally -+// sorted). The addresses of symbols have been changed as a result -+// of moving to the shared space. - - class SortMethodsClosure: public ObjectClosure { -+public: -+ void do_object(oop obj) { -+ if (obj->blueprint()->oop_is_instanceKlass()) { -+ instanceKlass* ik = instanceKlass::cast((klassOop)obj); -+ methodOopDesc::sort_methods(ik->methods(), -+ ik->methods_annotations(), -+ ik->methods_parameter_annotations(), -+ ik->methods_default_annotations(), -+ true /* idempotent, slow */); -+ } -+ } -+}; -+ -+// Itable indices are calculated based on methods array order -+// (see klassItable::compute_itable_index()). Must reinitialize -+// after ALL methods of ALL classes have been reordered. -+// We assume that since checkconstraints is false, this method -+// cannot throw an exception. An exception here would be -+// problematic since this is the VMThread, not a JavaThread. -+ -+class ReinitializeItables: public ObjectClosure { - private: - Thread* _thread; - - public: -- SortMethodsClosure(Thread* thread) : _thread(thread) {} -+ ReinitializeItables(Thread* thread) : _thread(thread) {} - - void do_object(oop obj) { -- // instanceKlass objects need some adjustment. - if (obj->blueprint()->oop_is_instanceKlass()) { - instanceKlass* ik = instanceKlass::cast((klassOop)obj); -- -- sort_methods(ik, _thread); -+ ik->itable()->initialize_itable(false, _thread); - } - } - }; -@@ -673,18 +710,9 @@ - oop* top; - char* end; - -- void out_of_space() { -- warning("\nThe shared miscellaneous data space is not large " -- "enough to \npreload requested classes. Use " -- "-XX:SharedMiscDataSize= to increase \nthe initial " -- "size of the miscellaneous data space.\n"); -- exit(2); -- } -- -- - inline void check_space() { - if ((char*)top + sizeof(oop) > end) { -- out_of_space(); -+ report_out_of_shared_space(SharedMiscData); - } - } - -@@ -737,7 +765,7 @@ - - void do_region(u_char* start, size_t size) { - if ((char*)top + size > end) { -- out_of_space(); -+ report_out_of_shared_space(SharedMiscData); - } - assert((intptr_t)start % sizeof(oop) == 0, "bad alignment"); - assert(size % sizeof(oop) == 0, "bad size"); -@@ -870,46 +898,53 @@ - - class PatchKlassVtables: public ObjectClosure { - private: -- void* _vtbl_ptr; -- VirtualSpace* _md_vs; - GrowableArray<klassOop>* _klass_objects; - - public: -- -- PatchKlassVtables(void* vtbl_ptr, VirtualSpace* md_vs) { -- _vtbl_ptr = vtbl_ptr; -- _md_vs = md_vs; -+ PatchKlassVtables() { - _klass_objects = new GrowableArray<klassOop>(); - } - -- - void do_object(oop obj) { - if (obj->is_klass()) { - _klass_objects->append(klassOop(obj)); - } - } - -- -- void patch(void** vtbl_list, int vtbl_list_size) { -- for (int i = 0; i < _klass_objects->length(); ++i) { -+ void patch(void** vtbl_list, void* new_vtable_start) { -+ int n = _klass_objects->length(); -+ for (int i = 0; i < n; i++) { - klassOop obj = (klassOop)_klass_objects->at(i); - Klass* k = obj->klass_part(); -- void* v = *(void**)k; -- -- int n; -- for (n = 0; n < vtbl_list_size; ++n) { -- *(void**)k = NULL; -- if (vtbl_list[n] == v) { -- *(void**)k = (void**)_vtbl_ptr + -- (n * CompactingPermGenGen::num_virtuals); -- break; -- } -- } -- guarantee(n < vtbl_list_size, "unable to find matching vtbl pointer"); -+ *(void**)k = CompactingPermGenGen::find_matching_vtbl_ptr( -+ vtbl_list, new_vtable_start, k); - } - } - }; - -+// Walk through all symbols and patch their vtable pointers. -+// Note that symbols have vtable pointers only in non-product builds -+// (see allocation.hpp). -+ -+#ifndef PRODUCT -+class PatchSymbolVtables: public SymbolClosure { -+private: -+ void* _new_vtbl_ptr; -+ -+public: -+ PatchSymbolVtables(void** vtbl_list, void* new_vtable_start) { -+ Symbol s; -+ _new_vtbl_ptr = CompactingPermGenGen::find_matching_vtbl_ptr( -+ vtbl_list, new_vtable_start, &s); -+ } -+ -+ void do_symbol(Symbol** p) { -+ Symbol* sym = load_symbol(p); -+ *(void**)sym = _new_vtbl_ptr; -+ } -+}; -+#endif -+ - - // Populate the shared space. - -@@ -969,7 +1004,6 @@ - - MarkObjectsOopClosure mark_all; - MarkCommonReadOnly mark_common_ro; -- MarkCommonSymbols mark_common_symbols; - MarkStringValues mark_string_values; - MarkReadWriteObjects mark_rw; - MarkStringObjects mark_strings; -@@ -1013,112 +1047,6 @@ - MarkAndMoveOrderedReadOnly mark_and_move_ordered_ro(&move_ro); - MarkAndMoveOrderedReadWrite mark_and_move_ordered_rw(&move_rw); - -- // Phase 1a: move commonly used read-only objects to the read-only space. -- -- if (SharedOptimizeColdStart) { -- tty->print("Moving pre-ordered read-only objects to shared space at " PTR_FORMAT " ... ", -- _ro_space->top()); -- for (int i = 0; i < _class_promote_order->length(); i++) { -- oop obj = _class_promote_order->at(i); -- mark_and_move_ordered_ro.do_object(obj); -- } -- tty->print_cr("done. "); -- } -- -- tty->print("Moving read-only objects to shared space at " PTR_FORMAT " ... ", -- _ro_space->top()); -- gch->object_iterate(&mark_common_ro); -- gch->object_iterate(&move_ro); -- tty->print_cr("done. "); -- -- // Phase 1b: move commonly used symbols to the read-only space. -- -- tty->print("Moving common symbols to shared space at " PTR_FORMAT " ... ", -- _ro_space->top()); -- gch->object_iterate(&mark_common_symbols); -- gch->object_iterate(&move_ro); -- tty->print_cr("done. "); -- -- // Phase 1c: move remaining symbols to the read-only space -- // (e.g. String initializers). -- -- tty->print("Moving remaining symbols to shared space at " PTR_FORMAT " ... ", -- _ro_space->top()); -- vmSymbols::oops_do(&mark_all, true); -- gch->object_iterate(&move_ro); -- tty->print_cr("done. "); -- -- // Phase 1d: move String character arrays to the read-only space. -- -- tty->print("Moving string char arrays to shared space at " PTR_FORMAT " ... ", -- _ro_space->top()); -- gch->object_iterate(&mark_string_values); -- gch->object_iterate(&move_ro); -- tty->print_cr("done. "); -- -- // Phase 2: move all remaining symbols to the read-only space. The -- // remaining symbols are assumed to be string initializers no longer -- // referenced. -- -- void* extra_symbols = _ro_space->top(); -- tty->print("Moving additional symbols to shared space at " PTR_FORMAT " ... ", -- _ro_space->top()); -- SymbolTable::oops_do(&mark_all); -- gch->object_iterate(&move_ro); -- tty->print_cr("done. "); -- tty->print_cr("Read-only space ends at " PTR_FORMAT ", %d bytes.", -- _ro_space->top(), _ro_space->used()); -- -- // Phase 3: move read-write objects to the read-write space, except -- // Strings. -- -- if (SharedOptimizeColdStart) { -- tty->print("Moving pre-ordered read-write objects to shared space at " PTR_FORMAT " ... ", -- _rw_space->top()); -- for (int i = 0; i < _class_promote_order->length(); i++) { -- oop obj = _class_promote_order->at(i); -- mark_and_move_ordered_rw.do_object(obj); -- } -- tty->print_cr("done. "); -- } -- tty->print("Moving read-write objects to shared space at " PTR_FORMAT " ... ", -- _rw_space->top()); -- Universe::oops_do(&mark_all, true); -- SystemDictionary::oops_do(&mark_all); -- oop tmp = Universe::arithmetic_exception_instance(); -- mark_object(java_lang_Throwable::message(tmp)); -- gch->object_iterate(&mark_rw); -- gch->object_iterate(&move_rw); -- tty->print_cr("done. "); -- -- // Phase 4: move String objects to the read-write space. -- -- tty->print("Moving String objects to shared space at " PTR_FORMAT " ... ", -- _rw_space->top()); -- StringTable::oops_do(&mark_all); -- gch->object_iterate(&mark_strings); -- gch->object_iterate(&move_rw); -- tty->print_cr("done. "); -- tty->print_cr("Read-write space ends at " PTR_FORMAT ", %d bytes.", -- _rw_space->top(), _rw_space->used()); -- --#ifdef DEBUG -- // Check: scan for objects which were not moved. -- -- CheckRemainingObjects check_objects; -- gch->object_iterate(&check_objects); -- check_objects.status(); --#endif -- -- // Resolve forwarding in objects and saved C++ structures -- tty->print("Updating references to shared objects ... "); -- ResolveForwardingClosure resolve; -- Universe::oops_do(&resolve); -- SystemDictionary::oops_do(&resolve); -- StringTable::oops_do(&resolve); -- SymbolTable::oops_do(&resolve); -- vmSymbols::oops_do(&resolve); -- - // Set up the share data and shared code segments. - - char* md_top = _md_vs->low(); -@@ -1144,6 +1072,122 @@ - &md_top, md_end, - &mc_top, mc_end); - -+ // Reserve space for the total size and the number of stored symbols. -+ -+ md_top += sizeof(intptr_t) * 2; -+ -+ MoveSymbols move_symbols(md_top, md_end); -+ CommonSymbolsClosure traverse_common_symbols(&move_symbols); -+ -+ // Phase 1a: remove symbols with _refcount == 0 -+ -+ SymbolTable::unlink(); -+ -+ // Phase 1b: move commonly used symbols referenced by oop fields. -+ -+ tty->print("Moving common symbols to metadata section at " PTR_FORMAT " ... ", -+ move_symbols.get_top()); -+ gch->object_iterate(&traverse_common_symbols); -+ tty->print_cr("done. "); -+ -+ // Phase 1c: move known names and signatures. -+ -+ tty->print("Moving vmSymbols to metadata section at " PTR_FORMAT " ... ", -+ move_symbols.get_top()); -+ vmSymbols::symbols_do(&move_symbols); -+ tty->print_cr("done. "); -+ -+ // Phase 1d: move the remaining symbols by scanning the whole SymbolTable. -+ -+ void* extra_symbols = move_symbols.get_top(); -+ tty->print("Moving the remaining symbols to metadata section at " PTR_FORMAT " ... ", -+ move_symbols.get_top()); -+ SymbolTable::symbols_do(&move_symbols); -+ tty->print_cr("done. "); -+ -+ // Record the total length of all symbols at the beginning of the block. -+ ((intptr_t*)md_top)[-2] = move_symbols.get_top() - md_top; -+ ((intptr_t*)md_top)[-1] = move_symbols.count(); -+ tty->print_cr("Moved %d symbols, %d bytes.", -+ move_symbols.count(), move_symbols.get_top() - md_top); -+ // Advance the pointer to the end of symbol store. -+ md_top = move_symbols.get_top(); -+ -+ -+ // Phase 2: move commonly used read-only objects to the read-only space. -+ -+ if (SharedOptimizeColdStart) { -+ tty->print("Moving pre-ordered read-only objects to shared space at " PTR_FORMAT " ... ", -+ _ro_space->top()); -+ for (int i = 0; i < _class_promote_order->length(); i++) { -+ oop obj = _class_promote_order->at(i); -+ mark_and_move_ordered_ro.do_object(obj); -+ } -+ tty->print_cr("done. "); -+ } -+ -+ tty->print("Moving read-only objects to shared space at " PTR_FORMAT " ... ", -+ _ro_space->top()); -+ gch->object_iterate(&mark_common_ro); -+ gch->object_iterate(&move_ro); -+ tty->print_cr("done. "); -+ -+ // Phase 3: move String character arrays to the read-only space. -+ -+ tty->print("Moving string char arrays to shared space at " PTR_FORMAT " ... ", -+ _ro_space->top()); -+ gch->object_iterate(&mark_string_values); -+ gch->object_iterate(&move_ro); -+ tty->print_cr("done. "); -+ -+ // Phase 4: move read-write objects to the read-write space, except -+ // Strings. -+ -+ if (SharedOptimizeColdStart) { -+ tty->print("Moving pre-ordered read-write objects to shared space at " PTR_FORMAT " ... ", -+ _rw_space->top()); -+ for (int i = 0; i < _class_promote_order->length(); i++) { -+ oop obj = _class_promote_order->at(i); -+ mark_and_move_ordered_rw.do_object(obj); -+ } -+ tty->print_cr("done. "); -+ } -+ tty->print("Moving read-write objects to shared space at " PTR_FORMAT " ... ", -+ _rw_space->top()); -+ Universe::oops_do(&mark_all, true); -+ SystemDictionary::oops_do(&mark_all); -+ oop tmp = Universe::arithmetic_exception_instance(); -+ mark_object(java_lang_Throwable::message(tmp)); -+ gch->object_iterate(&mark_rw); -+ gch->object_iterate(&move_rw); -+ tty->print_cr("done. "); -+ -+ // Phase 5: move String objects to the read-write space. -+ -+ tty->print("Moving String objects to shared space at " PTR_FORMAT " ... ", -+ _rw_space->top()); -+ StringTable::oops_do(&mark_all); -+ gch->object_iterate(&mark_strings); -+ gch->object_iterate(&move_rw); -+ tty->print_cr("done. "); -+ tty->print_cr("Read-write space ends at " PTR_FORMAT ", %d bytes.", -+ _rw_space->top(), _rw_space->used()); -+ -+#ifdef DEBUG -+ // Check: scan for objects which were not moved. -+ -+ CheckRemainingObjects check_objects; -+ gch->object_iterate(&check_objects); -+ check_objects.status(); -+#endif -+ -+ // Resolve forwarding in objects and saved C++ structures -+ tty->print("Updating references to shared objects ... "); -+ ResolveForwardingClosure resolve; -+ Universe::oops_do(&resolve); -+ SystemDictionary::oops_do(&resolve); -+ StringTable::oops_do(&resolve); -+ - // Fix (forward) all of the references in these shared objects (which - // are required to point ONLY to objects in the shared spaces). - // Also, create a list of all objects which might later contain a -@@ -1166,9 +1210,13 @@ - // pointer resolution, so that methods can be promoted in any order - // with respect to their holder classes. - -- SortMethodsClosure sort(THREAD); -+ SortMethodsClosure sort; - gen->ro_space()->object_iterate(&sort); - gen->rw_space()->object_iterate(&sort); -+ -+ ReinitializeItables reinit_itables(THREAD); -+ gen->ro_space()->object_iterate(&reinit_itables); -+ gen->rw_space()->object_iterate(&reinit_itables); - tty->print_cr("done. "); - tty->cr(); - -@@ -1233,9 +1281,16 @@ - // Update the vtable pointers in all of the Klass objects in the - // heap. They should point to newly generated vtable. - -- PatchKlassVtables pkvt(vtable, _md_vs); -+ PatchKlassVtables pkvt; - _rw_space->object_iterate(&pkvt); -- pkvt.patch(vtbl_list, vtbl_list_size); -+ pkvt.patch(vtbl_list, vtable); -+ -+#ifndef PRODUCT -+ // Update the vtable pointers in all symbols, -+ // but only in non-product builds where symbols DO have virtual methods. -+ PatchSymbolVtables psvt(vtbl_list, vtable); -+ SymbolTable::symbols_do(&psvt); -+#endif - - char* saved_vtbl = (char*)malloc(vtbl_list_size * sizeof(void*)); - memmove(saved_vtbl, vtbl_list, vtbl_list_size * sizeof(void*)); -@@ -1304,6 +1359,19 @@ - return JNI_OK; - } - -+void* CompactingPermGenGen::find_matching_vtbl_ptr(void** vtbl_list, -+ void* new_vtable_start, -+ void* obj) { -+ void* old_vtbl_ptr = *(void**)obj; -+ for (int i = 0; i < vtbl_list_size; i++) { -+ if (vtbl_list[i] == old_vtbl_ptr) { -+ return (void**)new_vtable_start + i * num_virtuals; -+ } -+ } -+ ShouldNotReachHere(); -+ return NULL; -+} -+ - - class LinkClassesClosure : public ObjectClosure { - private: -@@ -1431,8 +1499,7 @@ - computed_jsum = jsum(computed_jsum, class_name, (const int)name_len - 1); - - // Got a class name - load it. -- symbolHandle class_name_symbol = oopFactory::new_symbol(class_name, -- THREAD); -+ TempNewSymbol class_name_symbol = SymbolTable::new_symbol(class_name, THREAD); - guarantee(!HAS_PENDING_EXCEPTION, "Exception creating a symbol."); - klassOop klass = SystemDictionary::resolve_or_null(class_name_symbol, - THREAD); -diff --git a/src/share/vm/memory/genCollectedHeap.cpp b/src/share/vm/memory/genCollectedHeap.cpp ---- openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp -+++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp -@@ -875,10 +875,7 @@ - - void GenCollectedHeap::collect_locked(GCCause::Cause cause, int max_level) { - if (_preloading_shared_classes) { -- warning("\nThe permanent generation is not large enough to preload " -- "requested classes.\nUse -XX:PermSize= to increase the initial " -- "size of the permanent generation.\n"); -- vm_exit(2); -+ report_out_of_shared_space(SharedPermGen); - } - // Read the GC count while holding the Heap_lock - unsigned int gc_count_before = total_collections(); -diff --git a/src/share/vm/memory/genMarkSweep.cpp b/src/share/vm/memory/genMarkSweep.cpp ---- openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp -+++ openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp -@@ -296,9 +296,10 @@ - follow_mdo_weak_refs(); - assert(_marking_stack.is_empty(), "just drained"); - -- // Visit symbol and interned string tables and delete unmarked oops -- SymbolTable::unlink(&is_alive); -+ // Visit interned string tables and delete unmarked oops - StringTable::unlink(&is_alive); -+ // Clean up unreferenced symbols in symbol table. -+ SymbolTable::unlink(); - - assert(_marking_stack.is_empty(), "stack should be empty by now"); - } -diff --git a/src/share/vm/memory/heapInspection.cpp b/src/share/vm/memory/heapInspection.cpp ---- openjdk/hotspot/src/share/vm/memory/heapInspection.cpp -+++ openjdk/hotspot/src/share/vm/memory/heapInspection.cpp -@@ -56,7 +56,6 @@ - if (_klass == Universe::objArrayKlassKlassObj()) name = "<objArrayKlassKlass>"; else - if (_klass == Universe::instanceKlassKlassObj()) name = "<instanceKlassKlass>"; else - if (_klass == Universe::typeArrayKlassKlassObj()) name = "<typeArrayKlassKlass>"; else -- if (_klass == Universe::symbolKlassObj()) name = "<symbolKlass>"; else - if (_klass == Universe::boolArrayKlassObj()) name = "<boolArrayKlass>"; else - if (_klass == Universe::charArrayKlassObj()) name = "<charArrayKlass>"; else - if (_klass == Universe::singleArrayKlassObj()) name = "<singleArrayKlass>"; else -diff --git a/src/share/vm/memory/iterator.hpp b/src/share/vm/memory/iterator.hpp ---- openjdk/hotspot/src/share/vm/memory/iterator.hpp -+++ openjdk/hotspot/src/share/vm/memory/iterator.hpp -@@ -290,6 +290,22 @@ - virtual void do_tag(int tag) = 0; - }; - -+class SymbolClosure : public StackObj { -+ public: -+ virtual void do_symbol(Symbol**) = 0; -+ -+ // Clear LSB in symbol address; it can be set by CPSlot. -+ static Symbol* load_symbol(Symbol** p) { -+ return (Symbol*)(intptr_t(*p) & ~1); -+ } -+ -+ // Store symbol, adjusting new pointer if the original pointer was adjusted -+ // (symbol references in constant pool slots have their LSB set to 1). -+ static void store_symbol(Symbol** p, Symbol* sym) { -+ *p = (Symbol*)(intptr_t(sym) | (intptr_t(*p) & 1)); -+ } -+}; -+ - #ifdef ASSERT - // This class is used to flag phases of a collection that - // can unload classes and which should override the -diff --git a/src/share/vm/memory/oopFactory.hpp b/src/share/vm/memory/oopFactory.hpp ---- openjdk/hotspot/src/share/vm/memory/oopFactory.hpp -+++ openjdk/hotspot/src/share/vm/memory/oopFactory.hpp -@@ -64,34 +64,6 @@ - - static typeArrayOop new_typeArray(BasicType type, int length, TRAPS); - -- // Symbols -- static symbolOop new_symbol(const char* utf8_buffer, int length, TRAPS) { -- assert(utf8_buffer != NULL, "just checking"); -- return SymbolTable::lookup(utf8_buffer, length, CHECK_NULL); -- } -- static void new_symbols(constantPoolHandle cp, int names_count, -- const char** name, int* lengths, -- int* cp_indices, unsigned int* hashValues, -- TRAPS) { -- SymbolTable::add(cp, names_count, name, lengths, cp_indices, -- hashValues, CHECK); -- } -- -- static symbolOop new_symbol(char* name, TRAPS) { return new_symbol(name, (int)strlen(name), CHECK_NULL); } -- static symbolOop new_symbol(const char* name, TRAPS) { return new_symbol(name, (int)strlen(name), CHECK_NULL); } -- static symbolOop new_symbol(symbolHandle sym, int begin, int end, TRAPS) { -- assert(begin <= end && end <= sym->utf8_length(), "just checking"); -- return SymbolTable::lookup(sym, begin, end, CHECK_NULL); -- } -- -- // Create symbols as above but return a handle -- static symbolHandle new_symbol_handle(const char* name, int length, TRAPS) { -- symbolOop sym = new_symbol(name, length, THREAD); -- return symbolHandle(THREAD, sym); -- } -- static symbolHandle new_symbol_handle(char* name, TRAPS) { return new_symbol_handle(name, (int)strlen(name), CHECK_(symbolHandle())); } -- static symbolHandle new_symbol_handle(const char* name, TRAPS) { return new_symbol_handle(name, (int)strlen(name), CHECK_(symbolHandle())); } -- - // Constant pools - static constantPoolOop new_constantPool (int length, - bool is_conc_safe, -diff --git a/src/share/vm/memory/restore.cpp b/src/share/vm/memory/restore.cpp ---- openjdk/hotspot/src/share/vm/memory/restore.cpp -+++ openjdk/hotspot/src/share/vm/memory/restore.cpp -@@ -107,15 +107,23 @@ - // Skip over (reserve space for) a list of addresses of C++ vtables - // for Klass objects. They get filled in later. - -+ void** vtbl_list = (void**)buffer; -+ buffer += vtbl_list_size * sizeof(void*); -+ Universe::init_self_patching_vtbl_list(vtbl_list, vtbl_list_size); -+ - // Skip over (reserve space for) dummy C++ vtables Klass objects. - // They are used as is. - -- void** vtbl_list = (void**)buffer; -- buffer += vtbl_list_size * sizeof(void*); - intptr_t vtable_size = *(intptr_t*)buffer; - buffer += sizeof(intptr_t); - buffer += vtable_size; - -+ // Skip the recorded symbols. -+ -+ intptr_t total_symbol_size = *(intptr_t*)buffer; -+ buffer += sizeof(intptr_t) * 2; -+ buffer += total_symbol_size; -+ - // Create the symbol table using the bucket array at this spot in the - // misc data space. Since the symbol table is often modified, this - // region (of mapped pages) will be copy-on-write. -diff --git a/src/share/vm/memory/serialize.cpp b/src/share/vm/memory/serialize.cpp ---- openjdk/hotspot/src/share/vm/memory/serialize.cpp -+++ openjdk/hotspot/src/share/vm/memory/serialize.cpp -@@ -61,7 +61,7 @@ - soc->do_tag(sizeof(constantPoolCacheOopDesc)); - soc->do_tag(objArrayOopDesc::base_offset_in_bytes()); - soc->do_tag(typeArrayOopDesc::base_offset_in_bytes(T_BYTE)); -- soc->do_tag(sizeof(symbolOopDesc)); -+ soc->do_tag(sizeof(Symbol)); - soc->do_tag(sizeof(klassOopDesc)); - soc->do_tag(sizeof(markOopDesc)); - soc->do_tag(sizeof(compiledICHolderOopDesc)); -@@ -83,8 +83,12 @@ - // Dump/restore miscellaneous oops. - Universe::oops_do(soc, true); - soc->do_tag(--tag); -+ CodeCache::oops_do(soc); -+ soc->do_tag(--tag); - -- vmSymbols::oops_do(soc, true); soc->do_tag(--tag); -- CodeCache::oops_do(soc); soc->do_tag(--tag); -+ // Dump/restore references to commonly used names and signatures. -+ vmSymbols::serialize(soc); -+ soc->do_tag(--tag); -+ - soc->do_tag(666); - } -diff --git a/src/share/vm/memory/sharedHeap.cpp b/src/share/vm/memory/sharedHeap.cpp ---- openjdk/hotspot/src/share/vm/memory/sharedHeap.cpp -+++ openjdk/hotspot/src/share/vm/memory/sharedHeap.cpp -@@ -46,7 +46,6 @@ - SH_PS_Management_oops_do, - SH_PS_SystemDictionary_oops_do, - SH_PS_jvmti_oops_do, -- SH_PS_vmSymbols_oops_do, - SH_PS_SymbolTable_oops_do, - SH_PS_StringTable_oops_do, - SH_PS_CodeCache_oops_do, -@@ -169,11 +168,6 @@ - } - - if (!_process_strong_tasks->is_task_claimed(SH_PS_SymbolTable_oops_do)) { -- if (so & SO_Symbols) { -- SymbolTable::oops_do(roots); -- } -- // Verify if the symbol table contents are in the perm gen -- NOT_PRODUCT(SymbolTable::oops_do(&assert_is_perm_closure)); - } - - if (!_process_strong_tasks->is_task_claimed(SH_PS_StringTable_oops_do)) { -@@ -210,20 +204,6 @@ - NOT_PRODUCT(CodeCache::asserted_non_scavengable_nmethods_do(&assert_code_is_perm)); - } - -- // Roots that should point only into permanent generation. -- { -- OopClosure* blk = NULL; -- if (collecting_perm_gen) { -- blk = roots; -- } else { -- debug_only(blk = &assert_is_perm_closure); -- } -- if (blk != NULL) { -- if (!_process_strong_tasks->is_task_claimed(SH_PS_vmSymbols_oops_do)) -- vmSymbols::oops_do(blk); -- } -- } -- - if (!collecting_perm_gen) { - // All threads perform this; coordination is handled internally. - -@@ -273,7 +253,6 @@ - JNIHandles::weak_oops_do(&always_true, root_closure); - - CodeCache::blobs_do(code_roots); -- SymbolTable::oops_do(root_closure); - if (UseSharedSpaces && !DumpSharedSpaces) { - SkipAdjustingSharedStrings skip_closure(root_closure); - StringTable::oops_do(&skip_closure); -diff --git a/src/share/vm/memory/universe.cpp b/src/share/vm/memory/universe.cpp ---- openjdk/hotspot/src/share/vm/memory/universe.cpp -+++ openjdk/hotspot/src/share/vm/memory/universe.cpp -@@ -60,7 +60,6 @@ - #include "oops/methodKlass.hpp" - #include "oops/objArrayKlassKlass.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolKlass.hpp" - #include "oops/typeArrayKlass.hpp" - #include "oops/typeArrayKlassKlass.hpp" - #include "prims/jvmtiRedefineClassesTrace.hpp" -@@ -109,7 +108,6 @@ - klassOop Universe::_doubleArrayKlassObj = NULL; - klassOop Universe::_typeArrayKlassObjs[T_VOID+1] = { NULL /*, NULL...*/ }; - klassOop Universe::_objectArrayKlassObj = NULL; --klassOop Universe::_symbolKlassObj = NULL; - klassOop Universe::_methodKlassObj = NULL; - klassOop Universe::_constMethodKlassObj = NULL; - klassOop Universe::_methodDataKlassObj = NULL; -@@ -157,7 +155,6 @@ - oop Universe::_arithmetic_exception_instance = NULL; - oop Universe::_virtual_machine_error_instance = NULL; - oop Universe::_vm_exception = NULL; --oop Universe::_emptySymbol = NULL; - - // These variables are guarded by FullGCALot_lock. - debug_only(objArrayOop Universe::_fullgc_alot_dummy_array = NULL;) -@@ -192,7 +189,6 @@ - - - void Universe::system_classes_do(void f(klassOop)) { -- f(symbolKlassObj()); - f(methodKlassObj()); - f(constMethodKlassObj()); - f(methodDataKlassObj()); -@@ -244,7 +240,6 @@ - } - } - } -- f->do_oop((oop*)&_symbolKlassObj); - f->do_oop((oop*)&_methodKlassObj); - f->do_oop((oop*)&_constMethodKlassObj); - f->do_oop((oop*)&_methodDataKlassObj); -@@ -282,7 +277,6 @@ - f->do_oop((oop*)&_main_thread_group); - f->do_oop((oop*)&_system_thread_group); - f->do_oop((oop*)&_vm_exception); -- f->do_oop((oop*)&_emptySymbol); - debug_only(f->do_oop((oop*)&_fullgc_alot_dummy_array);) - } - -@@ -315,10 +309,6 @@ - _instanceKlassKlassObj = instanceKlassKlass::create_klass(CHECK); - _typeArrayKlassKlassObj = typeArrayKlassKlass::create_klass(CHECK); - -- _symbolKlassObj = symbolKlass::create_klass(CHECK); -- -- _emptySymbol = oopFactory::new_symbol("", CHECK); -- - _boolArrayKlassObj = typeArrayKlass::create_klass(T_BOOLEAN, sizeof(jboolean), CHECK); - _charArrayKlassObj = typeArrayKlass::create_klass(T_CHAR, sizeof(jchar), CHECK); - _singleArrayKlassObj = typeArrayKlass::create_klass(T_FLOAT, sizeof(jfloat), CHECK); -@@ -352,13 +342,6 @@ - _the_empty_system_obj_array = oopFactory::new_system_objArray(0, CHECK); - - _the_array_interfaces_array = oopFactory::new_system_objArray(2, CHECK); -- _vm_exception = oopFactory::new_symbol("vm exception holder", CHECK); -- } else { -- FileMapInfo *mapinfo = FileMapInfo::current_info(); -- char* buffer = mapinfo->region_base(CompactingPermGenGen::md); -- void** vtbl_list = (void**)buffer; -- init_self_patching_vtbl_list(vtbl_list, -- CompactingPermGenGen::vtbl_list_size); - } - } - -@@ -452,15 +435,15 @@ - if (JDK_Version::is_partially_initialized()) { - uint8_t jdk_version; - klassOop k = SystemDictionary::resolve_or_null( -- vmSymbolHandles::java_lang_management_MemoryUsage(), THREAD); -+ vmSymbols::java_lang_management_MemoryUsage(), THREAD); - CLEAR_PENDING_EXCEPTION; // ignore exceptions - if (k == NULL) { - k = SystemDictionary::resolve_or_null( -- vmSymbolHandles::java_lang_CharSequence(), THREAD); -+ vmSymbols::java_lang_CharSequence(), THREAD); - CLEAR_PENDING_EXCEPTION; // ignore exceptions - if (k == NULL) { - k = SystemDictionary::resolve_or_null( -- vmSymbolHandles::java_lang_Shutdown(), THREAD); -+ vmSymbols::java_lang_Shutdown(), THREAD); - CLEAR_PENDING_EXCEPTION; // ignore exceptions - if (k == NULL) { - jdk_version = 2; -@@ -523,11 +506,16 @@ - } - - --static inline void add_vtable(void** list, int* n, Klass* o, int count) { -- list[(*n)++] = *(void**)&o->vtbl_value(); -- guarantee((*n) <= count, "vtable list too small."); -+static inline void* dereference(void* addr) { -+ return *(void**)addr; - } - -+static inline void add_vtable(void** list, int* n, void* o, int count) { -+ guarantee((*n) < count, "vtable list too small"); -+ void* vtable = dereference(o); -+ assert(dereference(vtable) != NULL, "invalid vtable"); -+ list[(*n)++] = vtable; -+} - - void Universe::init_self_patching_vtbl_list(void** list, int count) { - int n = 0; -@@ -539,7 +527,6 @@ - { instanceMirrorKlass o; add_vtable(list, &n, &o, count); } - { instanceRefKlass o; add_vtable(list, &n, &o, count); } - { typeArrayKlassKlass o; add_vtable(list, &n, &o, count); } -- { symbolKlass o; add_vtable(list, &n, &o, count); } - { typeArrayKlass o; add_vtable(list, &n, &o, count); } - { methodKlass o; add_vtable(list, &n, &o, count); } - { constMethodKlass o; add_vtable(list, &n, &o, count); } -@@ -548,6 +535,11 @@ - { objArrayKlass o; add_vtable(list, &n, &o, count); } - { methodDataKlass o; add_vtable(list, &n, &o, count); } - { compiledICHolderKlass o; add_vtable(list, &n, &o, count); } -+#ifndef PRODUCT -+ // In non-product builds CHeapObj is derived from AllocatedObj, -+ // so symbols in CDS archive should have their vtable pointer patched. -+ { Symbol o; add_vtable(list, &n, &o, count); } -+#endif - } - - -@@ -641,8 +633,8 @@ - JavaCalls::call_static( - &result, - finalizer_klass, -- vmSymbolHandles::run_finalizers_on_exit_name(), -- vmSymbolHandles::void_method_signature(), -+ vmSymbols::run_finalizers_on_exit_name(), -+ vmSymbols::void_method_signature(), - THREAD - ); - // Ignore any pending exceptions -@@ -1046,7 +1038,7 @@ - // Setup preallocated empty java.lang.Class array - Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_false); - // Setup preallocated OutOfMemoryError errors -- k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_OutOfMemoryError(), true, CHECK_false); -+ k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_OutOfMemoryError(), true, CHECK_false); - k_h = instanceKlassHandle(THREAD, k); - Universe::_out_of_memory_error_java_heap = k_h->allocate_permanent_instance(CHECK_false); - Universe::_out_of_memory_error_perm_gen = k_h->allocate_permanent_instance(CHECK_false); -@@ -1056,15 +1048,15 @@ - - // Setup preallocated NullPointerException - // (this is currently used for a cheap & dirty solution in compiler exception handling) -- k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_NullPointerException(), true, CHECK_false); -+ k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_NullPointerException(), true, CHECK_false); - Universe::_null_ptr_exception_instance = instanceKlass::cast(k)->allocate_permanent_instance(CHECK_false); - // Setup preallocated ArithmeticException - // (this is currently used for a cheap & dirty solution in compiler exception handling) -- k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_ArithmeticException(), true, CHECK_false); -+ k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ArithmeticException(), true, CHECK_false); - Universe::_arithmetic_exception_instance = instanceKlass::cast(k)->allocate_permanent_instance(CHECK_false); - // Virtual Machine Error for when we get into a situation we can't resolve - k = SystemDictionary::resolve_or_fail( -- vmSymbolHandles::java_lang_VirtualMachineError(), true, CHECK_false); -+ vmSymbols::java_lang_VirtualMachineError(), true, CHECK_false); - bool linked = instanceKlass::cast(k)->link_class_or_fail(CHECK_false); - if (!linked) { - tty->print_cr("Unable to link/verify VirtualMachineError class"); -@@ -1072,6 +1064,9 @@ - } - Universe::_virtual_machine_error_instance = - instanceKlass::cast(k)->allocate_permanent_instance(CHECK_false); -+ -+ Universe::_vm_exception = instanceKlass::cast(k)->allocate_permanent_instance(CHECK_false); -+ - } - if (!DumpSharedSpaces) { - // These are the only Java fields that are currently set during shared space dumping. -@@ -1126,7 +1121,7 @@ - // Note: No race-condition here, since a resolve will always return the same result - - // Setup method for security checks -- k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_reflect_Method(), true, CHECK_false); -+ k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_reflect_Method(), true, CHECK_false); - k_h = instanceKlassHandle(THREAD, k); - k_h->link_class(CHECK_false); - m = k_h->find_method(vmSymbols::invoke_name(), vmSymbols::object_object_array_object_signature()); -diff --git a/src/share/vm/memory/universe.hpp b/src/share/vm/memory/universe.hpp ---- openjdk/hotspot/src/share/vm/memory/universe.hpp -+++ openjdk/hotspot/src/share/vm/memory/universe.hpp -@@ -139,7 +139,6 @@ - - static klassOop _objectArrayKlassObj; - -- static klassOop _symbolKlassObj; - static klassOop _methodKlassObj; - static klassOop _constMethodKlassObj; - static klassOop _methodDataKlassObj; -@@ -199,8 +198,6 @@ - // the vm thread. - static oop _vm_exception; - -- static oop _emptySymbol; // Canonical empty string ("") symbol -- - // The particular choice of collected heap. - static CollectedHeap* _collectedHeap; - -@@ -274,7 +271,6 @@ - return _typeArrayKlassObjs[t]; - } - -- static klassOop symbolKlassObj() { return _symbolKlassObj; } - static klassOop methodKlassObj() { return _methodKlassObj; } - static klassOop constMethodKlassObj() { return _constMethodKlassObj; } - static klassOop methodDataKlassObj() { return _methodDataKlassObj; } -@@ -288,9 +284,8 @@ - static klassOop compiledICHolderKlassObj() { return _compiledICHolderKlassObj; } - static klassOop systemObjArrayKlassObj() { return _systemObjArrayKlassObj; } - -- // Known objects in tbe VM -- static oop int_mirror() { return check_mirror(_int_mirror); --} -+ // Known objects in the VM -+ static oop int_mirror() { return check_mirror(_int_mirror); } - static oop float_mirror() { return check_mirror(_float_mirror); } - static oop double_mirror() { return check_mirror(_double_mirror); } - static oop byte_mirror() { return check_mirror(_byte_mirror); } -@@ -329,7 +324,6 @@ - static oop arithmetic_exception_instance() { return _arithmetic_exception_instance; } - static oop virtual_machine_error_instance() { return _virtual_machine_error_instance; } - static oop vm_exception() { return _vm_exception; } -- static oop emptySymbol() { return _emptySymbol; } - - // OutOfMemoryError support. Returns an error with the required message. The returned error - // may or may not have a backtrace. If error has a backtrace then the stack trace is already -diff --git a/src/share/vm/oops/arrayKlass.cpp b/src/share/vm/oops/arrayKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/arrayKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/arrayKlass.cpp -@@ -64,7 +64,7 @@ - return NULL; - } - --methodOop arrayKlass::uncached_lookup_method(symbolOop name, symbolOop signature) const { -+methodOop arrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const { - // There are no methods in an array klass but the super class (Object) has some - assert(super(), "super klass must be present"); - return Klass::cast(super())->uncached_lookup_method(name, signature); -diff --git a/src/share/vm/oops/arrayKlass.hpp b/src/share/vm/oops/arrayKlass.hpp ---- openjdk/hotspot/src/share/vm/oops/arrayKlass.hpp -+++ openjdk/hotspot/src/share/vm/oops/arrayKlass.hpp -@@ -84,7 +84,7 @@ - objArrayOop allocate_arrayArray(int n, int length, TRAPS); - - // Lookup operations -- methodOop uncached_lookup_method(symbolOop name, symbolOop signature) const; -+ methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const; - - // Casting from klassOop - static arrayKlass* cast(klassOop k) { -diff --git a/src/share/vm/oops/arrayOop.cpp b/src/share/vm/oops/arrayOop.cpp ---- openjdk/hotspot/src/share/vm/oops/arrayOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/arrayOop.cpp -@@ -26,6 +26,6 @@ - #include "oops/arrayOop.hpp" - #include "oops/objArrayOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - - // <<this page is intentionally left blank>> -diff --git a/src/share/vm/oops/constantPoolKlass.cpp b/src/share/vm/oops/constantPoolKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp -@@ -33,7 +33,7 @@ - #include "oops/constantPoolOop.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.inline.hpp" - #ifdef TARGET_OS_FAMILY_linux - # include "thread_linux.inline.hpp" -@@ -388,8 +388,12 @@ - case JVM_CONSTANT_UnresolvedClass : // fall-through - case JVM_CONSTANT_UnresolvedClassInError: { - // unresolved_klass_at requires lock or safe world. -- oop entry = *cp->obj_at_addr(index); -- entry->print_value_on(st); -+ CPSlot entry = cp->slot_at(index); -+ if (entry.is_oop()) { -+ entry.get_oop()->print_value_on(st); -+ } else { -+ entry.get_symbol()->print_value_on(st); -+ } - } - break; - case JVM_CONSTANT_MethodHandle : -@@ -450,36 +454,43 @@ - constantPoolOop cp = constantPoolOop(obj); - guarantee(cp->is_perm(), "should be in permspace"); - if (!cp->partially_loaded()) { -- oop* base = (oop*)cp->base(); - for (int i = 0; i< cp->length(); i++) { -+ CPSlot entry = cp->slot_at(i); - if (cp->tag_at(i).is_klass()) { -- guarantee((*base)->is_perm(), "should be in permspace"); -- guarantee((*base)->is_klass(), "should be klass"); -+ if (entry.is_oop()) { -+ guarantee(entry.get_oop()->is_perm(), "should be in permspace"); -+ guarantee(entry.get_oop()->is_klass(), "should be klass"); -+ } - } - if (cp->tag_at(i).is_unresolved_klass()) { -- guarantee((*base)->is_perm(), "should be in permspace"); -- guarantee((*base)->is_symbol() || (*base)->is_klass(), -- "should be symbol or klass"); -+ if (entry.is_oop()) { -+ guarantee(entry.get_oop()->is_perm(), "should be in permspace"); -+ guarantee(entry.get_oop()->is_klass(), "should be klass"); -+ } - } - if (cp->tag_at(i).is_symbol()) { -- guarantee((*base)->is_perm(), "should be in permspace"); -- guarantee((*base)->is_symbol(), "should be symbol"); -+ guarantee(entry.get_symbol()->refcount() != 0, "should have nonzero reference count"); - } - if (cp->tag_at(i).is_unresolved_string()) { -- guarantee((*base)->is_perm(), "should be in permspace"); -- guarantee((*base)->is_symbol() || (*base)->is_instance(), -- "should be symbol or instance"); -+ if (entry.is_oop()) { -+ guarantee(entry.get_oop()->is_perm(), "should be in permspace"); -+ guarantee(entry.get_oop()->is_instance(), "should be instance"); -+ } -+ else { -+ guarantee(entry.get_symbol()->refcount() != 0, "should have nonzero reference count"); -+ } - } - if (cp->tag_at(i).is_string()) { - if (!cp->has_pseudo_string()) { -- guarantee((*base)->is_perm(), "should be in permspace"); -- guarantee((*base)->is_instance(), "should be instance"); -+ if (entry.is_oop()) { -+ guarantee(entry.get_oop()->is_perm(), "should be in permspace"); -+ guarantee(entry.get_oop()->is_instance(), "should be instance"); -+ } - } else { - // can be non-perm, can be non-instance (array) - } - } - // FIXME: verify JSR 292 tags JVM_CONSTANT_MethodHandle, etc. -- base++; - } - guarantee(cp->tags()->is_perm(), "should be in permspace"); - guarantee(cp->tags()->is_typeArray(), "should be type array"); -diff --git a/src/share/vm/oops/constantPoolOop.cpp b/src/share/vm/oops/constantPoolOop.cpp ---- openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp -@@ -52,13 +52,14 @@ - } - - klassOop constantPoolOopDesc::klass_at_impl(constantPoolHandle this_oop, int which, TRAPS) { -- // A resolved constantPool entry will contain a klassOop, otherwise a symbolOop. -+ // A resolved constantPool entry will contain a klassOop, otherwise a Symbol*. - // It is not safe to rely on the tag bit's here, since we don't have a lock, and the entry and - // tag is not updated atomicly. -- oop entry = *(this_oop->obj_at_addr(which)); -- if (entry->is_klass()) { -+ CPSlot entry = this_oop->slot_at(which); -+ if (entry.is_oop()) { -+ assert(entry.get_oop()->is_klass(), "must be"); - // Already resolved - return entry. -- return (klassOop)entry; -+ return (klassOop)entry.get_oop(); - } - - // Acquire lock on constant oop while doing update. After we get the lock, we check if another object -@@ -67,7 +68,7 @@ - bool do_resolve = false; - bool in_error = false; - -- symbolHandle name; -+ Symbol* name = NULL; - Handle loader; - { ObjectLocker ol(this_oop, THREAD); - -@@ -76,7 +77,7 @@ - in_error = true; - } else { - do_resolve = true; -- name = symbolHandle(THREAD, this_oop->unresolved_klass_at(which)); -+ name = this_oop->unresolved_klass_at(which); - loader = Handle(THREAD, instanceKlass::cast(this_oop->pool_holder())->class_loader()); - } - } -@@ -86,8 +87,8 @@ - // The original attempt to resolve this constant pool entry failed so find the - // original error and throw it again (JVMS 5.4.3). - if (in_error) { -- symbolOop error = SystemDictionary::find_resolution_error(this_oop, which); -- guarantee(error != (symbolOop)NULL, "tag mismatch with resolution error table"); -+ Symbol* error = SystemDictionary::find_resolution_error(this_oop, which); -+ guarantee(error != (Symbol*)NULL, "tag mismatch with resolution error table"); - ResourceMark rm; - // exception text will be the class name - const char* className = this_oop->unresolved_klass_at(which)->as_C_string(); -@@ -110,7 +111,7 @@ - // to resolve this constant pool entry fail with the same error (JVMS 5.4.3). - if (HAS_PENDING_EXCEPTION) { - ResourceMark rm; -- symbolHandle error(PENDING_EXCEPTION->klass()->klass_part()->name()); -+ Symbol* error = PENDING_EXCEPTION->klass()->klass_part()->name(); - - bool throw_orig_error = false; - { -@@ -120,7 +121,7 @@ - if (this_oop->tag_at(which).is_klass()) { - CLEAR_PENDING_EXCEPTION; - entry = this_oop->resolved_klass_at(which); -- return (klassOop)entry; -+ return (klassOop)entry.get_oop(); - } - - if (!PENDING_EXCEPTION-> -@@ -135,8 +136,8 @@ - this_oop->tag_at_put(which, JVM_CONSTANT_UnresolvedClassInError); - } else { - // some other thread has put the class in error state. -- error = symbolHandle(SystemDictionary::find_resolution_error(this_oop, which)); -- assert(!error.is_null(), "checking"); -+ error = SystemDictionary::find_resolution_error(this_oop, which); -+ assert(error != NULL, "checking"); - throw_orig_error = true; - } - } // unlocked -@@ -162,7 +163,7 @@ - vframeStream vfst(JavaThread::current()); - if (!vfst.at_end()) { - line_number = vfst.method()->line_number_from_bci(vfst.bci()); -- symbolOop s = instanceKlass::cast(vfst.method()->method_holder())->source_file_name(); -+ Symbol* s = instanceKlass::cast(vfst.method()->method_holder())->source_file_name(); - if (s != NULL) { - source_file = s->as_C_string(); - } -@@ -192,8 +193,8 @@ - } - - entry = this_oop->resolved_klass_at(which); -- assert(entry->is_klass(), "must be resolved at this point"); -- return (klassOop)entry; -+ assert(entry.is_oop() && entry.get_oop()->is_klass(), "must be resolved at this point"); -+ return (klassOop)entry.get_oop(); - } - - -@@ -202,13 +203,14 @@ - // instanceof operations. Returns NULL if the class has not been loaded or - // if the verification of constant pool failed - klassOop constantPoolOopDesc::klass_at_if_loaded(constantPoolHandle this_oop, int which) { -- oop entry = *this_oop->obj_at_addr(which); -- if (entry->is_klass()) { -- return (klassOop)entry; -+ CPSlot entry = this_oop->slot_at(which); -+ if (entry.is_oop()) { -+ assert(entry.get_oop()->is_klass(), "must be"); -+ return (klassOop)entry.get_oop(); - } else { -- assert(entry->is_symbol(), "must be either symbol or klass"); -+ assert(entry.is_metadata(), "must be either symbol or klass"); - Thread *thread = Thread::current(); -- symbolHandle name (thread, (symbolOop)entry); -+ Symbol* name = entry.get_symbol(); - oop loader = instanceKlass::cast(this_oop->pool_holder())->class_loader(); - oop protection_domain = Klass::cast(this_oop->pool_holder())->protection_domain(); - Handle h_prot (thread, protection_domain); -@@ -244,12 +246,13 @@ - // Note: We cannot update the ConstantPool from the vm_thread. - klassOop constantPoolOopDesc::klass_ref_at_if_loaded_check(constantPoolHandle this_oop, int index, TRAPS) { - int which = this_oop->klass_ref_index_at(index); -- oop entry = *this_oop->obj_at_addr(which); -- if (entry->is_klass()) { -- return (klassOop)entry; -+ CPSlot entry = this_oop->slot_at(which); -+ if (entry.is_oop()) { -+ assert(entry.get_oop()->is_klass(), "must be"); -+ return (klassOop)entry.get_oop(); - } else { -- assert(entry->is_symbol(), "must be either symbol or klass"); -- symbolHandle name (THREAD, (symbolOop)entry); -+ assert(entry.is_metadata(), "must be either symbol or klass"); -+ Symbol* name = entry.get_symbol(); - oop loader = instanceKlass::cast(this_oop->pool_holder())->class_loader(); - oop protection_domain = Klass::cast(this_oop->pool_holder())->protection_domain(); - Handle h_loader(THREAD, loader); -@@ -263,13 +266,13 @@ - } - - --symbolOop constantPoolOopDesc::impl_name_ref_at(int which, bool uncached) { -+Symbol* constantPoolOopDesc::impl_name_ref_at(int which, bool uncached) { - int name_index = name_ref_index_at(impl_name_and_type_ref_index_at(which, uncached)); - return symbol_at(name_index); - } - - --symbolOop constantPoolOopDesc::impl_signature_ref_at(int which, bool uncached) { -+Symbol* constantPoolOopDesc::impl_signature_ref_at(int which, bool uncached) { - int signature_index = signature_ref_index_at(impl_name_and_type_ref_index_at(which, uncached)); - return symbol_at(signature_index); - } -@@ -361,39 +364,40 @@ - } - - --symbolOop constantPoolOopDesc::klass_name_at(int which) { -+Symbol* constantPoolOopDesc::klass_name_at(int which) { - assert(tag_at(which).is_unresolved_klass() || tag_at(which).is_klass(), - "Corrupted constant pool"); -- // A resolved constantPool entry will contain a klassOop, otherwise a symbolOop. -+ // A resolved constantPool entry will contain a klassOop, otherwise a Symbol*. - // It is not safe to rely on the tag bit's here, since we don't have a lock, and the entry and - // tag is not updated atomicly. -- oop entry = *(obj_at_addr(which)); -- if (entry->is_klass()) { -+ CPSlot entry = slot_at(which); -+ if (entry.is_oop()) { - // Already resolved - return entry's name. -- return klassOop(entry)->klass_part()->name(); -+ assert(entry.get_oop()->is_klass(), "must be"); -+ return klassOop(entry.get_oop())->klass_part()->name(); - } else { -- assert(entry->is_symbol(), "must be either symbol or klass"); -- return (symbolOop)entry; -+ assert(entry.is_metadata(), "must be either symbol or klass"); -+ return entry.get_symbol(); - } - } - --symbolOop constantPoolOopDesc::klass_ref_at_noresolve(int which) { -+Symbol* constantPoolOopDesc::klass_ref_at_noresolve(int which) { - jint ref_index = klass_ref_index_at(which); - return klass_at_noresolve(ref_index); - } - --symbolOop constantPoolOopDesc::uncached_klass_ref_at_noresolve(int which) { -+Symbol* constantPoolOopDesc::uncached_klass_ref_at_noresolve(int which) { - jint ref_index = uncached_klass_ref_index_at(which); - return klass_at_noresolve(ref_index); - } - - char* constantPoolOopDesc::string_at_noresolve(int which) { - // Test entry type in case string is resolved while in here. -- oop entry = *(obj_at_addr(which)); -- if (entry->is_symbol()) { -- return ((symbolOop)entry)->as_C_string(); -- } else if (java_lang_String::is_instance(entry)) { -- return java_lang_String::as_utf8_string(entry); -+ CPSlot entry = slot_at(which); -+ if (entry.is_metadata()) { -+ return (entry.get_symbol())->as_C_string(); -+ } else if (java_lang_String::is_instance(entry.get_oop())) { -+ return java_lang_String::as_utf8_string(entry.get_oop()); - } else { - return (char*)"<pseudo-string>"; - } -@@ -498,8 +502,8 @@ - { - int ref_kind = this_oop->method_handle_ref_kind_at(index); - int callee_index = this_oop->method_handle_klass_index_at(index); -- symbolHandle name(THREAD, this_oop->method_handle_name_ref_at(index)); -- symbolHandle signature(THREAD, this_oop->method_handle_signature_ref_at(index)); -+ Symbol* name = this_oop->method_handle_name_ref_at(index); -+ Symbol* signature = this_oop->method_handle_signature_ref_at(index); - if (PrintMiscellaneous) - tty->print_cr("resolve JVM_CONSTANT_MethodHandle:%d [%d/%d/%d] %s.%s", - ref_kind, index, this_oop->method_handle_index_at(index), -@@ -524,7 +528,7 @@ - - case JVM_CONSTANT_MethodType: - { -- symbolHandle signature(THREAD, this_oop->method_type_signature_at(index)); -+ Symbol* signature = this_oop->method_type_signature_at(index); - if (PrintMiscellaneous) - tty->print_cr("resolve JVM_CONSTANT_MethodType [%d/%d] %s", - index, this_oop->method_type_index_at(index), -@@ -605,30 +609,33 @@ - } - - oop constantPoolOopDesc::string_at_impl(constantPoolHandle this_oop, int which, TRAPS) { -- oop entry = *(this_oop->obj_at_addr(which)); -- if (entry->is_symbol()) { -+ oop str = NULL; -+ CPSlot entry = this_oop->slot_at(which); -+ if (entry.is_metadata()) { - ObjectLocker ol(this_oop, THREAD); - if (this_oop->tag_at(which).is_unresolved_string()) { - // Intern string -- symbolOop sym = this_oop->unresolved_string_at(which); -- entry = StringTable::intern(sym, CHECK_(constantPoolOop(NULL))); -- this_oop->string_at_put(which, entry); -+ Symbol* sym = this_oop->unresolved_string_at(which); -+ str = StringTable::intern(sym, CHECK_(constantPoolOop(NULL))); -+ this_oop->string_at_put(which, str); - } else { - // Another thread beat us and interned string, read string from constant pool -- entry = this_oop->resolved_string_at(which); -+ str = this_oop->resolved_string_at(which); - } -+ } else { -+ str = entry.get_oop(); - } -- assert(java_lang_String::is_instance(entry), "must be string"); -- return entry; -+ assert(java_lang_String::is_instance(str), "must be string"); -+ return str; - } - - - bool constantPoolOopDesc::is_pseudo_string_at(int which) { -- oop entry = *(obj_at_addr(which)); -- if (entry->is_symbol()) -+ CPSlot entry = slot_at(which); -+ if (entry.is_metadata()) - // Not yet resolved, but it will resolve to a string. - return false; -- else if (java_lang_String::is_instance(entry)) -+ else if (java_lang_String::is_instance(entry.get_oop())) - return false; // actually, it might be a non-interned or non-perm string - else - // truly pseudo -@@ -638,8 +645,8 @@ - - bool constantPoolOopDesc::klass_name_at_matches(instanceKlassHandle k, - int which) { -- // Names are interned, so we can compare symbolOops directly -- symbolOop cp_name = klass_name_at(which); -+ // Names are interned, so we can compare Symbol*s directly -+ Symbol* cp_name = klass_name_at(which); - return (cp_name == k->name()); - } - -@@ -650,7 +657,7 @@ - for (int index = 1; index < tags()->length(); index++) { // Index 0 is unused - if (tag_at(index).is_unresolved_string()) { - // Intern string -- symbolOop sym = unresolved_string_at(index); -+ Symbol* sym = unresolved_string_at(index); - oop entry = StringTable::intern(sym, CHECK_(-1)); - string_at_put(index, entry); - } -@@ -658,23 +665,39 @@ - return count; - } - -+// Iterate over symbols and decrement ones which are Symbol*s. -+// This is done during GC so do not need to lock constantPool unless we -+// have per-thread safepoints. -+// Only decrement the UTF8 symbols. Unresolved classes and strings point to -+// these symbols but didn't increment the reference count. -+void constantPoolOopDesc::unreference_symbols() { -+ for (int index = 1; index < length(); index++) { // Index 0 is unused -+ constantTag tag = tag_at(index); -+ if (tag.is_symbol()) { -+ symbol_at(index)->decrement_refcount(); -+ } -+ } -+} - - // Iterate over symbols which are used as class, field, method names and - // signatures (in preparation for writing to the shared archive). - --void constantPoolOopDesc::shared_symbols_iterate(OopClosure* closure) { -+void constantPoolOopDesc::shared_symbols_iterate(SymbolClosure* closure) { - for (int index = 1; index < length(); index++) { // Index 0 is unused - switch (tag_at(index).value()) { - - case JVM_CONSTANT_UnresolvedClass: -- closure->do_oop(obj_at_addr(index)); -+ case JVM_CONSTANT_UnresolvedString: -+ case JVM_CONSTANT_Utf8: -+ assert(slot_at(index).is_metadata(), "must be symbol"); -+ closure->do_symbol(symbol_at_addr(index)); - break; - - case JVM_CONSTANT_NameAndType: - { - int i = *int_at_addr(index); -- closure->do_oop(obj_at_addr((unsigned)i >> 16)); -- closure->do_oop(obj_at_addr((unsigned)i & 0xffff)); -+ closure->do_symbol(symbol_at_addr((unsigned)i >> 16)); -+ closure->do_symbol(symbol_at_addr((unsigned)i & 0xffff)); - } - break; - -@@ -692,12 +715,6 @@ - // Do nothing! Not a symbol. - break; - -- case JVM_CONSTANT_UnresolvedString: -- case JVM_CONSTANT_Utf8: -- // These constants are symbols, but unless these symbols are -- // actually to be used for something, we don't want to mark them. -- break; -- - case JVM_CONSTANT_Long: - case JVM_CONSTANT_Double: - // Do nothing! Not an oop. (But takes two pool entries.) -@@ -744,7 +761,7 @@ - break; - - case JVM_CONSTANT_String: -- closure->do_oop(obj_at_addr(index)); -+ closure->do_oop(obj_at_addr_raw(index)); - break; - - case JVM_CONSTANT_UnresolvedString: -@@ -904,8 +921,8 @@ - - case JVM_CONSTANT_UnresolvedClass: - { -- symbolOop k1 = unresolved_klass_at(index1); -- symbolOop k2 = cp2->unresolved_klass_at(index2); -+ Symbol* k1 = unresolved_klass_at(index1); -+ Symbol* k2 = cp2->unresolved_klass_at(index2); - if (k1 == k2) { - return true; - } -@@ -960,8 +977,8 @@ - - case JVM_CONSTANT_UnresolvedString: - { -- symbolOop s1 = unresolved_string_at(index1); -- symbolOop s2 = cp2->unresolved_string_at(index2); -+ Symbol* s1 = unresolved_string_at(index1); -+ Symbol* s2 = cp2->unresolved_string_at(index2); - if (s1 == s2) { - return true; - } -@@ -969,8 +986,8 @@ - - case JVM_CONSTANT_Utf8: - { -- symbolOop s1 = symbol_at(index1); -- symbolOop s2 = cp2->symbol_at(index2); -+ Symbol* s1 = symbol_at(index1); -+ Symbol* s2 = cp2->symbol_at(index2); - if (s1 == s2) { - return true; - } -@@ -1158,13 +1175,13 @@ - - case JVM_CONSTANT_UnresolvedClass: - { -- symbolOop k = from_cp->unresolved_klass_at(from_i); -+ Symbol* k = from_cp->unresolved_klass_at(from_i); - to_cp->unresolved_klass_at_put(to_i, k); - } break; - - case JVM_CONSTANT_UnresolvedClassInError: - { -- symbolOop k = from_cp->unresolved_klass_at(from_i); -+ Symbol* k = from_cp->unresolved_klass_at(from_i); - to_cp->unresolved_klass_at_put(to_i, k); - to_cp->tag_at_put(to_i, JVM_CONSTANT_UnresolvedClassInError); - } break; -@@ -1172,14 +1189,16 @@ - - case JVM_CONSTANT_UnresolvedString: - { -- symbolOop s = from_cp->unresolved_string_at(from_i); -+ Symbol* s = from_cp->unresolved_string_at(from_i); - to_cp->unresolved_string_at_put(to_i, s); - } break; - - case JVM_CONSTANT_Utf8: - { -- symbolOop s = from_cp->symbol_at(from_i); -+ Symbol* s = from_cp->symbol_at(from_i); - to_cp->symbol_at_put(to_i, s); -+ // This constantPool has the same lifetime as the original, so don't -+ // increase reference counts for the copy. - } break; - - case JVM_CONSTANT_MethodType: -@@ -1453,7 +1472,7 @@ - - switch(tag) { - case JVM_CONSTANT_Utf8: { -- symbolOop sym = symbol_at(idx); -+ Symbol* sym = symbol_at(idx); - symmap->add_entry(sym, idx); - DBG(printf("adding symbol entry %s = %d\n", sym->as_utf8(), idx)); - break; -@@ -1461,7 +1480,7 @@ - case JVM_CONSTANT_Class: - case JVM_CONSTANT_UnresolvedClass: - case JVM_CONSTANT_UnresolvedClassInError: { -- symbolOop sym = klass_name_at(idx); -+ Symbol* sym = klass_name_at(idx); - classmap->add_entry(sym, idx); - DBG(printf("adding class entry %s = %d\n", sym->as_utf8(), idx)); - break; -@@ -1509,7 +1528,7 @@ - break; - } - case JVM_CONSTANT_Utf8: { -- symbolOop sym = symbol_at(idx); -+ Symbol* sym = symbol_at(idx); - char* str = sym->as_utf8(); - // Warning! It's crashing on x86 with len = sym->utf8_length() - int len = (int) strlen(str); -@@ -1546,7 +1565,7 @@ - case JVM_CONSTANT_UnresolvedClass: - case JVM_CONSTANT_UnresolvedClassInError: { - *bytes = JVM_CONSTANT_Class; -- symbolOop sym = klass_name_at(idx); -+ Symbol* sym = klass_name_at(idx); - idx1 = tbl->symbol_to_value(sym); - assert(idx1 != 0, "Have not found a hashtable entry"); - Bytes::put_Java_u2((address) (bytes+1), idx1); -@@ -1556,19 +1575,19 @@ - case JVM_CONSTANT_String: { - unsigned int hash; - char *str = string_at_noresolve(idx); -- symbolOop sym = SymbolTable::lookup_only(str, (int) strlen(str), hash); -+ TempNewSymbol sym = SymbolTable::lookup_only(str, (int) strlen(str), hash); - if (sym == NULL) { - // sym can be NULL if string refers to incorrectly encoded JVM_CONSTANT_Utf8 - // this can happen with JVM TI; see CR 6839599 for more details -- oop string = *(obj_at_addr(idx)); -+ oop string = *(obj_at_addr_raw(idx)); - assert(java_lang_String::is_instance(string),"Not a String"); - DBG(printf("Error #%03hd tag=%03hd\n", idx, tag)); - idx1 = 0; - for (int j = 0; j < tbl->table_size() && idx1 == 0; j++) { - for (SymbolHashMapEntry* cur = tbl->bucket(j); cur != NULL; cur = cur->next()) { - int length; -- sym = cur->symbol(); -- jchar* chars = sym->as_unicode(length); -+ Symbol* s = cur->symbol(); -+ jchar* chars = s->as_unicode(length); - if (java_lang_String::equals(string, chars, length)) { - idx1 = cur->value(); - DBG(printf("Index found: %d\n",idx1)); -@@ -1586,7 +1605,7 @@ - } - case JVM_CONSTANT_UnresolvedString: { - *bytes = JVM_CONSTANT_String; -- symbolOop sym = unresolved_string_at(idx); -+ Symbol* sym = unresolved_string_at(idx); - idx1 = tbl->symbol_to_value(sym); - assert(idx1 != 0, "Have not found a hashtable entry"); - Bytes::put_Java_u2((address) (bytes+1), idx1); -@@ -1666,7 +1685,7 @@ - } /* end copy_cpool_bytes */ - - --void SymbolHashMap::add_entry(symbolOop sym, u2 value) { -+void SymbolHashMap::add_entry(Symbol* sym, u2 value) { - char *str = sym->as_utf8(); - unsigned int hash = compute_hash(str, sym->utf8_length()); - unsigned int index = hash % table_size(); -@@ -1687,7 +1706,7 @@ - assert(entry->symbol() != NULL, "SymbolHashMapEntry symbol is NULL"); - } - --SymbolHashMapEntry* SymbolHashMap::find_entry(symbolOop sym) { -+SymbolHashMapEntry* SymbolHashMap::find_entry(Symbol* sym) { - assert(sym != NULL, "SymbolHashMap::find_entry - symbol is NULL"); - char *str = sym->as_utf8(); - int len = sym->utf8_length(); -diff --git a/src/share/vm/oops/constantPoolOop.hpp b/src/share/vm/oops/constantPoolOop.hpp ---- openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -@@ -27,6 +27,7 @@ - - #include "oops/arrayOop.hpp" - #include "oops/cpCacheOop.hpp" -+#include "oops/symbol.hpp" - #include "oops/typeArrayOop.hpp" - #include "utilities/constantTag.hpp" - #ifdef TARGET_ARCH_x86 -@@ -47,10 +48,32 @@ - // modified when the entry is resolved. If a klass or string constant pool - // entry is read without a lock, only the resolved state guarantees that - // the entry in the constant pool is a klass or String object and --// not a symbolOop. -+// not a Symbol*. - - class SymbolHashMap; - -+class CPSlot VALUE_OBJ_CLASS_SPEC { -+ intptr_t _ptr; -+ public: -+ CPSlot(intptr_t ptr): _ptr(ptr) {} -+ CPSlot(void* ptr): _ptr((intptr_t)ptr) {} -+ CPSlot(oop ptr): _ptr((intptr_t)ptr) {} -+ CPSlot(Symbol* ptr): _ptr((intptr_t)ptr | 1) {} -+ -+ intptr_t value() { return _ptr; } -+ bool is_oop() { return (_ptr & 1) == 0; } -+ bool is_metadata() { return (_ptr & 1) == 1; } -+ -+ oop get_oop() { -+ assert(is_oop(), "bad call"); -+ return oop(_ptr); -+ } -+ Symbol* get_symbol() { -+ assert(is_metadata(), "bad call"); -+ return (Symbol*)(_ptr & ~1); -+ } -+}; -+ - class constantPoolOopDesc : public oopDesc { - friend class VMStructs; - friend class BytecodeInterpreter; // Directly extracts an oop in the pool for fast instanceof/checkcast -@@ -89,11 +112,41 @@ - oop* cache_addr() { return (oop*)&_cache; } - oop* operands_addr() { return (oop*)&_operands; } - -- oop* obj_at_addr(int which) const { -+ CPSlot slot_at(int which) { -+ assert(is_within_bounds(which), "index out of bounds"); -+ // There's a transitional value of zero when converting from -+ // Symbol->0->Klass for G1 when resolving classes and strings. -+ // wait for the value to be non-zero (this is temporary) -+ volatile intptr_t adr = (intptr_t)OrderAccess::load_ptr_acquire(obj_at_addr_raw(which)); -+ if (adr == 0 && which != 0) { -+ constantTag t = tag_at(which); -+ if (t.is_unresolved_klass() || t.is_klass() || -+ t.is_unresolved_string() || t.is_string()) { -+ while ((adr = (intptr_t)OrderAccess::load_ptr_acquire(obj_at_addr_raw(which))) == 0); -+ } -+ } -+ return CPSlot(adr); -+ } -+ -+ void slot_at_put(int which, CPSlot s) const { -+ assert(is_within_bounds(which), "index out of bounds"); -+ *(intptr_t*)&base()[which] = s.value(); -+ } -+ oop* obj_at_addr_raw(int which) const { - assert(is_within_bounds(which), "index out of bounds"); - return (oop*) &base()[which]; - } - -+ void obj_at_put_without_check(int which, oop o) { -+ assert(is_within_bounds(which), "index out of bounds"); -+ oop_store_without_check((volatile oop *)obj_at_addr_raw(which), o); -+ } -+ -+ void obj_at_put(int which, oop o) const { -+ assert(is_within_bounds(which), "index out of bounds"); -+ oop_store((volatile oop*)obj_at_addr_raw(which), o); -+ } -+ - jint* int_at_addr(int which) const { - assert(is_within_bounds(which), "index out of bounds"); - return (jint*) &base()[which]; -@@ -141,15 +194,20 @@ - // Storing constants - - void klass_at_put(int which, klassOop k) { -- oop_store_without_check((volatile oop *)obj_at_addr(which), oop(k)); -+ // Overwrite the old index with a GC friendly value so -+ // that if G1 looks during the transition during oop_store it won't -+ // assert the symbol is not an oop. -+ *obj_at_addr_raw(which) = NULL; -+ assert(k != NULL, "resolved class shouldn't be null"); -+ obj_at_put_without_check(which, k); - // The interpreter assumes when the tag is stored, the klass is resolved -- // and the klassOop is a klass rather than a symbolOop, so we need -+ // and the klassOop is a klass rather than a Symbol*, so we need - // hardware store ordering here. - release_tag_at_put(which, JVM_CONSTANT_Class); - if (UseConcMarkSweepGC) { - // In case the earlier card-mark was consumed by a concurrent - // marking thread before the tag was updated, redirty the card. -- oop_store_without_check((volatile oop *)obj_at_addr(which), oop(k)); -+ obj_at_put_without_check(which, k); - } - } - -@@ -160,13 +218,9 @@ - } - - // Temporary until actual use -- void unresolved_klass_at_put(int which, symbolOop s) { -- // Overwrite the old index with a GC friendly value so -- // that if GC looks during the transition it won't try -- // to treat a small integer as oop. -- *obj_at_addr(which) = NULL; -+ void unresolved_klass_at_put(int which, Symbol* s) { - release_tag_at_put(which, JVM_CONSTANT_UnresolvedClass); -- oop_store_without_check(obj_at_addr(which), oop(s)); -+ slot_at_put(which, s); - } - - void method_handle_index_at_put(int which, int ref_kind, int ref_index) { -@@ -191,10 +245,9 @@ - } - - // Temporary until actual use -- void unresolved_string_at_put(int which, symbolOop s) { -- *obj_at_addr(which) = NULL; -+ void unresolved_string_at_put(int which, Symbol* s) { - release_tag_at_put(which, JVM_CONSTANT_UnresolvedString); -- oop_store_without_check(obj_at_addr(which), oop(s)); -+ slot_at_put(which, s); - } - - void int_at_put(int which, jint i) { -@@ -220,28 +273,39 @@ - Bytes::put_native_u8((address) double_at_addr(which), *((u8*) &d)); - } - -- void symbol_at_put(int which, symbolOop s) { -+ Symbol** symbol_at_addr(int which) const { -+ assert(is_within_bounds(which), "index out of bounds"); -+ return (Symbol**) &base()[which]; -+ } -+ -+ void symbol_at_put(int which, Symbol* s) { -+ assert(s->refcount() != 0, "should have nonzero refcount"); - tag_at_put(which, JVM_CONSTANT_Utf8); -- oop_store_without_check(obj_at_addr(which), oop(s)); -+ slot_at_put(which, s); - } - - void string_at_put(int which, oop str) { -- oop_store((volatile oop*)obj_at_addr(which), str); -+ // Overwrite the old index with a GC friendly value so -+ // that if G1 looks during the transition during oop_store it won't -+ // assert the symbol is not an oop. -+ *obj_at_addr_raw(which) = NULL; -+ assert(str != NULL, "resolved string shouldn't be null"); -+ obj_at_put(which, str); - release_tag_at_put(which, JVM_CONSTANT_String); - if (UseConcMarkSweepGC) { - // In case the earlier card-mark was consumed by a concurrent - // marking thread before the tag was updated, redirty the card. -- oop_store_without_check((volatile oop *)obj_at_addr(which), str); -+ obj_at_put_without_check(which, str); - } - } - - void object_at_put(int which, oop str) { -- oop_store((volatile oop*) obj_at_addr(which), str); -+ obj_at_put(which, str); - release_tag_at_put(which, JVM_CONSTANT_Object); - if (UseConcMarkSweepGC) { - // In case the earlier card-mark was consumed by a concurrent - // marking thread before the tag was updated, redirty the card. -- oop_store_without_check((volatile oop*) obj_at_addr(which), str); -+ obj_at_put_without_check(which, str); - } - } - -@@ -279,13 +343,19 @@ - bool is_pointer_entry(int which) { - constantTag tag = tag_at(which); - return tag.is_klass() || -- tag.is_unresolved_klass() || -- tag.is_symbol() || -- tag.is_unresolved_string() || - tag.is_string() || - tag.is_object(); - } - -+ // Whether the entry points to an object for ldc (resolved or not) -+ bool is_object_entry(int which) { -+ constantTag tag = tag_at(which); -+ return is_pointer_entry(which) || -+ tag.is_unresolved_klass() || -+ tag.is_unresolved_string() || -+ tag.is_symbol(); -+ } -+ - // Fetching constants - - klassOop klass_at(int which, TRAPS) { -@@ -293,25 +363,25 @@ - return klass_at_impl(h_this, which, CHECK_NULL); - } - -- symbolOop klass_name_at(int which); // Returns the name, w/o resolving. -+ Symbol* klass_name_at(int which); // Returns the name, w/o resolving. - - klassOop resolved_klass_at(int which) { // Used by Compiler - guarantee(tag_at(which).is_klass(), "Corrupted constant pool"); - // Must do an acquire here in case another thread resolved the klass - // behind our back, lest we later load stale values thru the oop. -- return klassOop((oop)OrderAccess::load_ptr_acquire(obj_at_addr(which))); -+ return klassOop(CPSlot(OrderAccess::load_ptr_acquire(obj_at_addr_raw(which))).get_oop()); - } - - // This method should only be used with a cpool lock or during parsing or gc -- symbolOop unresolved_klass_at(int which) { // Temporary until actual use -- symbolOop s = symbolOop((oop)OrderAccess::load_ptr_acquire(obj_at_addr(which))); -+ Symbol* unresolved_klass_at(int which) { // Temporary until actual use -+ Symbol* s = CPSlot(OrderAccess::load_ptr_acquire(obj_at_addr_raw(which))).get_symbol(); - // check that the klass is still unresolved. - assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool"); - return s; - } - - // RedefineClasses() API support: -- symbolOop klass_at_noresolve(int which) { return klass_name_at(which); } -+ Symbol* klass_at_noresolve(int which) { return klass_name_at(which); } - - jint int_at(int which) { - assert(tag_at(which).is_int(), "Corrupted constant pool"); -@@ -336,9 +406,9 @@ - return *((jdouble*)&tmp); - } - -- symbolOop symbol_at(int which) { -+ Symbol* symbol_at(int which) { - assert(tag_at(which).is_utf8(), "Corrupted constant pool"); -- return symbolOop(*obj_at_addr(which)); -+ return slot_at(which).get_symbol(); - } - - oop string_at(int which, TRAPS) { -@@ -348,7 +418,7 @@ - - oop object_at(int which) { - assert(tag_at(which).is_object(), "Corrupted constant pool"); -- return *obj_at_addr(which); -+ return slot_at(which).get_oop(); - } - - // A "pseudo-string" is an non-string oop that has found is way into -@@ -362,7 +432,7 @@ - - oop pseudo_string_at(int which) { - assert(tag_at(which).is_string(), "Corrupted constant pool"); -- return *obj_at_addr(which); -+ return slot_at(which).get_oop(); - } - - void pseudo_string_at_put(int which, oop x) { -@@ -378,12 +448,12 @@ - assert(tag_at(which).is_string(), "Corrupted constant pool"); - // Must do an acquire here in case another thread resolved the klass - // behind our back, lest we later load stale values thru the oop. -- return (oop)OrderAccess::load_ptr_acquire(obj_at_addr(which)); -+ return CPSlot(OrderAccess::load_ptr_acquire(obj_at_addr_raw(which))).get_oop(); - } - - // This method should only be used with a cpool lock or during parsing or gc -- symbolOop unresolved_string_at(int which) { // Temporary until actual use -- symbolOop s = symbolOop((oop)OrderAccess::load_ptr_acquire(obj_at_addr(which))); -+ Symbol* unresolved_string_at(int which) { // Temporary until actual use -+ Symbol* s = CPSlot(OrderAccess::load_ptr_acquire(obj_at_addr_raw(which))).get_symbol(); - // check that the string is still unresolved. - assert(tag_at(which).is_unresolved_string(), "Corrupted constant pool"); - return s; -@@ -391,7 +461,7 @@ - - // Returns an UTF8 for a CONSTANT_String entry at a given index. - // UTF8 char* representation was chosen to avoid conversion of -- // java_lang_Strings at resolved entries into symbolOops -+ // java_lang_Strings at resolved entries into Symbol*s - // or vice versa. - // Caller is responsible for checking for pseudo-strings. - char* string_at_noresolve(int which); -@@ -414,11 +484,11 @@ - return *int_at_addr(which); - } - // Derived queries: -- symbolOop method_handle_name_ref_at(int which) { -+ Symbol* method_handle_name_ref_at(int which) { - int member = method_handle_index_at(which); - return impl_name_ref_at(member, true); - } -- symbolOop method_handle_signature_ref_at(int which) { -+ Symbol* method_handle_signature_ref_at(int which) { - int member = method_handle_index_at(which); - return impl_signature_ref_at(member, true); - } -@@ -426,7 +496,7 @@ - int member = method_handle_index_at(which); - return impl_klass_ref_index_at(member, true); - } -- symbolOop method_type_signature_at(int which) { -+ Symbol* method_type_signature_at(int which) { - int sym = method_type_index_at(which); - return symbol_at(sym); - } -@@ -534,9 +604,9 @@ - - // Lookup for entries consisting of (klass_index, name_and_type index) - klassOop klass_ref_at(int which, TRAPS); -- symbolOop klass_ref_at_noresolve(int which); -- symbolOop name_ref_at(int which) { return impl_name_ref_at(which, false); } -- symbolOop signature_ref_at(int which) { return impl_signature_ref_at(which, false); } -+ Symbol* klass_ref_at_noresolve(int which); -+ Symbol* name_ref_at(int which) { return impl_name_ref_at(which, false); } -+ Symbol* signature_ref_at(int which) { return impl_signature_ref_at(which, false); } - - int klass_ref_index_at(int which) { return impl_klass_ref_index_at(which, false); } - int name_and_type_ref_index_at(int which) { return impl_name_and_type_ref_index_at(which, false); } -@@ -605,15 +675,15 @@ - // Routines currently used for annotations (only called by jvm.cpp) but which might be used in the - // future by other Java code. These take constant pool indices rather than - // constant pool cache indices as do the peer methods above. -- symbolOop uncached_klass_ref_at_noresolve(int which); -- symbolOop uncached_name_ref_at(int which) { return impl_name_ref_at(which, true); } -- symbolOop uncached_signature_ref_at(int which) { return impl_signature_ref_at(which, true); } -+ Symbol* uncached_klass_ref_at_noresolve(int which); -+ Symbol* uncached_name_ref_at(int which) { return impl_name_ref_at(which, true); } -+ Symbol* uncached_signature_ref_at(int which) { return impl_signature_ref_at(which, true); } - int uncached_klass_ref_index_at(int which) { return impl_klass_ref_index_at(which, true); } - int uncached_name_and_type_ref_index_at(int which) { return impl_name_and_type_ref_index_at(which, true); } - - // Sharing - int pre_resolve_shared_klasses(TRAPS); -- void shared_symbols_iterate(OopClosure* closure0); -+ void shared_symbols_iterate(SymbolClosure* closure0); - void shared_tags_iterate(OopClosure* closure0); - void shared_strings_iterate(OopClosure* closure0); - -@@ -628,8 +698,8 @@ - - private: - -- symbolOop impl_name_ref_at(int which, bool uncached); -- symbolOop impl_signature_ref_at(int which, bool uncached); -+ Symbol* impl_name_ref_at(int which, bool uncached); -+ Symbol* impl_signature_ref_at(int which, bool uncached); - int impl_klass_ref_index_at(int which, bool uncached); - int impl_name_and_type_ref_index_at(int which, bool uncached); - -@@ -672,6 +742,9 @@ - int orig_length() const { return _orig_length; } - void set_orig_length(int orig_length) { _orig_length = orig_length; } - -+ // Decrease ref counts of symbols that are in the constant pool -+ // when the holder class is unloaded -+ void unreference_symbols(); - - // JVMTI accesss - GetConstantPool, RetransformClasses, ... - friend class JvmtiConstantPoolReconstituter; -@@ -694,7 +767,7 @@ - private: - unsigned int _hash; // 32-bit hash for item - SymbolHashMapEntry* _next; // Next element in the linked list for this bucket -- symbolOop _symbol; // 1-st part of the mapping: symbol => value -+ Symbol* _symbol; // 1-st part of the mapping: symbol => value - u2 _value; // 2-nd part of the mapping: symbol => value - - public: -@@ -704,13 +777,13 @@ - SymbolHashMapEntry* next() const { return _next; } - void set_next(SymbolHashMapEntry* next) { _next = next; } - -- symbolOop symbol() const { return _symbol; } -- void set_symbol(symbolOop sym) { _symbol = sym; } -+ Symbol* symbol() const { return _symbol; } -+ void set_symbol(Symbol* sym) { _symbol = sym; } - - u2 value() const { return _value; } - void set_value(u2 value) { _value = value; } - -- SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value) -+ SymbolHashMapEntry(unsigned int hash, Symbol* symbol, u2 value) - : _hash(hash), _symbol(symbol), _value(value), _next(NULL) {} - - }; // End SymbolHashMapEntry class -@@ -769,10 +842,10 @@ - return _buckets[i].entry(); - } - -- void add_entry(symbolOop sym, u2 value); -- SymbolHashMapEntry* find_entry(symbolOop sym); -+ void add_entry(Symbol* sym, u2 value); -+ SymbolHashMapEntry* find_entry(Symbol* sym); - -- u2 symbol_to_value(symbolOop sym) { -+ u2 symbol_to_value(Symbol* sym) { - SymbolHashMapEntry *entry = find_entry(sym); - return (entry == NULL) ? 0 : entry->value(); - } -diff --git a/src/share/vm/oops/generateOopMap.cpp b/src/share/vm/oops/generateOopMap.cpp ---- openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp -+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp -@@ -26,7 +26,7 @@ - #include "interpreter/bytecodeStream.hpp" - #include "oops/generateOopMap.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.inline.hpp" - #include "runtime/java.hpp" - #include "runtime/relocator.hpp" -@@ -123,7 +123,7 @@ - set(CellTypeState::value); } - - public: -- ComputeCallStack(symbolOop signature) : SignatureIterator(signature) {}; -+ ComputeCallStack(Symbol* signature) : SignatureIterator(signature) {}; - - // Compute methods - int compute_for_parameters(bool is_static, CellTypeState *effect) { -@@ -177,7 +177,7 @@ - set(CellTypeState::value); } - - public: -- ComputeEntryStack(symbolOop signature) : SignatureIterator(signature) {}; -+ ComputeEntryStack(Symbol* signature) : SignatureIterator(signature) {}; - - // Compute methods - int compute_for_parameters(bool is_static, CellTypeState *effect) { -@@ -669,7 +669,7 @@ - _monitor_top = 0; - } - --int GenerateOopMap::methodsig_to_effect(symbolOop signature, bool is_static, CellTypeState* effect) { -+int GenerateOopMap::methodsig_to_effect(Symbol* signature, bool is_static, CellTypeState* effect) { - ComputeEntryStack ces(signature); - return ces.compute_for_parameters(is_static, effect); - } -@@ -1285,7 +1285,7 @@ - constantPoolOop cp = method()->constants(); - int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx); - int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx); -- symbolOop signature = cp->symbol_at(signatureIdx); -+ Symbol* signature = cp->symbol_at(signatureIdx); - os->print("%s", signature->as_C_string()); - } - os->cr(); -@@ -1317,7 +1317,7 @@ - constantPoolOop cp = method()->constants(); - int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx); - int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx); -- symbolOop signature = cp->symbol_at(signatureIdx); -+ Symbol* signature = cp->symbol_at(signatureIdx); - os->print("%s", signature->as_C_string()); - } - os->cr(); -@@ -1864,7 +1864,7 @@ - // Make sure bt==T_OBJECT is the same as old code (is_pointer_entry). - // Note that CONSTANT_MethodHandle entries are u2 index pairs, not pointer-entries, - // and they are processed by _fast_aldc and the CP cache. -- assert((ldc.has_cache_index() || cp->is_pointer_entry(ldc.pool_index())) -+ assert((ldc.has_cache_index() || cp->is_object_entry(ldc.pool_index())) - ? (bt == T_OBJECT) : true, "expected object type"); - ppush1(cts); - } -@@ -1904,7 +1904,7 @@ - constantPoolOop cp = method()->constants(); - int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx); - int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx); -- symbolOop signature = cp->symbol_at(signatureIdx); -+ Symbol* signature = cp->symbol_at(signatureIdx); - - // Parse signature (espcially simple for fields) - assert(signature->utf8_length() > 0, "field signatures cannot have zero length"); -@@ -1932,7 +1932,7 @@ - void GenerateOopMap::do_method(int is_static, int is_interface, int idx, int bci) { - // Dig up signature for field in constant pool - constantPoolOop cp = _method->constants(); -- symbolOop signature = cp->signature_ref_at(idx); -+ Symbol* signature = cp->signature_ref_at(idx); - - // Parse method signature - CellTypeState out[4]; -diff --git a/src/share/vm/oops/generateOopMap.hpp b/src/share/vm/oops/generateOopMap.hpp ---- openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp -+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp -@@ -323,7 +323,7 @@ - // Cell type methods - void init_state(); - void make_context_uninitialized (); -- int methodsig_to_effect (symbolOop signature, bool isStatic, CellTypeState* effect); -+ int methodsig_to_effect (Symbol* signature, bool isStatic, CellTypeState* effect); - bool merge_local_state_vectors (CellTypeState* cts, CellTypeState* bbts); - bool merge_monitor_state_vectors(CellTypeState* cts, CellTypeState* bbts); - void copy_state (CellTypeState *dst, CellTypeState *src); -diff --git a/src/share/vm/oops/instanceKlass.cpp b/src/share/vm/oops/instanceKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -@@ -42,7 +42,7 @@ - #include "oops/methodOop.hpp" - #include "oops/objArrayKlassKlass.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvmtiExport.hpp" - #include "prims/jvmtiRedefineClassesTrace.hpp" - #include "runtime/fieldDescriptor.hpp" -@@ -97,7 +97,7 @@ - { \ - char* data = NULL; \ - int len = 0; \ -- symbolOop name = (clss)->name(); \ -+ Symbol* name = (clss)->name(); \ - if (name != NULL) { \ - data = (char*)name->bytes(); \ - len = name->utf8_length(); \ -@@ -110,7 +110,7 @@ - { \ - char* data = NULL; \ - int len = 0; \ -- symbolOop name = (clss)->name(); \ -+ Symbol* name = (clss)->name(); \ - if (name != NULL) { \ - data = (char*)name->bytes(); \ - len = name->utf8_length(); \ -@@ -267,7 +267,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IncompatibleClassChangeError(), -+ vmSymbols::java_lang_IncompatibleClassChangeError(), - "class %s has interface %s as super class", - this_oop->external_name(), - super->external_name() -@@ -501,8 +501,8 @@ - THROW_OOP(e()); - } else { - JavaCallArguments args(e); -- THROW_ARG(vmSymbolHandles::java_lang_ExceptionInInitializerError(), -- vmSymbolHandles::throwable_void_signature(), -+ THROW_ARG(vmSymbols::java_lang_ExceptionInInitializerError(), -+ vmSymbols::throwable_void_signature(), - &args); - } - } -@@ -773,13 +773,13 @@ - } - - --bool instanceKlass::find_local_field(symbolOop name, symbolOop sig, fieldDescriptor* fd) const { -+bool instanceKlass::find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { - const int n = fields()->length(); - for (int i = 0; i < n; i += next_offset ) { - int name_index = fields()->ushort_at(i + name_index_offset); - int sig_index = fields()->ushort_at(i + signature_index_offset); -- symbolOop f_name = constants()->symbol_at(name_index); -- symbolOop f_sig = constants()->symbol_at(sig_index); -+ Symbol* f_name = constants()->symbol_at(name_index); -+ Symbol* f_sig = constants()->symbol_at(sig_index); - if (f_name == name && f_sig == sig) { - fd->initialize(as_klassOop(), i); - return true; -@@ -789,21 +789,23 @@ - } - - --void instanceKlass::field_names_and_sigs_iterate(OopClosure* closure) { -+void instanceKlass::shared_symbols_iterate(SymbolClosure* closure) { -+ Klass::shared_symbols_iterate(closure); -+ closure->do_symbol(&_generic_signature); -+ closure->do_symbol(&_source_file_name); -+ closure->do_symbol(&_source_debug_extension); -+ - const int n = fields()->length(); - for (int i = 0; i < n; i += next_offset ) { - int name_index = fields()->ushort_at(i + name_index_offset); -- symbolOop name = constants()->symbol_at(name_index); -- closure->do_oop((oop*)&name); -- -+ closure->do_symbol(constants()->symbol_at_addr(name_index)); - int sig_index = fields()->ushort_at(i + signature_index_offset); -- symbolOop sig = constants()->symbol_at(sig_index); -- closure->do_oop((oop*)&sig); -+ closure->do_symbol(constants()->symbol_at_addr(sig_index)); - } - } - - --klassOop instanceKlass::find_interface_field(symbolOop name, symbolOop sig, fieldDescriptor* fd) const { -+klassOop instanceKlass::find_interface_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { - const int n = local_interfaces()->length(); - for (int i = 0; i < n; i++) { - klassOop intf1 = klassOop(local_interfaces()->obj_at(i)); -@@ -822,7 +824,7 @@ - } - - --klassOop instanceKlass::find_field(symbolOop name, symbolOop sig, fieldDescriptor* fd) const { -+klassOop instanceKlass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { - // search order according to newest JVM spec (5.4.3.2, p.167). - // 1) search for field in current klass - if (find_local_field(name, sig, fd)) { -@@ -841,7 +843,7 @@ - } - - --klassOop instanceKlass::find_field(symbolOop name, symbolOop sig, bool is_static, fieldDescriptor* fd) const { -+klassOop instanceKlass::find_field(Symbol* name, Symbol* sig, bool is_static, fieldDescriptor* fd) const { - // search order according to newest JVM spec (5.4.3.2, p.167). - // 1) search for field in current klass - if (find_local_field(name, sig, fd)) { -@@ -969,7 +971,7 @@ - } - - #ifdef ASSERT --static int linear_search(objArrayOop methods, symbolOop name, symbolOop signature) { -+static int linear_search(objArrayOop methods, Symbol* name, Symbol* signature) { - int len = methods->length(); - for (int index = 0; index < len; index++) { - methodOop m = (methodOop)(methods->obj_at(index)); -@@ -982,11 +984,11 @@ - } - #endif - --methodOop instanceKlass::find_method(symbolOop name, symbolOop signature) const { -+methodOop instanceKlass::find_method(Symbol* name, Symbol* signature) const { - return instanceKlass::find_method(methods(), name, signature); - } - --methodOop instanceKlass::find_method(objArrayOop methods, symbolOop name, symbolOop signature) { -+methodOop instanceKlass::find_method(objArrayOop methods, Symbol* name, Symbol* signature) { - int len = methods->length(); - // methods are sorted, so do binary search - int l = 0; -@@ -1034,7 +1036,7 @@ - return NULL; - } - --methodOop instanceKlass::uncached_lookup_method(symbolOop name, symbolOop signature) const { -+methodOop instanceKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const { - klassOop klass = as_klassOop(); - while (klass != NULL) { - methodOop method = instanceKlass::cast(klass)->find_method(name, signature); -@@ -1045,8 +1047,8 @@ - } - - // lookup a method in all the interfaces that this class implements --methodOop instanceKlass::lookup_method_in_all_interfaces(symbolOop name, -- symbolOop signature) const { -+methodOop instanceKlass::lookup_method_in_all_interfaces(Symbol* name, -+ Symbol* signature) const { - objArrayOop all_ifs = instanceKlass::cast(as_klassOop())->transitive_interfaces(); - int num_ifs = all_ifs->length(); - instanceKlass *ik = NULL; -@@ -1893,6 +1895,26 @@ - _cached_class_file_bytes = NULL; - _cached_class_file_len = 0; - } -+ -+ // Decrement symbol reference counts associated with the unloaded class. -+ if (_name != NULL) _name->decrement_refcount(); -+ // unreference array name derived from this class name (arrays of an unloaded -+ // class can't be referenced anymore). -+ if (_array_name != NULL) _array_name->decrement_refcount(); -+ if (_source_file_name != NULL) _source_file_name->decrement_refcount(); -+ if (_source_debug_extension != NULL) _source_debug_extension->decrement_refcount(); -+ // walk constant pool and decrement symbol reference counts -+ _constants->unreference_symbols(); -+} -+ -+void instanceKlass::set_source_file_name(Symbol* n) { -+ _source_file_name = n; -+ if (_source_file_name != NULL) _source_file_name->increment_refcount(); -+} -+ -+void instanceKlass::set_source_debug_extension(Symbol* n) { -+ _source_debug_extension = n; -+ if (_source_debug_extension != NULL) _source_debug_extension->increment_refcount(); - } - - address instanceKlass::static_field_addr(int offset) { -@@ -1919,7 +1941,7 @@ - bool instanceKlass::is_same_class_package(klassOop class2) { - klassOop class1 = as_klassOop(); - oop classloader1 = instanceKlass::cast(class1)->class_loader(); -- symbolOop classname1 = Klass::cast(class1)->name(); -+ Symbol* classname1 = Klass::cast(class1)->name(); - - if (Klass::cast(class2)->oop_is_objArray()) { - class2 = objArrayKlass::cast(class2)->bottom_klass(); -@@ -1931,16 +1953,16 @@ - assert(Klass::cast(class2)->oop_is_typeArray(), "should be type array"); - classloader2 = NULL; - } -- symbolOop classname2 = Klass::cast(class2)->name(); -+ Symbol* classname2 = Klass::cast(class2)->name(); - - return instanceKlass::is_same_class_package(classloader1, classname1, - classloader2, classname2); - } - --bool instanceKlass::is_same_class_package(oop classloader2, symbolOop classname2) { -+bool instanceKlass::is_same_class_package(oop classloader2, Symbol* classname2) { - klassOop class1 = as_klassOop(); - oop classloader1 = instanceKlass::cast(class1)->class_loader(); -- symbolOop classname1 = Klass::cast(class1)->name(); -+ Symbol* classname1 = Klass::cast(class1)->name(); - - return instanceKlass::is_same_class_package(classloader1, classname1, - classloader2, classname2); -@@ -1948,8 +1970,8 @@ - - // return true if two classes are in the same package, classloader - // and classname information is enough to determine a class's package --bool instanceKlass::is_same_class_package(oop class_loader1, symbolOop class_name1, -- oop class_loader2, symbolOop class_name2) { -+bool instanceKlass::is_same_class_package(oop class_loader1, Symbol* class_name1, -+ oop class_loader2, Symbol* class_name2) { - if (class_loader1 != class_loader2) { - return false; - } else if (class_name1 == class_name2) { -@@ -1957,14 +1979,14 @@ - } else { - ResourceMark rm; - -- // The symbolOop's are in UTF8 encoding. Since we only need to check explicitly -+ // The Symbol*'s are in UTF8 encoding. Since we only need to check explicitly - // for ASCII characters ('/', 'L', '['), we can keep them in UTF8 encoding. - // Otherwise, we just compare jbyte values between the strings. -- jbyte *name1 = class_name1->base(); -- jbyte *name2 = class_name2->base(); -- -- jbyte *last_slash1 = UTF8::strrchr(name1, class_name1->utf8_length(), '/'); -- jbyte *last_slash2 = UTF8::strrchr(name2, class_name2->utf8_length(), '/'); -+ const jbyte *name1 = class_name1->base(); -+ const jbyte *name2 = class_name2->base(); -+ -+ const jbyte *last_slash1 = UTF8::strrchr(name1, class_name1->utf8_length(), '/'); -+ const jbyte *last_slash2 = UTF8::strrchr(name2, class_name2->utf8_length(), '/'); - - if ((last_slash1 == NULL) || (last_slash2 == NULL)) { - // One of the two doesn't have a package. Only return true -@@ -2005,7 +2027,7 @@ - // Assumes name-signature match - // "this" is instanceKlass of super_method which must exist - // note that the instanceKlass of the method in the targetclassname has not always been created yet --bool instanceKlass::is_override(methodHandle super_method, Handle targetclassloader, symbolHandle targetclassname, TRAPS) { -+bool instanceKlass::is_override(methodHandle super_method, Handle targetclassloader, Symbol* targetclassname, TRAPS) { - // Private methods can not be overridden - if (super_method->is_private()) { - return false; -@@ -2017,12 +2039,12 @@ - } - // Package-private methods are not inherited outside of package - assert(super_method->is_package_private(), "must be package private"); -- return(is_same_class_package(targetclassloader(), targetclassname())); -+ return(is_same_class_package(targetclassloader(), targetclassname)); - } - - /* defined for now in jvm.cpp, for historical reasons *-- - klassOop instanceKlass::compute_enclosing_class_impl(instanceKlassHandle self, -- symbolOop& simple_name_result, TRAPS) { -+ Symbol*& simple_name_result, TRAPS) { - ... - } - */ -@@ -2093,7 +2115,7 @@ - - // only look at classes that are already loaded - // since we are looking for the flags for our self. -- symbolOop inner_name = ik->constants()->klass_name_at(ioff); -+ Symbol* inner_name = ik->constants()->klass_name_at(ioff); - if ((ik->name() == inner_name)) { - // This is really a member class. - access = inner_class_list_h->ushort_at(i + instanceKlass::inner_class_access_flags_offset); -@@ -2132,7 +2154,7 @@ - // If the interface isn't implemented by the receiver class, - // the VM should throw IncompatibleClassChangeError. - if (cnt >= nof_interfaces) { -- THROW_OOP_0(vmSymbols::java_lang_IncompatibleClassChangeError()); -+ THROW_0(vmSymbols::java_lang_IncompatibleClassChangeError()); - } - - klassOop ik = ioe->interface_klass(); -@@ -2142,7 +2164,7 @@ - itableMethodEntry* ime = ioe->first_method_entry(as_klassOop()); - methodOop m = ime[index].method(); - if (m == NULL) { -- THROW_OOP_0(vmSymbols::java_lang_AbstractMethodError()); -+ THROW_0(vmSymbols::java_lang_AbstractMethodError()); - } - return m; - } -@@ -2635,8 +2657,8 @@ - if (!emcp_methods->at(i)) { - // only obsolete methods are interesting - methodOop old_method = (methodOop) old_methods->obj_at(i); -- symbolOop m_name = old_method->name(); -- symbolOop m_signature = old_method->signature(); -+ Symbol* m_name = old_method->name(); -+ Symbol* m_signature = old_method->signature(); - - // skip the last entry since we just added it - for (int j = _previous_versions->length() - 2; j >= 0; j--) { -diff --git a/src/share/vm/oops/instanceKlass.hpp b/src/share/vm/oops/instanceKlass.hpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -@@ -187,16 +187,10 @@ - klassOop _host_klass; - // Class signers. - objArrayOop _signers; -- // Name of source file containing this klass, NULL if not specified. -- symbolOop _source_file_name; -- // the source debug extension for this klass, NULL if not specified. -- symbolOop _source_debug_extension; - // inner_classes attribute. - typeArrayOop _inner_classes; - // Implementors of this interface (not valid if it overflows) - klassOop _implementors[implementors_limit]; -- // Generic signature, or null if none. -- symbolOop _generic_signature; - // invokedynamic bootstrap method (a java.dyn.MethodHandle) - oop _bootstrap_method; - // Annotations for this class, or null if none. -@@ -220,6 +214,16 @@ - // End of the oop block. - // - -+ // Name of source file containing this klass, NULL if not specified. -+ Symbol* _source_file_name; -+ // the source debug extension for this klass, NULL if not specified. -+ Symbol* _source_debug_extension; -+ // Generic signature, or null if none. -+ Symbol* _generic_signature; -+ // Array name derived from this class which needs unreferencing -+ // if this class is unloaded. -+ Symbol* _array_name; -+ - // Number of heapOopSize words used by non-static fields in this klass - // (including inherited fields but after header_size()). - int _nonstatic_field_size; -@@ -341,12 +345,12 @@ - }; - - // method override check -- bool is_override(methodHandle super_method, Handle targetclassloader, symbolHandle targetclassname, TRAPS); -+ bool is_override(methodHandle super_method, Handle targetclassloader, Symbol* targetclassname, TRAPS); - - // package - bool is_same_class_package(klassOop class2); -- bool is_same_class_package(oop classloader2, symbolOop classname2); -- static bool is_same_class_package(oop class_loader1, symbolOop class_name1, oop class_loader2, symbolOop class_name2); -+ bool is_same_class_package(oop classloader2, Symbol* classname2); -+ static bool is_same_class_package(oop class_loader1, Symbol* class_name1, oop class_loader2, Symbol* class_name2); - - // find an enclosing class (defined where original code was, in jvm.cpp!) - klassOop compute_enclosing_class(bool* inner_is_member, TRAPS) { -@@ -400,13 +404,13 @@ - void set_reference_type(ReferenceType t) { _reference_type = t; } - - // find local field, returns true if found -- bool find_local_field(symbolOop name, symbolOop sig, fieldDescriptor* fd) const; -+ bool find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const; - // find field in direct superinterfaces, returns the interface in which the field is defined -- klassOop find_interface_field(symbolOop name, symbolOop sig, fieldDescriptor* fd) const; -+ klassOop find_interface_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const; - // find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined -- klassOop find_field(symbolOop name, symbolOop sig, fieldDescriptor* fd) const; -+ klassOop find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const; - // find instance or static fields according to JVM spec 5.4.3.2, returns the klass in which the field is defined -- klassOop find_field(symbolOop name, symbolOop sig, bool is_static, fieldDescriptor* fd) const; -+ klassOop find_field(Symbol* name, Symbol* sig, bool is_static, fieldDescriptor* fd) const; - - // find a non-static or static field given its offset within the class. - bool contains_field_offset(int offset) { -@@ -417,15 +421,15 @@ - bool find_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const; - - // find a local method (returns NULL if not found) -- methodOop find_method(symbolOop name, symbolOop signature) const; -- static methodOop find_method(objArrayOop methods, symbolOop name, symbolOop signature); -+ methodOop find_method(Symbol* name, Symbol* signature) const; -+ static methodOop find_method(objArrayOop methods, Symbol* name, Symbol* signature); - - // lookup operation (returns NULL if not found) -- methodOop uncached_lookup_method(symbolOop name, symbolOop signature) const; -+ methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const; - - // lookup a method in all the interfaces that this class implements - // (returns NULL if not found) -- methodOop lookup_method_in_all_interfaces(symbolOop name, symbolOop signature) const; -+ methodOop lookup_method_in_all_interfaces(Symbol* name, Symbol* signature) const; - - // constant pool - constantPoolOop constants() const { return _constants; } -@@ -449,8 +453,8 @@ - void set_signers(objArrayOop s) { oop_store((oop*) &_signers, oop(s)); } - - // source file name -- symbolOop source_file_name() const { return _source_file_name; } -- void set_source_file_name(symbolOop n) { oop_store_without_check((oop*) &_source_file_name, (oop) n); } -+ Symbol* source_file_name() const { return _source_file_name; } -+ void set_source_file_name(Symbol* n); - - // minor and major version numbers of class file - u2 minor_version() const { return _minor_version; } -@@ -459,8 +463,12 @@ - void set_major_version(u2 major_version) { _major_version = major_version; } - - // source debug extension -- symbolOop source_debug_extension() const { return _source_debug_extension; } -- void set_source_debug_extension(symbolOop n){ oop_store_without_check((oop*) &_source_debug_extension, (oop) n); } -+ Symbol* source_debug_extension() const { return _source_debug_extension; } -+ void set_source_debug_extension(Symbol* n); -+ -+ // symbol unloading support (refcount already added) -+ Symbol* array_name() { return _array_name; } -+ void set_array_name(Symbol* name) { assert(_array_name == NULL, "name already created"); _array_name = name; } - - // nonstatic oop-map blocks - static int nonstatic_oop_map_size(unsigned int oop_map_count) { -@@ -509,8 +517,9 @@ - void set_initial_method_idnum(u2 value) { _idnum_allocated_count = value; } - - // generics support -- symbolOop generic_signature() const { return _generic_signature; } -- void set_generic_signature(symbolOop sig) { oop_store_without_check((oop*)&_generic_signature, (oop)sig); } -+ Symbol* generic_signature() const { return _generic_signature; } -+ void set_generic_signature(Symbol* sig) { _generic_signature = sig; } -+ - u2 enclosing_method_class_index() const { return _enclosing_method_class_index; } - u2 enclosing_method_method_index() const { return _enclosing_method_method_index; } - void set_enclosing_method_indices(u2 class_index, -@@ -782,11 +791,8 @@ - oop* adr_protection_domain() const { return (oop*)&this->_protection_domain;} - oop* adr_host_klass() const { return (oop*)&this->_host_klass;} - oop* adr_signers() const { return (oop*)&this->_signers;} -- oop* adr_source_file_name() const { return (oop*)&this->_source_file_name;} -- oop* adr_source_debug_extension() const { return (oop*)&this->_source_debug_extension;} - oop* adr_inner_classes() const { return (oop*)&this->_inner_classes;} - oop* adr_implementors() const { return (oop*)&this->_implementors[0];} -- oop* adr_generic_signature() const { return (oop*)&this->_generic_signature;} - oop* adr_bootstrap_method() const { return (oop*)&this->_bootstrap_method;} - oop* adr_methods_jmethod_ids() const { return (oop*)&this->_methods_jmethod_ids;} - oop* adr_methods_cached_itable_indices() const { return (oop*)&this->_methods_cached_itable_indices;} -@@ -818,7 +824,7 @@ - public: - // sharing support - virtual void remove_unshareable_info(); -- void field_names_and_sigs_iterate(OopClosure* closure); -+ virtual void shared_symbols_iterate(SymbolClosure* closure); - - // jvm support - jint compute_modifier_flags(TRAPS) const; -diff --git a/src/share/vm/oops/instanceKlassKlass.cpp b/src/share/vm/oops/instanceKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -@@ -38,7 +38,7 @@ - #include "oops/objArrayOop.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "oops/typeArrayOop.hpp" - #include "prims/jvmtiExport.hpp" - #include "runtime/fieldDescriptor.hpp" -@@ -101,13 +101,10 @@ - MarkSweep::mark_and_push(ik->adr_fields()); - MarkSweep::mark_and_push(ik->adr_constants()); - MarkSweep::mark_and_push(ik->adr_class_loader()); -- MarkSweep::mark_and_push(ik->adr_source_file_name()); -- MarkSweep::mark_and_push(ik->adr_source_debug_extension()); - MarkSweep::mark_and_push(ik->adr_inner_classes()); - MarkSweep::mark_and_push(ik->adr_protection_domain()); - MarkSweep::mark_and_push(ik->adr_host_klass()); - MarkSweep::mark_and_push(ik->adr_signers()); -- MarkSweep::mark_and_push(ik->adr_generic_signature()); - MarkSweep::mark_and_push(ik->adr_bootstrap_method()); - MarkSweep::mark_and_push(ik->adr_class_annotations()); - MarkSweep::mark_and_push(ik->adr_fields_annotations()); -@@ -141,13 +138,10 @@ - PSParallelCompact::mark_and_push(cm, ik->adr_fields()); - PSParallelCompact::mark_and_push(cm, ik->adr_constants()); - PSParallelCompact::mark_and_push(cm, ik->adr_class_loader()); -- PSParallelCompact::mark_and_push(cm, ik->adr_source_file_name()); -- PSParallelCompact::mark_and_push(cm, ik->adr_source_debug_extension()); - PSParallelCompact::mark_and_push(cm, ik->adr_inner_classes()); - PSParallelCompact::mark_and_push(cm, ik->adr_protection_domain()); - PSParallelCompact::mark_and_push(cm, ik->adr_host_klass()); - PSParallelCompact::mark_and_push(cm, ik->adr_signers()); -- PSParallelCompact::mark_and_push(cm, ik->adr_generic_signature()); - PSParallelCompact::mark_and_push(cm, ik->adr_bootstrap_method()); - PSParallelCompact::mark_and_push(cm, ik->adr_class_annotations()); - PSParallelCompact::mark_and_push(cm, ik->adr_fields_annotations()); -@@ -187,13 +181,10 @@ - blk->do_oop(ik->adr_protection_domain()); - blk->do_oop(ik->adr_host_klass()); - blk->do_oop(ik->adr_signers()); -- blk->do_oop(ik->adr_source_file_name()); -- blk->do_oop(ik->adr_source_debug_extension()); - blk->do_oop(ik->adr_inner_classes()); - for (int i = 0; i < instanceKlass::implementors_limit; i++) { - blk->do_oop(&ik->adr_implementors()[i]); - } -- blk->do_oop(ik->adr_generic_signature()); - blk->do_oop(ik->adr_bootstrap_method()); - blk->do_oop(ik->adr_class_annotations()); - blk->do_oop(ik->adr_fields_annotations()); -@@ -242,18 +233,12 @@ - if (mr.contains(adr)) blk->do_oop(adr); - adr = ik->adr_signers(); - if (mr.contains(adr)) blk->do_oop(adr); -- adr = ik->adr_source_file_name(); -- if (mr.contains(adr)) blk->do_oop(adr); -- adr = ik->adr_source_debug_extension(); -- if (mr.contains(adr)) blk->do_oop(adr); - adr = ik->adr_inner_classes(); - if (mr.contains(adr)) blk->do_oop(adr); - adr = ik->adr_implementors(); - for (int i = 0; i < instanceKlass::implementors_limit; i++) { - if (mr.contains(&adr[i])) blk->do_oop(&adr[i]); - } -- adr = ik->adr_generic_signature(); -- if (mr.contains(adr)) blk->do_oop(adr); - adr = ik->adr_bootstrap_method(); - if (mr.contains(adr)) blk->do_oop(adr); - adr = ik->adr_class_annotations(); -@@ -292,13 +277,10 @@ - MarkSweep::adjust_pointer(ik->adr_protection_domain()); - MarkSweep::adjust_pointer(ik->adr_host_klass()); - MarkSweep::adjust_pointer(ik->adr_signers()); -- MarkSweep::adjust_pointer(ik->adr_source_file_name()); -- MarkSweep::adjust_pointer(ik->adr_source_debug_extension()); - MarkSweep::adjust_pointer(ik->adr_inner_classes()); - for (int i = 0; i < instanceKlass::implementors_limit; i++) { - MarkSweep::adjust_pointer(&ik->adr_implementors()[i]); - } -- MarkSweep::adjust_pointer(ik->adr_generic_signature()); - MarkSweep::adjust_pointer(ik->adr_bootstrap_method()); - MarkSweep::adjust_pointer(ik->adr_class_annotations()); - MarkSweep::adjust_pointer(ik->adr_fields_annotations()); -@@ -452,6 +434,8 @@ - ik->set_signers(NULL); - ik->set_source_file_name(NULL); - ik->set_source_debug_extension(NULL); -+ ik->set_source_debug_extension(NULL); -+ ik->set_array_name(NULL); - ik->set_inner_classes(NULL); - ik->set_static_oop_field_count(0); - ik->set_nonstatic_field_size(0); -@@ -657,7 +641,7 @@ - #endif - // Verify that klass is present in SystemDictionary - if (ik->is_loaded() && !ik->is_anonymous()) { -- symbolHandle h_name (thread, ik->name()); -+ Symbol* h_name = ik->name(); - Handle h_loader (thread, ik->class_loader()); - Handle h_obj(thread, obj); - SystemDictionary::verify_obj_klass_present(h_obj, h_name, h_loader); -@@ -782,14 +766,6 @@ - guarantee(ik->constants()->is_constantPool(), "should be constant pool"); - guarantee(ik->inner_classes()->is_perm(), "should be in permspace"); - guarantee(ik->inner_classes()->is_typeArray(), "should be type array"); -- if (ik->source_file_name() != NULL) { -- guarantee(ik->source_file_name()->is_perm(), "should be in permspace"); -- guarantee(ik->source_file_name()->is_symbol(), "should be symbol"); -- } -- if (ik->source_debug_extension() != NULL) { -- guarantee(ik->source_debug_extension()->is_perm(), "should be in permspace"); -- guarantee(ik->source_debug_extension()->is_symbol(), "should be symbol"); -- } - if (ik->protection_domain() != NULL) { - guarantee(ik->protection_domain()->is_oop(), "should be oop"); - } -@@ -799,10 +775,6 @@ - if (ik->signers() != NULL) { - guarantee(ik->signers()->is_objArray(), "should be obj array"); - } -- if (ik->generic_signature() != NULL) { -- guarantee(ik->generic_signature()->is_perm(), "should be in permspace"); -- guarantee(ik->generic_signature()->is_symbol(), "should be symbol"); -- } - if (ik->class_annotations() != NULL) { - guarantee(ik->class_annotations()->is_typeArray(), "should be type array"); - } -diff --git a/src/share/vm/oops/klass.cpp b/src/share/vm/oops/klass.cpp ---- openjdk/hotspot/src/share/vm/oops/klass.cpp -+++ openjdk/hotspot/src/share/vm/oops/klass.cpp -@@ -35,6 +35,10 @@ - #include "oops/oop.inline2.hpp" - #include "runtime/atomic.hpp" - -+void Klass::set_name(Symbol* n) { -+ _name = n; -+ if (_name != NULL) _name->increment_refcount(); -+} - - bool Klass::is_subclass_of(klassOop k) const { - // Run up the super chain and check -@@ -115,7 +119,7 @@ - } - - --methodOop Klass::uncached_lookup_method(symbolOop name, symbolOop signature) const { -+methodOop Klass::uncached_lookup_method(Symbol* name, Symbol* signature) const { - #ifdef ASSERT - tty->print_cr("Error: uncached_lookup_method called on a klass oop." - " Likely error: reflection method does not correctly" -@@ -454,6 +458,11 @@ - } - - -+void Klass::shared_symbols_iterate(SymbolClosure* closure) { -+ closure->do_symbol(&_name); -+} -+ -+ - klassOop Klass::array_klass_or_null(int rank) { - EXCEPTION_MARK; - // No exception can be thrown by array_klass_impl when called with or_null == true. -diff --git a/src/share/vm/oops/klass.hpp b/src/share/vm/oops/klass.hpp ---- openjdk/hotspot/src/share/vm/oops/klass.hpp -+++ openjdk/hotspot/src/share/vm/oops/klass.hpp -@@ -212,6 +212,10 @@ - // secondary supers, else is &_primary_supers[depth()]. - juint _super_check_offset; - -+ // Class name. Instance classes: java/lang/String, etc. Array classes: [I, -+ // [Ljava/lang/String;, etc. Set to zero for all other kinds of classes. -+ Symbol* _name; -+ - public: - oop* oop_block_beg() const { return adr_secondary_super_cache(); } - oop* oop_block_end() const { return adr_next_sibling() + 1; } -@@ -235,9 +239,6 @@ - oop _java_mirror; - // Superclass - klassOop _super; -- // Class name. Instance classes: java/lang/String, etc. Array classes: [I, -- // [Ljava/lang/String;, etc. Set to zero for all other kinds of classes. -- symbolOop _name; - // First subclass (NULL if none); _subklass->next_sibling() is next one - klassOop _subklass; - // Sibling link (or NULL); links all subklasses of a klass -@@ -361,7 +362,6 @@ - oop* adr_secondary_super_cache() const { return (oop*)&_secondary_super_cache; } - oop* adr_secondary_supers()const { return (oop*)&_secondary_supers; } - oop* adr_java_mirror() const { return (oop*)&_java_mirror; } -- oop* adr_name() const { return (oop*)&_name; } - oop* adr_subklass() const { return (oop*)&_subklass; } - oop* adr_next_sibling() const { return (oop*)&_next_sibling; } - -@@ -511,9 +511,9 @@ - virtual void initialize(TRAPS); - // lookup operation for MethodLookupCache - friend class MethodLookupCache; -- virtual methodOop uncached_lookup_method(symbolOop name, symbolOop signature) const; -+ virtual methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const; - public: -- methodOop lookup_method(symbolOop name, symbolOop signature) const { -+ methodOop lookup_method(Symbol* name, Symbol* signature) const { - return uncached_lookup_method(name, signature); - } - -@@ -537,6 +537,7 @@ - - public: - virtual void remove_unshareable_info(); -+ virtual void shared_symbols_iterate(SymbolClosure* closure); - - protected: - // computes the subtype relationship -@@ -580,7 +581,6 @@ - virtual bool oop_is_instanceRef() const { return false; } - virtual bool oop_is_array() const { return false; } - virtual bool oop_is_objArray_slow() const { return false; } -- virtual bool oop_is_symbol() const { return false; } - virtual bool oop_is_klass() const { return false; } - virtual bool oop_is_thread() const { return false; } - virtual bool oop_is_method() const { return false; } -@@ -782,8 +782,8 @@ - Klass *up_cast_abstract(); - - // klass name -- symbolOop name() const { return _name; } -- void set_name(symbolOop n) { oop_store_without_check((oop*) &_name, (oop) n); } -+ Symbol* name() const { return _name; } -+ void set_name(Symbol* n); - - friend class klassKlass; - -diff --git a/src/share/vm/oops/klassKlass.cpp b/src/share/vm/oops/klassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/klassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/klassKlass.cpp -@@ -37,8 +37,7 @@ - #include "oops/objArrayKlass.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" --#include "oops/symbolKlass.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "oops/typeArrayKlass.hpp" - #include "runtime/handles.inline.hpp" - #ifndef SERIALGC -@@ -74,7 +73,6 @@ - MarkSweep::mark_and_push(k->adr_secondary_super_cache()); - MarkSweep::mark_and_push(k->adr_secondary_supers()); - MarkSweep::mark_and_push(k->adr_java_mirror()); -- MarkSweep::mark_and_push(k->adr_name()); - // We follow the subklass and sibling links at the end of the - // marking phase, since otherwise following them will prevent - // class unloading (all classes are transitively linked from -@@ -94,7 +92,6 @@ - PSParallelCompact::mark_and_push(cm, k->adr_secondary_super_cache()); - PSParallelCompact::mark_and_push(cm, k->adr_secondary_supers()); - PSParallelCompact::mark_and_push(cm, k->adr_java_mirror()); -- PSParallelCompact::mark_and_push(cm, k->adr_name()); - // We follow the subklass and sibling links at the end of the - // marking phase, since otherwise following them will prevent - // class unloading (all classes are transitively linked from -@@ -114,7 +111,6 @@ - blk->do_oop(k->adr_secondary_super_cache()); - blk->do_oop(k->adr_secondary_supers()); - blk->do_oop(k->adr_java_mirror()); -- blk->do_oop(k->adr_name()); - // The following are in the perm gen and are treated - // specially in a later phase of a perm gen collection; ... - assert(oop(k)->is_perm(), "should be in perm"); -@@ -148,8 +144,6 @@ - if (mr.contains(adr)) blk->do_oop(adr); - adr = k->adr_java_mirror(); - if (mr.contains(adr)) blk->do_oop(adr); -- adr = k->adr_name(); -- if (mr.contains(adr)) blk->do_oop(adr); - // The following are "weak links" in the perm gen and are - // treated specially in a later phase of a perm gen collection. - assert(oop(k)->is_perm(), "should be in perm"); -@@ -178,7 +172,6 @@ - MarkSweep::adjust_pointer(k->adr_secondary_super_cache()); - MarkSweep::adjust_pointer(k->adr_secondary_supers()); - MarkSweep::adjust_pointer(k->adr_java_mirror()); -- MarkSweep::adjust_pointer(k->adr_name()); - MarkSweep::adjust_pointer(k->adr_subklass()); - MarkSweep::adjust_pointer(k->adr_next_sibling()); - return size; -@@ -266,9 +259,4 @@ - guarantee(k->java_mirror()->is_perm() || !JavaObjectsInPerm, "should be in permspace"); - guarantee(k->java_mirror()->is_instance(), "should be instance"); - } -- if (k->name() != NULL) { -- guarantee(Universe::heap()->is_in_permanent(k->name()), -- "should be in permspace"); -- guarantee(k->name()->is_symbol(), "should be symbol"); -- } - } -diff --git a/src/share/vm/oops/klassVtable.cpp b/src/share/vm/oops/klassVtable.cpp ---- openjdk/hotspot/src/share/vm/oops/klassVtable.cpp -+++ openjdk/hotspot/src/share/vm/oops/klassVtable.cpp -@@ -61,7 +61,7 @@ - objArrayOop methods, - AccessFlags class_flags, - Handle classloader, -- symbolHandle classname, -+ Symbol* classname, - objArrayOop local_interfaces, - TRAPS - ) { -@@ -210,7 +210,7 @@ - // the superclass's method, but might indirectly override a super-super class's vtable entry - // If none found, return a null superk, else return the superk of the method this does override - instanceKlass* klassVtable::find_transitive_override(instanceKlass* initialsuper, methodHandle target_method, -- int vtable_index, Handle target_loader, symbolHandle target_classname, Thread * THREAD) { -+ int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) { - instanceKlass* superk = initialsuper; - while (superk != NULL && superk->super() != NULL) { - instanceKlass* supersuperklass = instanceKlass::cast(superk->super()); -@@ -218,9 +218,9 @@ - if (vtable_index < ssVtable->length()) { - methodOop super_method = ssVtable->method_at(vtable_index); - #ifndef PRODUCT -- symbolHandle name(THREAD,target_method()->name()); -- symbolHandle signature(THREAD,target_method()->signature()); -- assert(super_method->name() == name() && super_method->signature() == signature(), "vtable entry name/sig mismatch"); -+ Symbol* name= target_method()->name(); -+ Symbol* signature = target_method()->signature(); -+ assert(super_method->name() == name && super_method->signature() == signature, "vtable entry name/sig mismatch"); - #endif - if (supersuperklass->is_override(super_method, target_loader, target_classname, THREAD)) { - #ifndef PRODUCT -@@ -294,14 +294,14 @@ - // which can block for gc, once we are in this loop, use handles - // For classfiles built with >= jdk7, we now look for transitive overrides - -- symbolHandle name(THREAD,target_method()->name()); -- symbolHandle signature(THREAD,target_method()->signature()); -+ Symbol* name = target_method()->name(); -+ Symbol* signature = target_method()->signature(); - Handle target_loader(THREAD, _klass->class_loader()); -- symbolHandle target_classname(THREAD, _klass->name()); -+ Symbol* target_classname = _klass->name(); - for(int i = 0; i < super_vtable_len; i++) { - methodOop super_method = method_at(i); - // Check if method name matches -- if (super_method->name() == name() && super_method->signature() == signature()) { -+ if (super_method->name() == name && super_method->signature() == signature) { - - // get super_klass for method_holder for the found method - instanceKlass* super_klass = instanceKlass::cast(super_method->method_holder()); -@@ -406,7 +406,7 @@ - bool klassVtable::needs_new_vtable_entry(methodHandle target_method, - klassOop super, - Handle classloader, -- symbolHandle classname, -+ Symbol* classname, - AccessFlags class_flags, - TRAPS) { - if ((class_flags.is_final() || target_method()->is_final()) || -@@ -436,8 +436,8 @@ - // search through the super class hierarchy to see if we need - // a new entry - ResourceMark rm; -- symbolOop name = target_method()->name(); -- symbolOop signature = target_method()->signature(); -+ Symbol* name = target_method()->name(); -+ Symbol* signature = target_method()->signature(); - klassOop k = super; - methodOop super_method = NULL; - instanceKlass *holder = NULL; -@@ -485,7 +485,7 @@ - // Support for miranda methods - - // get the vtable index of a miranda method with matching "name" and "signature" --int klassVtable::index_of_miranda(symbolOop name, symbolOop signature) { -+int klassVtable::index_of_miranda(Symbol* name, Symbol* signature) { - // search from the bottom, might be faster - for (int i = (length() - 1); i >= 0; i--) { - methodOop m = table()[i].method(); -@@ -516,9 +516,8 @@ - // check if a method is a miranda method, given a class's methods table and it's super - // the caller must make sure that the method belongs to an interface implemented by the class - bool klassVtable::is_miranda(methodOop m, objArrayOop class_methods, klassOop super) { -- symbolOop name = m->name(); -- symbolOop signature = m->signature(); -- -+ Symbol* name = m->name(); -+ Symbol* signature = m->signature(); - if (instanceKlass::find_method(class_methods, name, signature) == NULL) { - // did not find it in the method table of the current class - if (super == NULL) { -@@ -929,8 +928,8 @@ - // methods needs a handle in case of gc from check_signature_loaders - for(; i < nof_methods; i++) { - methodOop m = (methodOop)methods()->obj_at(i); -- symbolOop method_name = m->name(); -- symbolOop method_signature = m->signature(); -+ Symbol* method_name = m->name(); -+ Symbol* method_signature = m->signature(); - - // This is same code as in Linkresolver::lookup_instance_method_in_klasses - methodOop target = klass->uncached_lookup_method(method_name, method_signature); -diff --git a/src/share/vm/oops/klassVtable.hpp b/src/share/vm/oops/klassVtable.hpp ---- openjdk/hotspot/src/share/vm/oops/klassVtable.hpp -+++ openjdk/hotspot/src/share/vm/oops/klassVtable.hpp -@@ -71,7 +71,7 @@ - - // searching; all methods return -1 if not found - int index_of(methodOop m) const { return index_of(m, _length); } -- int index_of_miranda(symbolOop name, symbolOop signature); -+ int index_of_miranda(Symbol* name, Symbol* signature); - - void initialize_vtable(bool checkconstraints, TRAPS); // initialize vtable of a new klass - -@@ -79,7 +79,7 @@ - static void compute_vtable_size_and_num_mirandas(int &vtable_length, int &num_miranda_methods, - klassOop super, objArrayOop methods, - AccessFlags class_flags, Handle classloader, -- symbolHandle classname, objArrayOop local_interfaces, -+ Symbol* classname, objArrayOop local_interfaces, - TRAPS); - - // RedefineClasses() API support: -@@ -125,11 +125,11 @@ - int initialize_from_super(KlassHandle super); - int index_of(methodOop m, int len) const; // same as index_of, but search only up to len - void put_method_at(methodOop m, int index); -- static bool needs_new_vtable_entry(methodHandle m, klassOop super, Handle classloader, symbolHandle classname, AccessFlags access_flags, TRAPS); -+ static bool needs_new_vtable_entry(methodHandle m, klassOop super, Handle classloader, Symbol* classname, AccessFlags access_flags, TRAPS); - - bool update_inherited_vtable(instanceKlass* klass, methodHandle target_method, int super_vtable_len, bool checkconstraints, TRAPS); - instanceKlass* find_transitive_override(instanceKlass* initialsuper, methodHandle target_method, int vtable_index, -- Handle target_loader, symbolHandle target_classname, Thread* THREAD); -+ Handle target_loader, Symbol* target_classname, Thread* THREAD); - - // support for miranda methods - bool is_miranda_entry_at(int i); -diff --git a/src/share/vm/oops/markOop.hpp b/src/share/vm/oops/markOop.hpp ---- openjdk/hotspot/src/share/vm/oops/markOop.hpp -+++ openjdk/hotspot/src/share/vm/oops/markOop.hpp -@@ -118,14 +118,7 @@ - }; - - // The biased locking code currently requires that the age bits be -- // contiguous to the lock bits. Class data sharing would prefer the -- // hash bits to be lower down to provide more random hash codes for -- // shared read-only symbolOop objects, because these objects' mark -- // words are set to their own address with marked_value in the lock -- // bit, and using lower bits would make their identity hash values -- // more random. However, the performance decision was made in favor -- // of the biased locking code. -- -+ // contiguous to the lock bits. - enum { lock_shift = 0, - biased_lock_shift = lock_bits, - age_shift = lock_bits + biased_lock_bits, -diff --git a/src/share/vm/oops/methodKlass.cpp b/src/share/vm/oops/methodKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/methodKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/methodKlass.cpp -@@ -36,7 +36,7 @@ - #include "oops/methodKlass.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.inline.hpp" - - klassOop methodKlass::create_klass(TRAPS) { -@@ -353,10 +353,6 @@ - if (!obj->partially_loaded()) { - methodOop m = methodOop(obj); - guarantee(m->is_perm(), "should be in permspace"); -- guarantee(m->name()->is_perm(), "should be in permspace"); -- guarantee(m->name()->is_symbol(), "should be symbol"); -- guarantee(m->signature()->is_perm(), "should be in permspace"); -- guarantee(m->signature()->is_symbol(), "should be symbol"); - guarantee(m->constants()->is_perm(), "should be in permspace"); - guarantee(m->constants()->is_constantPool(), "should be constant pool"); - guarantee(m->constMethod()->is_constMethod(), "should be constMethodOop"); -diff --git a/src/share/vm/oops/methodOop.cpp b/src/share/vm/oops/methodOop.cpp ---- openjdk/hotspot/src/share/vm/oops/methodOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp -@@ -38,7 +38,7 @@ - #include "oops/methodDataOop.hpp" - #include "oops/methodOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvmtiExport.hpp" - #include "prims/methodHandleWalk.hpp" - #include "prims/nativeLookup.hpp" -@@ -77,7 +77,7 @@ - return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature(), buf, size); - } - --char* methodOopDesc::name_and_sig_as_C_string(Klass* klass, symbolOop method_name, symbolOop signature) { -+char* methodOopDesc::name_and_sig_as_C_string(Klass* klass, Symbol* method_name, Symbol* signature) { - const char* klass_name = klass->external_name(); - int klass_name_len = (int)strlen(klass_name); - int method_name_len = method_name->utf8_length(); -@@ -91,8 +91,8 @@ - return dest; - } - --char* methodOopDesc::name_and_sig_as_C_string(Klass* klass, symbolOop method_name, symbolOop signature, char* buf, int size) { -- symbolOop klass_name = klass->name(); -+char* methodOopDesc::name_and_sig_as_C_string(Klass* klass, Symbol* method_name, Symbol* signature, char* buf, int size) { -+ Symbol* klass_name = klass->name(); - klass_name->as_klass_external_name(buf, size); - int len = (int)strlen(buf); - -@@ -221,7 +221,7 @@ - } - - --symbolOop methodOopDesc::klass_name() const { -+Symbol* methodOopDesc::klass_name() const { - klassOop k = method_holder(); - assert(k->is_klass(), "must be klass"); - instanceKlass* ik = (instanceKlass*) k->klass_part(); -@@ -333,8 +333,7 @@ - - - void methodOopDesc::compute_size_of_parameters(Thread *thread) { -- symbolHandle h_signature(thread, signature()); -- ArgumentSizeComputer asc(h_signature); -+ ArgumentSizeComputer asc(signature()); - set_size_of_parameters(asc.size() + (is_static() ? 0 : 1)); - } - -@@ -520,7 +519,7 @@ - bool methodOopDesc::is_klass_loaded_by_klass_index(int klass_index) const { - if( _constants->tag_at(klass_index).is_unresolved_klass() ) { - Thread *thread = Thread::current(); -- symbolHandle klass_name(thread, _constants->klass_name_at(klass_index)); -+ Symbol* klass_name = _constants->klass_name_at(klass_index); - Handle loader(thread, instanceKlass::cast(method_holder())->class_loader()); - Handle prot (thread, Klass::cast(method_holder())->protection_domain()); - return SystemDictionary::find(klass_name, loader, prot, thread) != NULL; -@@ -852,7 +851,7 @@ - // Constant pool structure for invoke methods: - enum { - _imcp_invoke_name = 1, // utf8: 'invokeExact' or 'invokeGeneric' -- _imcp_invoke_signature, // utf8: (variable symbolOop) -+ _imcp_invoke_signature, // utf8: (variable Symbol*) - _imcp_method_type_value, // string: (variable java/dyn/MethodType, sic) - _imcp_limit - }; -@@ -895,8 +894,8 @@ - } - - methodHandle methodOopDesc::make_invoke_method(KlassHandle holder, -- symbolHandle name, -- symbolHandle signature, -+ Symbol* name, -+ Symbol* signature, - Handle method_type, TRAPS) { - methodHandle empty; - -@@ -914,9 +913,9 @@ - constantPoolOop cp_oop = oopFactory::new_constantPool(_imcp_limit, IsSafeConc, CHECK_(empty)); - cp = constantPoolHandle(THREAD, cp_oop); - } -- cp->symbol_at_put(_imcp_invoke_name, name()); -- cp->symbol_at_put(_imcp_invoke_signature, signature()); -- cp->string_at_put(_imcp_method_type_value, vmSymbols::void_signature()); -+ cp->symbol_at_put(_imcp_invoke_name, name); -+ cp->symbol_at_put(_imcp_invoke_signature, signature); -+ cp->string_at_put(_imcp_method_type_value, Universe::the_null_string()); - cp->set_pool_holder(holder()); - - // set up the fancy stuff: -@@ -932,7 +931,7 @@ - m->set_name_index(_imcp_invoke_name); - m->set_signature_index(_imcp_invoke_signature); - assert(is_method_handle_invoke_name(m->name()), ""); -- assert(m->signature() == signature(), ""); -+ assert(m->signature() == signature, ""); - assert(m->is_method_handle_invoke(), ""); - #ifdef CC_INTERP - ResultTypeFinder rtf(signature()); -@@ -1047,7 +1046,7 @@ - return vmSymbols::NO_SID; // regardless of name, no intrinsics here - - // see if the klass name is well-known: -- symbolOop klass_name = instanceKlass::cast(holder)->name(); -+ Symbol* klass_name = instanceKlass::cast(holder)->name(); - return vmSymbols::find_sid(klass_name); - } - -@@ -1123,11 +1122,12 @@ - bool sig_is_loaded = true; - Handle class_loader(THREAD, instanceKlass::cast(m->method_holder())->class_loader()); - Handle protection_domain(THREAD, Klass::cast(m->method_holder())->protection_domain()); -- symbolHandle signature(THREAD, m->signature()); -+ ResourceMark rm(THREAD); -+ Symbol* signature = m->signature(); - for(SignatureStream ss(signature); !ss.is_done(); ss.next()) { - if (ss.is_object()) { -- symbolOop sym = ss.as_symbol(CHECK_(false)); -- symbolHandle name (THREAD, sym); -+ Symbol* sym = ss.as_symbol(CHECK_(false)); -+ Symbol* name = sym; - klassOop klass = SystemDictionary::resolve_or_null(name, class_loader, - protection_domain, THREAD); - // We are loading classes eagerly. If a ClassNotFoundException or -@@ -1149,11 +1149,12 @@ - bool methodOopDesc::has_unloaded_classes_in_signature(methodHandle m, TRAPS) { - Handle class_loader(THREAD, instanceKlass::cast(m->method_holder())->class_loader()); - Handle protection_domain(THREAD, Klass::cast(m->method_holder())->protection_domain()); -- symbolHandle signature(THREAD, m->signature()); -+ ResourceMark rm(THREAD); -+ Symbol* signature = m->signature(); - for(SignatureStream ss(signature); !ss.is_done(); ss.next()) { - if (ss.type() == T_OBJECT) { -- symbolHandle name(THREAD, ss.as_symbol_or_null()); -- if (name() == NULL) return true; -+ Symbol* name = ss.as_symbol_or_null(); -+ if (name == NULL) return true; - klassOop klass = SystemDictionary::find(name, class_loader, protection_domain, THREAD); - if (klass == NULL) return true; - } -@@ -1317,7 +1318,7 @@ - } - - public: -- SignatureTypePrinter(symbolHandle signature, outputStream* st) : SignatureTypeNames(signature) { -+ SignatureTypePrinter(Symbol* signature, outputStream* st) : SignatureTypeNames(signature) { - _st = st; - _use_separator = false; - } -diff --git a/src/share/vm/oops/methodOop.hpp b/src/share/vm/oops/methodOop.hpp ---- openjdk/hotspot/src/share/vm/oops/methodOop.hpp -+++ openjdk/hotspot/src/share/vm/oops/methodOop.hpp -@@ -161,17 +161,17 @@ - void set_access_flags(AccessFlags flags) { _access_flags = flags; } - - // name -- symbolOop name() const { return _constants->symbol_at(name_index()); } -+ Symbol* name() const { return _constants->symbol_at(name_index()); } - int name_index() const { return constMethod()->name_index(); } - void set_name_index(int index) { constMethod()->set_name_index(index); } - - // signature -- symbolOop signature() const { return _constants->symbol_at(signature_index()); } -+ Symbol* signature() const { return _constants->symbol_at(signature_index()); } - int signature_index() const { return constMethod()->signature_index(); } - void set_signature_index(int index) { constMethod()->set_signature_index(index); } - - // generics support -- symbolOop generic_signature() const { int idx = generic_signature_index(); return ((idx != 0) ? _constants->symbol_at(idx) : (symbolOop)NULL); } -+ Symbol* generic_signature() const { int idx = generic_signature_index(); return ((idx != 0) ? _constants->symbol_at(idx) : (Symbol*)NULL); } - int generic_signature_index() const { return constMethod()->generic_signature_index(); } - void set_generic_signature_index(int index) { constMethod()->set_generic_signature_index(index); } - -@@ -193,8 +193,8 @@ - char* name_and_sig_as_C_string(char* buf, int size); - - // Static routine in the situations we don't have a methodOop -- static char* name_and_sig_as_C_string(Klass* klass, symbolOop method_name, symbolOop signature); -- static char* name_and_sig_as_C_string(Klass* klass, symbolOop method_name, symbolOop signature, char* buf, int size); -+ static char* name_and_sig_as_C_string(Klass* klass, Symbol* method_name, Symbol* signature); -+ static char* name_and_sig_as_C_string(Klass* klass, Symbol* method_name, Symbol* signature, char* buf, int size); - - Bytecodes::Code java_code_at(int bci) const { - return Bytecodes::java_code_at(this, bcp_from(bci)); -@@ -433,7 +433,7 @@ - klassOop method_holder() const { return _constants->pool_holder(); } - - void compute_size_of_parameters(Thread *thread); // word size of parameters (receiver if any + arguments) -- symbolOop klass_name() const; // returns the name of the method holder -+ Symbol* klass_name() const; // returns the name of the method holder - BasicType result_type() const; // type of the method result - int result_type_index() const; // type index of the method result - bool is_returning_oop() const { BasicType r = result_type(); return (r == T_OBJECT || r == T_ARRAY); } -@@ -564,15 +564,15 @@ - // JSR 292 support - bool is_method_handle_invoke() const { return access_flags().is_method_handle_invoke(); } - static bool is_method_handle_invoke_name(vmSymbols::SID name_sid); -- static bool is_method_handle_invoke_name(symbolOop name) { -+ static bool is_method_handle_invoke_name(Symbol* name) { - return is_method_handle_invoke_name(vmSymbols::find_sid(name)); - } - // Tests if this method is an internal adapter frame from the - // MethodHandleCompiler. - bool is_method_handle_adapter() const; - static methodHandle make_invoke_method(KlassHandle holder, -- symbolHandle name, //invokeExact or invokeGeneric -- symbolHandle signature, //anything at all -+ Symbol* name, //invokeExact or invokeGeneric -+ Symbol* signature, //anything at all - Handle method_type, - TRAPS); - // these operate only on invoke methods: -diff --git a/src/share/vm/oops/objArrayKlass.cpp b/src/share/vm/oops/objArrayKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp -@@ -37,7 +37,7 @@ - #include "oops/objArrayOop.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.inline.hpp" - #include "runtime/mutexLocker.hpp" - #include "utilities/copy.hpp" -diff --git a/src/share/vm/oops/objArrayKlassKlass.cpp b/src/share/vm/oops/objArrayKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp -@@ -117,14 +117,11 @@ - } - } - -- // Create type name for klass (except for symbol arrays, since symbolKlass -- // does not have a name). This will potentially allocate an object, cause -- // GC, and all other kinds of things. Hence, this must be done before we -- // get a handle to the new objArrayKlass we want to construct. We cannot -- // block while holding a handling to a partly initialized object. -- symbolHandle name = symbolHandle(); -+ // Create type name for klass. -+ Symbol* name = NULL; -+ if (!element_klass->oop_is_instance() || -+ (name = instanceKlass::cast(element_klass())->array_name()) == NULL) { - -- if (!element_klass->oop_is_symbol()) { - ResourceMark rm(THREAD); - char *name_str = element_klass->name()->as_C_string(); - int len = element_klass->name()->utf8_length(); -@@ -140,7 +137,11 @@ - new_str[idx++] = ';'; - } - new_str[idx++] = '\0'; -- name = oopFactory::new_symbol_handle(new_str, CHECK_0); -+ name = SymbolTable::new_symbol(new_str, CHECK_0); -+ if (element_klass->oop_is_instance()) { -+ instanceKlass* ik = instanceKlass::cast(element_klass()); -+ ik->set_array_name(name); -+ } - } - - objArrayKlass o; -@@ -149,12 +150,15 @@ - this_oop, - CHECK_0); - -- - // Initialize instance variables - objArrayKlass* oak = objArrayKlass::cast(k()); - oak->set_dimension(n); - oak->set_element_klass(element_klass()); -- oak->set_name(name()); -+ oak->set_name(name); -+ // decrement refcount because object arrays are not explicitly freed. The -+ // instanceKlass array_name() keeps the name counted while the klass is -+ // loaded. -+ name->decrement_refcount(); - - klassOop bk; - if (element_klass->oop_is_objArray()) { -diff --git a/src/share/vm/oops/oop.hpp b/src/share/vm/oops/oop.hpp ---- openjdk/hotspot/src/share/vm/oops/oop.hpp -+++ openjdk/hotspot/src/share/vm/oops/oop.hpp -@@ -128,7 +128,6 @@ - bool is_instanceRef() const; - bool is_array() const; - bool is_objArray() const; -- bool is_symbol() const; - bool is_klass() const; - bool is_thread() const; - bool is_method() const; -diff --git a/src/share/vm/oops/oop.inline.hpp b/src/share/vm/oops/oop.inline.hpp ---- openjdk/hotspot/src/share/vm/oops/oop.inline.hpp -+++ openjdk/hotspot/src/share/vm/oops/oop.inline.hpp -@@ -141,7 +141,6 @@ - inline bool oopDesc::is_objArray() const { return blueprint()->oop_is_objArray(); } - inline bool oopDesc::is_typeArray() const { return blueprint()->oop_is_typeArray(); } - inline bool oopDesc::is_javaArray() const { return blueprint()->oop_is_javaArray(); } --inline bool oopDesc::is_symbol() const { return blueprint()->oop_is_symbol(); } - inline bool oopDesc::is_klass() const { return blueprint()->oop_is_klass(); } - inline bool oopDesc::is_thread() const { return blueprint()->oop_is_thread(); } - inline bool oopDesc::is_method() const { return blueprint()->oop_is_method(); } -diff --git a/src/share/vm/oops/oopsHierarchy.hpp b/src/share/vm/oops/oopsHierarchy.hpp ---- openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp -+++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp -@@ -49,7 +49,6 @@ - typedef class typeArrayOopDesc* typeArrayOop; - typedef class constantPoolOopDesc* constantPoolOop; - typedef class constantPoolCacheOopDesc* constantPoolCacheOop; --typedef class symbolOopDesc* symbolOop; - typedef class klassOopDesc* klassOop; - typedef class markOopDesc* markOop; - typedef class compiledICHolderOopDesc* compiledICHolderOop; -@@ -166,7 +165,6 @@ - DEF_OOP(constantPoolCache); - DEF_OOP(objArray); - DEF_OOP(typeArray); --DEF_OOP(symbol); - DEF_OOP(klass); - DEF_OOP(compiledICHolder); - -@@ -191,7 +189,6 @@ - class typeArrayKlass; - class constantPoolKlass; - class constantPoolCacheKlass; --class symbolKlass; - class compiledICHolderKlass; - - #endif // SHARE_VM_OOPS_OOPSHIERARCHY_HPP -diff --git a/src/share/vm/oops/symbolOop.cpp b/src/share/vm/oops/symbol.cpp -# most patch programs can not handle file renames -# rename from src/share/vm/oops/symbolOop.cpp -# rename to src/share/vm/oops/symbol.cpp ---- openjdk/hotspot/src/share/vm/oops/symbolOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/symbol.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -22,16 +22,29 @@ - * - */ - -+ - #include "precompiled.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" -+#include "runtime/os.hpp" -+#include "memory/allocation.inline.hpp" - -+Symbol::Symbol(const u1* name, int length) : _refcount(0), _length(length) { -+ _identity_hash = os::random(); -+ for (int i = 0; i < _length; i++) { -+ byte_at_put(i, name[i]); -+ } -+} -+ -+void* Symbol::operator new(size_t size, int len) { -+ return (void *) AllocateHeap(object_size(len) * HeapWordSize, "symbol"); -+} - - // ------------------------------------------------------------------ --// symbolOopDesc::equals -+// Symbol::equals - // - // Compares the symbol with a string of the given length. --bool symbolOopDesc::equals(const char* str, int len) const { -+bool Symbol::equals(const char* str, int len) const { - int l = utf8_length(); - if (l != len) return false; - while (l-- > 0) { -@@ -44,11 +57,11 @@ - - - // ------------------------------------------------------------------ --// symbolOopDesc::starts_with -+// Symbol::starts_with - // - // Tests if the symbol starts with the specified prefix of the given - // length. --bool symbolOopDesc::starts_with(const char* prefix, int len) const { -+bool Symbol::starts_with(const char* prefix, int len) const { - if (len > utf8_length()) return false; - while (len-- > 0) { - if (prefix[len] != (char) byte_at(len)) -@@ -60,15 +73,15 @@ - - - // ------------------------------------------------------------------ --// symbolOopDesc::index_of -+// Symbol::index_of - // - // Finds if the given string is a substring of this symbol's utf8 bytes. - // Return -1 on failure. Otherwise return the first index where str occurs. --int symbolOopDesc::index_of_at(int i, const char* str, int len) const { -+int Symbol::index_of_at(int i, const char* str, int len) const { - assert(i >= 0 && i <= utf8_length(), "oob"); - if (len <= 0) return 0; - char first_char = str[0]; -- address bytes = (address) ((symbolOopDesc*)this)->base(); -+ address bytes = (address) ((Symbol*)this)->base(); - address limit = bytes + utf8_length() - len; // inclusive limit - address scan = bytes + i; - if (scan > limit) -@@ -84,7 +97,7 @@ - } - - --char* symbolOopDesc::as_C_string(char* buf, int size) const { -+char* Symbol::as_C_string(char* buf, int size) const { - if (size > 0) { - int len = MIN2(size - 1, utf8_length()); - for (int i = 0; i < len; i++) { -@@ -95,13 +108,13 @@ - return buf; - } - --char* symbolOopDesc::as_C_string() const { -+char* Symbol::as_C_string() const { - int len = utf8_length(); - char* str = NEW_RESOURCE_ARRAY(char, len + 1); - return as_C_string(str, len + 1); - } - --char* symbolOopDesc::as_C_string_flexible_buffer(Thread* t, -+char* Symbol::as_C_string_flexible_buffer(Thread* t, - char* buf, int size) const { - char* str; - int len = utf8_length(); -@@ -114,7 +127,7 @@ - return as_C_string(str, buf_len); - } - --void symbolOopDesc::print_symbol_on(outputStream* st) { -+void Symbol::print_symbol_on(outputStream* st) const { - st = st ? st : tty; - int length = UTF8::unicode_length((const char*)bytes(), utf8_length()); - const char *ptr = (const char *)bytes(); -@@ -129,8 +142,8 @@ - } - } - --jchar* symbolOopDesc::as_unicode(int& length) const { -- symbolOopDesc* this_ptr = (symbolOopDesc*)this; -+jchar* Symbol::as_unicode(int& length) const { -+ Symbol* this_ptr = (Symbol*)this; - length = UTF8::unicode_length((char*)this_ptr->bytes(), utf8_length()); - jchar* result = NEW_RESOURCE_ARRAY(jchar, length); - if (length > 0) { -@@ -139,7 +152,7 @@ - return result; - } - --const char* symbolOopDesc::as_klass_external_name(char* buf, int size) const { -+const char* Symbol::as_klass_external_name(char* buf, int size) const { - if (size > 0) { - char* str = as_C_string(buf, size); - int length = (int)strlen(str); -@@ -155,7 +168,7 @@ - } - } - --const char* symbolOopDesc::as_klass_external_name() const { -+const char* Symbol::as_klass_external_name() const { - char* str = as_C_string(); - int length = (int)strlen(str); - // Turn all '/'s into '.'s (also for array klasses) -@@ -166,3 +179,53 @@ - } - return str; - } -+ -+ -+void Symbol::print_on(outputStream* st) const { -+ if (this == NULL) { -+ st->print_cr("NULL"); -+ } else { -+ st->print("Symbol: '"); -+ print_symbol_on(st); -+ st->print("'"); -+ st->print(" count %d", refcount()); -+ } -+} -+ -+// The print_value functions are present in all builds, to support the -+// disassembler and error reporting. -+void Symbol::print_value_on(outputStream* st) const { -+ if (this == NULL) { -+ st->print("NULL"); -+ } else { -+ st->print("'"); -+ for (int i = 0; i < utf8_length(); i++) { -+ st->print("%c", byte_at(i)); -+ } -+ st->print("'"); -+ } -+} -+ -+void Symbol::increment_refcount() { -+ // Only increment the refcount if positive. If negative either -+ // overflow has occurred or it is a permanent symbol in a read only -+ // shared archive. -+ if (_refcount >= 0) { -+ Atomic::inc(&_refcount); -+ NOT_PRODUCT(Atomic::inc(&_total_count);) -+ } -+} -+ -+void Symbol::decrement_refcount() { -+ if (_refcount >= 0) { -+ Atomic::dec(&_refcount); -+#ifdef ASSERT -+ if (_refcount < 0) { -+ print(); -+ assert(false, "reference count underflow for symbol"); -+ } -+#endif -+ } -+} -+ -+NOT_PRODUCT(int Symbol::_total_count = 0;) -diff --git a/src/share/vm/oops/symbolOop.hpp b/src/share/vm/oops/symbol.hpp -rename from src/share/vm/oops/symbolOop.hpp -rename to src/share/vm/oops/symbol.hpp ---- openjdk/hotspot/src/share/vm/oops/symbolOop.hpp -+++ openjdk/hotspot/src/share/vm/oops/symbol.hpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -22,19 +22,86 @@ - * - */ - --#ifndef SHARE_VM_OOPS_SYMBOLOOP_HPP --#define SHARE_VM_OOPS_SYMBOLOOP_HPP -+#ifndef SHARE_VM_OOPS_SYMBOL_HPP -+#define SHARE_VM_OOPS_SYMBOL_HPP - --#include "oops/typeArrayOop.hpp" - #include "utilities/utf8.hpp" -+#include "memory/allocation.hpp" - --// A symbolOop is a canonicalized string. --// All symbolOops reside in global symbolTable. --// See oopFactory::new_symbol for how to allocate a symbolOop -+// A Symbol is a canonicalized string. -+// All Symbols reside in global SymbolTable and are reference counted. - --class symbolOopDesc : public oopDesc { -+// Reference counting -+// -+// All Symbols are allocated and added to the SymbolTable. -+// When a class is unloaded, the reference counts of the Symbol pointers in -+// the ConstantPool and in instanceKlass (see release_C_heap_structures) are -+// decremented. When the reference count for a Symbol goes to 0, the garbage -+// collector can free the Symbol and remove it from the SymbolTable. -+// -+// 0) Symbols need to be reference counted when a pointer to the Symbol is -+// saved in persistent storage. This does not include the pointer -+// in the SymbolTable bucket (the _literal field in HashtableEntry) -+// that points to the Symbol. All other stores of a Symbol* -+// to a field of a persistent variable (e.g., the _name filed in -+// FieldAccessInfo or _ptr in a CPSlot) is reference counted. -+// -+// 1) The lookup of a "name" in the SymbolTable either creates a Symbol F for -+// "name" and returns a pointer to F or finds a pre-existing Symbol F for -+// "name" and returns a pointer to it. In both cases the reference count for F -+// is incremented under the assumption that a pointer to F will be created from -+// the return value. Thus the increment of the reference count is on the lookup -+// and not on the assignment to the new Symbol*. That is -+// Symbol* G = lookup() -+// ^ increment on lookup() -+// and not -+// Symbol* G = lookup() -+// ^ increment on assignmnet -+// The reference count must be decremented manually when the copy of the -+// pointer G is destroyed. -+// -+// 2) For a local Symbol* A that is a copy of an existing Symbol* B, the -+// reference counting is elided when the scope of B is greater than the scope -+// of A. For example, in the code fragment -+// below "klass" is passed as a parameter to the method. Symbol* "kn" -+// is a copy of the name in "klass". -+// -+// Symbol* kn = klass->name(); -+// unsigned int d_hash = dictionary()->compute_hash(kn, class_loader); -+// -+// The scope of "klass" is greater than the scope of "kn" so the reference -+// counting for "kn" is elided. -+// -+// Symbol* copied from ConstantPool entries are good candidates for reference -+// counting elision. The ConstantPool entries for a class C exist until C is -+// unloaded. If a Symbol* is copied out of the ConstantPool into Symbol* X, -+// the Symbol* in the ConstantPool will in general out live X so the reference -+// counting on X can be elided. -+// -+// For cases where the scope of A is not greater than the scope of B, -+// the reference counting is explicitly done. See ciSymbol, -+// ResolutionErrorEntry and ClassVerifier for examples. -+// -+// 3) When a Symbol K is created for temporary use, generally for substrings of -+// an existing symbol or to create a new symbol, assign it to a -+// TempNewSymbol. The SymbolTable methods new_symbol(), lookup() -+// and probe() all potentially return a pointer to a new Symbol. -+// The allocation (or lookup) of K increments the reference count for K -+// and the destructor decrements the reference count. -+// -+// Another example of TempNewSymbol usage is parsed_name used in -+// ClassFileParser::parseClassFile() where parsed_name is used in the cleanup -+// after a failed attempt to load a class. Here parsed_name is a -+// TempNewSymbol (passed in as a parameter) so the reference count on its symbol -+// will be decremented when it goes out of scope. -+ -+class Symbol : public CHeapObj { - friend class VMStructs; -+ friend class SymbolTable; -+ friend class MoveSymbols; - private: -+ volatile int _refcount; -+ int _identity_hash; - unsigned short _length; // number of UTF8 characters in the symbol - jbyte _body[1]; - -@@ -42,40 +109,49 @@ - // max_symbol_length is constrained by type of _length - max_symbol_length = (1 << 16) -1 - }; -+ -+ static int object_size(int length) { -+ size_t size = heap_word_size(sizeof(Symbol) + length); -+ return align_object_size(size); -+ } -+ -+ void byte_at_put(int index, int value) { -+ assert(index >=0 && index < _length, "symbol index overflow"); -+ _body[index] = value; -+ } -+ -+ Symbol(const u1* name, int length); -+ void* operator new(size_t size, int len); -+ - public: -+ // Low-level access (used with care, since not GC-safe) -+ const jbyte* base() const { return &_body[0]; } - -- // Low-level access (used with care, since not GC-safe) -- jbyte* base() { return &_body[0]; } -- -+ int object_size() { return object_size(utf8_length()); } - - // Returns the largest size symbol we can safely hold. - static int max_length() { - return max_symbol_length; - } - -- static int object_size(int length) { -- int size = header_size() + (sizeof(unsigned short) + length + HeapWordSize - 1) / HeapWordSize; -- return align_object_size(size); -+ int identity_hash() { -+ return _identity_hash; - } - -- int object_size() { return object_size(utf8_length()); } -+ // Reference counting. See comments above this class for when to use. -+ int refcount() const { return _refcount; } -+ void increment_refcount(); -+ void decrement_refcount(); - - int byte_at(int index) const { - assert(index >=0 && index < _length, "symbol index overflow"); -- return ((symbolOopDesc*)this)->base()[index]; -+ return base()[index]; - } - -- void byte_at_put(int index, int value) { -- assert(index >=0 && index < _length, "symbol index overflow"); -- ((symbolOopDesc*)this)->base()[index] = value; -- } -- -- jbyte* bytes() { return base(); } -+ const jbyte* bytes() const { return base(); } - - int utf8_length() const { return _length; } - -- void set_utf8_length(int len) { _length = len; } -- - // Compares the symbol with a string. - bool equals(const char* str, int len) const; - bool equals(const char* str) const { return equals(str, (int) strlen(str)); } -@@ -94,7 +170,7 @@ - - // Three-way compare for sorting; returns -1/0/1 if receiver is </==/> than arg - // note that the ordering is not alfabetical -- inline int fast_compare(symbolOop other) const; -+ inline int fast_compare(Symbol* other) const; - - // Returns receiver converted to null-terminated UTF-8 string; string is - // allocated in resource area, or in the char buffer provided by caller. -@@ -118,22 +194,30 @@ - const char* as_klass_external_name() const; - const char* as_klass_external_name(char* buf, int size) const; - -- bool object_is_parsable() const { -- return (utf8_length() > 0 || (oop)this == Universe::emptySymbol()); -- } -+ // Printing -+ void print_symbol_on(outputStream* st = NULL) const; -+ void print_on(outputStream* st) const; // First level print -+ void print_value_on(outputStream* st) const; // Second level print. - -- // Printing -- void print_symbol_on(outputStream* st = NULL); -+ // printing on default output stream -+ void print() { print_on(tty); } -+ void print_value() { print_value_on(tty); } -+ -+#ifndef PRODUCT -+ // Empty constructor to create a dummy symbol object on stack -+ // only for getting its vtable pointer. -+ Symbol() { } -+ -+ static int _total_count; -+#endif - }; - -- - // Note: this comparison is used for vtable sorting only; it doesn't matter - // what order it defines, as long as it is a total, time-invariant order --// Since symbolOops are in permSpace, their relative order in memory never changes, -+// Since Symbol*s are in C_HEAP, their relative order in memory never changes, - // so use address comparison for speed --int symbolOopDesc::fast_compare(symbolOop other) const { -+int Symbol::fast_compare(Symbol* other) const { - return (((uintptr_t)this < (uintptr_t)other) ? -1 - : ((uintptr_t)this == (uintptr_t) other) ? 0 : 1); - } -- --#endif // SHARE_VM_OOPS_SYMBOLOOP_HPP -+#endif // SHARE_VM_OOPS_SYMBOL_HPP -diff --git a/src/share/vm/oops/symbolKlass.cpp b/src/share/vm/oops/symbolKlass.cpp -deleted file mode 100644 ---- openjdk/hotspot/src/share/vm/oops/symbolKlass.cpp -+++ /dev/null -@@ -1,230 +0,0 @@ --/* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- * -- */ -- --#include "precompiled.hpp" --#include "classfile/symbolTable.hpp" --#include "memory/gcLocker.hpp" --#include "oops/oop.inline.hpp" --#include "oops/symbolKlass.hpp" --#include "oops/symbolOop.hpp" --#include "runtime/handles.inline.hpp" -- --symbolOop symbolKlass::allocate_symbol(u1* name, int len, TRAPS) { -- // Don't allow symbol oops to be created which cannot fit in a symbolOop. -- if (len > symbolOopDesc::max_length()) { -- THROW_MSG_0(vmSymbols::java_lang_InternalError(), -- "name is too long to represent"); -- } -- int size = symbolOopDesc::object_size(len); -- symbolKlassHandle h_k(THREAD, as_klassOop()); -- symbolOop sym = (symbolOop) -- CollectedHeap::permanent_obj_allocate(h_k, size, CHECK_NULL); -- assert(!sym->is_parsable(), "not expecting parsability yet."); -- No_Safepoint_Verifier no_safepoint; -- sym->set_utf8_length(len); -- for (int i = 0; i < len; i++) { -- sym->byte_at_put(i, name[i]); -- } -- // Let the first emptySymbol be created and -- // ensure only one is ever created. -- assert(sym->is_parsable() || Universe::emptySymbol() == NULL, -- "should be parsable here."); -- return sym; --} -- --bool symbolKlass::allocate_symbols(int names_count, const char** names, -- int* lengths, symbolOop* sym_oops, TRAPS) { -- if (UseConcMarkSweepGC || UseParallelGC) { -- // Concurrent GC needs to mark all the allocated symbol oops after -- // the remark phase which isn't done below (except the first symbol oop). -- // So return false which will let the symbols be allocated one by one. -- // The parallel collector uses an object start array to find the -- // start of objects on a dirty card. The object start array is not -- // updated for the start of each symbol so is not precise. During -- // object array verification this causes a verification failure. -- // In a product build this causes extra searching for the start of -- // a symbol. As with the concurrent collector a return of false will -- // cause each symbol to be allocated separately and in the case -- // of the parallel collector will cause the object -- // start array to be updated. -- return false; -- } -- -- assert(names_count > 0, "can't allocate 0 symbols"); -- -- int total_size = 0; -- int i, sizes[SymbolTable::symbol_alloc_batch_size]; -- for (i=0; i<names_count; i++) { -- int len = lengths[i]; -- if (len > symbolOopDesc::max_length()) { -- return false; -- } -- int sz = symbolOopDesc::object_size(len); -- sizes[i] = sz * HeapWordSize; -- total_size += sz; -- } -- symbolKlassHandle h_k(THREAD, as_klassOop()); -- HeapWord* base = Universe::heap()->permanent_mem_allocate(total_size); -- if (base == NULL) { -- return false; -- } -- -- // CAN'T take any safepoint during the initialization of the symbol oops ! -- No_Safepoint_Verifier nosafepoint; -- -- klassOop sk = h_k(); -- int pos = 0; -- for (i=0; i<names_count; i++) { -- symbolOop s = (symbolOop) (((char*)base) + pos); -- s->set_mark(markOopDesc::prototype()); -- s->set_klass(sk); -- s->set_utf8_length(lengths[i]); -- const char* name = names[i]; -- for (int j=0; j<lengths[i]; j++) { -- s->byte_at_put(j, name[j]); -- } -- -- assert(s->is_parsable(), "should be parsable here."); -- -- sym_oops[i] = s; -- pos += sizes[i]; -- } -- return true; --} -- --klassOop symbolKlass::create_klass(TRAPS) { -- symbolKlass o; -- KlassHandle h_this_klass(THREAD, Universe::klassKlassObj()); -- KlassHandle k = base_create_klass(h_this_klass, header_size(), o.vtbl_value(), CHECK_NULL); -- // Make sure size calculation is right -- assert(k()->size() == align_object_size(header_size()), "wrong size for object"); --// java_lang_Class::create_mirror(k, CHECK_NULL); // Allocate mirror -- return k(); --} -- --int symbolKlass::oop_size(oop obj) const { -- assert(obj->is_symbol(),"must be a symbol"); -- symbolOop s = symbolOop(obj); -- int size = s->object_size(); -- return size; --} -- --bool symbolKlass::oop_is_parsable(oop obj) const { -- assert(obj->is_symbol(),"must be a symbol"); -- symbolOop s = symbolOop(obj); -- return s->object_is_parsable(); --} -- --void symbolKlass::oop_follow_contents(oop obj) { -- assert (obj->is_symbol(), "object must be symbol"); -- // Performance tweak: We skip iterating over the klass pointer since we -- // know that Universe::symbolKlassObj never moves. -- // Note: do not follow next link here (see SymbolTable::follow_contents) --} -- --#ifndef SERIALGC --void symbolKlass::oop_follow_contents(ParCompactionManager* cm, oop obj) { -- assert (obj->is_symbol(), "object must be symbol"); -- // Performance tweak: We skip iterating over the klass pointer since we -- // know that Universe::symbolKlassObj never moves. -- // Note: do not follow next link here (see SymbolTable::follow_contents) --} --#endif // SERIALGC -- --int symbolKlass::oop_oop_iterate(oop obj, OopClosure* blk) { -- assert(obj->is_symbol(), "object must be symbol"); -- symbolOop s = symbolOop(obj); -- // Get size before changing pointers. -- // Don't call size() or oop_size() since that is a virtual call. -- int size = s->object_size(); -- // Performance tweak: We skip iterating over the klass pointer since we -- // know that Universe::symbolKlassObj never moves. -- return size; --} -- -- --int symbolKlass::oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) { -- assert(obj->is_symbol(), "object must be symbol"); -- symbolOop s = symbolOop(obj); -- // Get size before changing pointers. -- // Don't call size() or oop_size() since that is a virtual call. -- int size = s->object_size(); -- // Performance tweak: We skip iterating over the klass pointer since we -- // know that Universe::symbolKlassObj never moves. -- return size; --} -- -- --int symbolKlass::oop_adjust_pointers(oop obj) { -- assert(obj->is_symbol(), "should be symbol"); -- symbolOop s = symbolOop(obj); -- // Get size before changing pointers. -- // Don't call size() or oop_size() since that is a virtual call. -- int size = s->object_size(); -- // Performance tweak: We skip iterating over the klass pointer since we -- // know that Universe::symbolKlassObj never moves. -- return size; --} -- -- --#ifndef SERIALGC --void symbolKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { -- assert(obj->is_symbol(), "should be symbol"); --} -- --int symbolKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { -- assert(obj->is_symbol(), "should be symbol"); -- return symbolOop(obj)->object_size(); --} -- --int symbolKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- assert(obj->is_symbol(), "should be symbol"); -- return symbolOop(obj)->object_size(); --} --#endif // SERIALGC -- --#ifndef PRODUCT --// Printing -- --void symbolKlass::oop_print_on(oop obj, outputStream* st) { -- st->print("Symbol: '"); -- symbolOop(obj)->print_symbol_on(st); -- st->print("'"); --} -- --#endif //PRODUCT -- --void symbolKlass::oop_print_value_on(oop obj, outputStream* st) { -- symbolOop sym = symbolOop(obj); -- st->print("'"); -- for (int i = 0; i < sym->utf8_length(); i++) { -- st->print("%c", sym->byte_at(i)); -- } -- st->print("'"); --} -- --const char* symbolKlass::internal_name() const { -- return "{symbol}"; --} -diff --git a/src/share/vm/oops/symbolKlass.hpp b/src/share/vm/oops/symbolKlass.hpp -deleted file mode 100644 ---- openjdk/hotspot/src/share/vm/oops/symbolKlass.hpp -+++ /dev/null -@@ -1,81 +0,0 @@ --/* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- * -- */ -- --#ifndef SHARE_VM_OOPS_SYMBOLKLASS_HPP --#define SHARE_VM_OOPS_SYMBOLKLASS_HPP -- --#include "oops/typeArrayKlass.hpp" -- --// a symbolKlass is the klass for a symbolOop -- --class symbolKlass : public Klass { -- friend class VMStructs; -- private: -- juint _alloc_size; // allocation profiling support -- public: -- // Allocation -- DEFINE_ALLOCATE_PERMANENT(symbolKlass); -- static klassOop create_klass(TRAPS); -- symbolOop allocate_symbol(u1* name, int len, TRAPS); // Assumes no characters larger than 0x7F -- bool allocate_symbols(int names_count, const char** names, int* lengths, symbolOop* sym_oops, TRAPS); -- -- // Test operation -- bool oop_is_symbol() const { return true; } -- -- // Casting from klassOop -- static symbolKlass* cast(klassOop k) { -- assert(k->klass_part()->oop_is_symbol(), "cast to symbolKlass"); -- return (symbolKlass*) k->klass_part(); -- } -- -- static int header_size() { return oopDesc::header_size() + sizeof(symbolKlass)/HeapWordSize; } -- int oop_size(oop obj) const; -- int klass_oop_size() const { return object_size(); } -- int object_size() const { return align_object_size(header_size()); } -- -- // Garbage collection -- void oop_follow_contents(oop obj); -- int oop_adjust_pointers(oop obj); -- bool oop_is_parsable(oop obj) const; -- -- // Parallel Scavenge and Parallel Old -- PARALLEL_GC_DECLS -- -- // Allocation profiling support -- juint alloc_size() const { return _alloc_size; } -- void set_alloc_size(juint n) { _alloc_size = n; } -- -- // Iterators -- int oop_oop_iterate(oop obj, OopClosure* blk); -- int oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr); -- -- // Printing -- void oop_print_value_on(oop obj, outputStream* st); --#ifndef PRODUCT -- void oop_print_on(oop obj, outputStream* st); --#endif //PRODUCT -- const char* internal_name() const; --}; -- --#endif // SHARE_VM_OOPS_SYMBOLKLASS_HPP -diff --git a/src/share/vm/oops/typeArrayKlass.cpp b/src/share/vm/oops/typeArrayKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp -@@ -53,16 +53,15 @@ - const char* name_str, TRAPS) { - typeArrayKlass o; - -- symbolHandle sym(symbolOop(NULL)); -- // bootstrapping: don't create sym if symbolKlass not created yet -- if (Universe::symbolKlassObj() != NULL && name_str != NULL) { -- sym = oopFactory::new_symbol_handle(name_str, CHECK_NULL); -+ Symbol* sym = NULL; -+ if (name_str != NULL) { -+ sym = SymbolTable::new_symbol(name_str, CHECK_NULL); - } - KlassHandle klassklass (THREAD, Universe::typeArrayKlassKlassObj()); - - arrayKlassHandle k = base_create_array_klass(o.vtbl_value(), header_size(), klassklass, CHECK_NULL); - typeArrayKlass* ak = typeArrayKlass::cast(k()); -- ak->set_name(sym()); -+ ak->set_name(sym); - ak->set_layout_helper(array_layout_helper(type)); - assert(scale == (1 << ak->log2_element_size()), "scale must check out"); - assert(ak->oop_is_javaArray(), "sanity"); -diff --git a/src/share/vm/opto/runtime.cpp b/src/share/vm/opto/runtime.cpp ---- openjdk/hotspot/src/share/vm/opto/runtime.cpp -+++ openjdk/hotspot/src/share/vm/opto/runtime.cpp -@@ -477,7 +477,7 @@ - const TypeFunc *OptoRuntime::uncommon_trap_Type() { - // create input type (domain) - const Type **fields = TypeTuple::fields(1); -- // symbolOop name of class to be loaded -+ // Symbol* name of class to be loaded - fields[TypeFunc::Parms+0] = TypeInt::INT; - const TypeTuple *domain = TypeTuple::make(TypeFunc::Parms+1, fields); - -@@ -586,7 +586,7 @@ - const TypeFunc *OptoRuntime::Math_D_D_Type() { - // create input type (domain) - const Type **fields = TypeTuple::fields(2); -- // symbolOop name of class to be loaded -+ // Symbol* name of class to be loaded - fields[TypeFunc::Parms+0] = Type::DOUBLE; - fields[TypeFunc::Parms+1] = Type::HALF; - const TypeTuple *domain = TypeTuple::make(TypeFunc::Parms+2, fields); -diff --git a/src/share/vm/precompiled.hpp b/src/share/vm/precompiled.hpp ---- openjdk/hotspot/src/share/vm/precompiled.hpp -+++ openjdk/hotspot/src/share/vm/precompiled.hpp -@@ -169,7 +169,7 @@ - # include "oops/oop.inline.hpp" - # include "oops/oop.inline2.hpp" - # include "oops/oopsHierarchy.hpp" --# include "oops/symbolOop.hpp" -+# include "oops/symbol.hpp" - # include "oops/typeArrayKlass.hpp" - # include "oops/typeArrayOop.hpp" - # include "prims/jni.h" -diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp ---- openjdk/hotspot/src/share/vm/prims/jni.cpp -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp -@@ -40,7 +40,7 @@ - #include "oops/objArrayKlass.hpp" - #include "oops/objArrayOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "oops/typeArrayKlass.hpp" - #include "oops/typeArrayOop.hpp" - #include "prims/jni.h" -@@ -338,16 +338,15 @@ - - // Since exceptions can be thrown, class initialization can take place - // if name is NULL no check for class name in .class stream has to be made. -- symbolHandle class_name; - if (name != NULL) { - const int str_len = (int)strlen(name); -- if (str_len > symbolOopDesc::max_length()) { -+ if (str_len > Symbol::max_length()) { - // It's impossible to create this class; the name cannot fit - // into the constant pool. - THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name); - } -- class_name = oopFactory::new_symbol_handle(name, str_len, CHECK_NULL); - } -+ TempNewSymbol class_name = SymbolTable::new_symbol(name, THREAD); - - ResourceMark rm(THREAD); - ClassFileStream st((u1*) buf, bufLen, NULL); -@@ -394,7 +393,7 @@ - - // Sanity check the name: it cannot be null or larger than the maximum size - // name we can fit in the constant pool. -- if (name == NULL || (int)strlen(name) > symbolOopDesc::max_length()) { -+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) { - THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name); - } - -@@ -411,8 +410,8 @@ - k->name() == vmSymbols::java_lang_ClassLoader_NativeLibrary()) { - JavaValue result(T_OBJECT); - JavaCalls::call_static(&result, k, -- vmSymbolHandles::getFromClass_name(), -- vmSymbolHandles::void_class_signature(), -+ vmSymbols::getFromClass_name(), -+ vmSymbols::void_class_signature(), - thread); - if (HAS_PENDING_EXCEPTION) { - Handle ex(thread, thread->pending_exception()); -@@ -430,7 +429,7 @@ - loader = Handle(THREAD, SystemDictionary::java_system_loader()); - } - -- symbolHandle sym = oopFactory::new_symbol_handle(name, CHECK_NULL); -+ TempNewSymbol sym = SymbolTable::new_symbol(name, CHECK_NULL); - result = find_class_from_class_loader(env, sym, true, loader, - protection_domain, true, thread); - -@@ -609,7 +608,7 @@ - DT_RETURN_MARK(ThrowNew, jint, (const jint&)ret); - - instanceKlass* k = instanceKlass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(clazz))); -- symbolHandle name = symbolHandle(THREAD, k->name()); -+ Symbol* name = k->name(); - Handle class_loader (THREAD, k->class_loader()); - Handle protection_domain (THREAD, k->protection_domain()); - THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK); -@@ -663,8 +662,8 @@ - ex, - KlassHandle(THREAD, - SystemDictionary::Throwable_klass()), -- vmSymbolHandles::printStackTrace_name(), -- vmSymbolHandles::void_method_signature(), -+ vmSymbols::printStackTrace_name(), -+ vmSymbols::void_method_signature(), - THREAD); - // If an exception is thrown in the call it gets thrown away. Not much - // we can do with it. The native code that calls this, does not check -@@ -838,8 +837,7 @@ - virtual void get_double () = 0; - virtual void get_object () = 0; - -- JNI_ArgumentPusher(Thread *thread, symbolOop signature) -- : SignatureIterator(thread, signature) { -+ JNI_ArgumentPusher(Symbol* signature) : SignatureIterator(signature) { - this->_return_type = T_ILLEGAL; - _arguments = NULL; - } -@@ -895,12 +893,12 @@ - } - - public: -- JNI_ArgumentPusherVaArg(Thread *thread, symbolOop signature, va_list rap) -- : JNI_ArgumentPusher(thread, signature) { -+ JNI_ArgumentPusherVaArg(Symbol* signature, va_list rap) -+ : JNI_ArgumentPusher(signature) { - set_ap(rap); - } -- JNI_ArgumentPusherVaArg(Thread *thread, jmethodID method_id, va_list rap) -- : JNI_ArgumentPusher(thread, JNIHandles::resolve_jmethod_id(method_id)->signature()) { -+ JNI_ArgumentPusherVaArg(jmethodID method_id, va_list rap) -+ : JNI_ArgumentPusher(JNIHandles::resolve_jmethod_id(method_id)->signature()) { - set_ap(rap); - } - -@@ -966,12 +964,12 @@ - inline void set_ap(const jvalue *rap) { _ap = rap; } - - public: -- JNI_ArgumentPusherArray(Thread *thread, symbolOop signature, const jvalue *rap) -- : JNI_ArgumentPusher(thread, signature) { -+ JNI_ArgumentPusherArray(Symbol* signature, const jvalue *rap) -+ : JNI_ArgumentPusher(signature) { - set_ap(rap); - } -- JNI_ArgumentPusherArray(Thread *thread, jmethodID method_id, const jvalue *rap) -- : JNI_ArgumentPusher(thread, JNIHandles::resolve_jmethod_id(method_id)->signature()) { -+ JNI_ArgumentPusherArray(jmethodID method_id, const jvalue *rap) -+ : JNI_ArgumentPusher(JNIHandles::resolve_jmethod_id(method_id)->signature()) { - set_ap(rap); - } - -@@ -1038,8 +1036,8 @@ - KlassHandle recv_klass; // Default to NULL (use of ?: can confuse gcc) - if (recv.not_null()) recv_klass = KlassHandle(THREAD, recv->klass()); - KlassHandle spec_klass (THREAD, method->method_holder()); -- symbolHandle name (THREAD, method->name()); -- symbolHandle signature (THREAD, method->signature()); -+ Symbol* name = method->name(); -+ Symbol* signature = method->signature(); - CallInfo info; - LinkResolver::resolve_interface_call(info, recv, recv_klass, spec_klass, name, signature, KlassHandle(), false, true, CHECK_(methodHandle())); - return info.selected_method(); -@@ -1051,8 +1049,8 @@ - KlassHandle recv_klass; // Default to NULL (use of ?: can confuse gcc) - if (recv.not_null()) recv_klass = KlassHandle(THREAD, recv->klass()); - KlassHandle spec_klass (THREAD, method->method_holder()); -- symbolHandle name (THREAD, method->name()); -- symbolHandle signature (THREAD, method->signature()); -+ Symbol* name = method->name(); -+ Symbol* signature = method->signature(); - CallInfo info; - LinkResolver::resolve_virtual_call(info, recv, recv_klass, spec_klass, name, signature, KlassHandle(), false, true, CHECK_(methodHandle())); - return info.selected_method(); -@@ -1073,7 +1071,7 @@ - assert(method->is_static(), "method should be static"); - - // Fill out JavaCallArguments object -- args->iterate( Fingerprinter(THREAD, method).fingerprint() ); -+ args->iterate( Fingerprinter(method).fingerprint() ); - // Initialize result type - result->set_type(args->get_ret_type()); - -@@ -1149,7 +1147,7 @@ - args->push_receiver(h_recv); // Push jobject handle - - // Fill out JavaCallArguments object -- args->iterate( Fingerprinter(THREAD, method).fingerprint() ); -+ args->iterate( Fingerprinter(method).fingerprint() ); - // Initialize result type - result->set_type(args->get_ret_type()); - -@@ -1196,7 +1194,7 @@ - instanceOop i = alloc_object(clazz, CHECK_NULL); - obj = JNIHandles::make_local(env, i); - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherArray ap(THREAD, methodID, args); -+ JNI_ArgumentPusherArray ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_NULL); - return obj; - JNI_END -@@ -1212,7 +1210,7 @@ - instanceOop i = alloc_object(clazz, CHECK_NULL); - obj = JNIHandles::make_local(env, i); - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_NULL); - return obj; - JNI_END -@@ -1230,7 +1228,7 @@ - va_list args; - va_start(args, methodID); - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_NULL); - va_end(args); - return obj; -@@ -1271,16 +1269,13 @@ - // The class should have been loaded (we have an instance of the class - // passed in) so the method and signature should already be in the symbol - // table. If they're not there, the method doesn't exist. -- symbolHandle signature = -- symbolHandle(THREAD, SymbolTable::probe(sig, (int)strlen(sig))); -- symbolHandle name; -- if (name_str == NULL) { -- name = vmSymbolHandles::object_initializer_name(); -- } else { -- name = symbolHandle(THREAD, -- SymbolTable::probe(name_str, (int)strlen(name_str))); -- } -- if (name.is_null() || signature.is_null()) { -+ const char *name_to_probe = (name_str == NULL) -+ ? vmSymbols::object_initializer_name()->as_C_string() -+ : name_str; -+ TempNewSymbol name = SymbolTable::probe(name_to_probe, (int)strlen(name_to_probe)); -+ TempNewSymbol signature = SymbolTable::probe(sig, (int)strlen(sig)); -+ -+ if (name == NULL || signature == NULL) { - THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), name_str); - } - -@@ -1298,20 +1293,20 @@ - Klass::cast(klass())->initialize(CHECK_NULL); - - methodOop m; -- if (name() == vmSymbols::object_initializer_name() || -- name() == vmSymbols::class_initializer_name()) { -+ if (name == vmSymbols::object_initializer_name() || -+ name == vmSymbols::class_initializer_name()) { - // Never search superclasses for constructors - if (klass->oop_is_instance()) { -- m = instanceKlass::cast(klass())->find_method(name(), signature()); -+ m = instanceKlass::cast(klass())->find_method(name, signature); - } else { - m = NULL; - } - } else { -- m = klass->lookup_method(name(), signature()); -+ m = klass->lookup_method(name, signature); - // Look up interfaces - if (m == NULL && klass->oop_is_instance()) { -- m = instanceKlass::cast(klass())->lookup_method_in_all_interfaces(name(), -- signature()); -+ m = instanceKlass::cast(klass())->lookup_method_in_all_interfaces(name, -+ signature); - } - } - if (m == NULL || (m->is_static() != is_static)) { -@@ -1365,7 +1360,7 @@ - va_list args; \ - va_start(args, methodID); \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherVaArg ap(methodID, args); \ - jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ - va_end(args); \ - ret = jvalue.get_##ResultType(); \ -@@ -1383,7 +1378,7 @@ - (const ResultType&)ret);\ - \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherVaArg ap(methodID, args); \ - jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ - ret = jvalue.get_##ResultType(); \ - return ret;\ -@@ -1399,7 +1394,7 @@ - (const ResultType&)ret);\ - \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherArray ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherArray ap(methodID, args); \ - jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ - ret = jvalue.get_##ResultType(); \ - return ret;\ -@@ -1429,7 +1424,7 @@ - va_list args; - va_start(args, methodID); - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK); - va_end(args); - JNI_END -@@ -1441,7 +1436,7 @@ - DT_VOID_RETURN_MARK(CallVoidMethodV); - - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK); - JNI_END - -@@ -1452,7 +1447,7 @@ - DT_VOID_RETURN_MARK(CallVoidMethodA); - - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherArray ap(THREAD, methodID, args); -+ JNI_ArgumentPusherArray ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK); - JNI_END - -@@ -1475,7 +1470,7 @@ - va_list args; \ - va_start(args, methodID); \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherVaArg ap(methodID, args); \ - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ - va_end(args); \ - ret = jvalue.get_##ResultType(); \ -@@ -1491,7 +1486,7 @@ - (const ResultType&)ret);\ - \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherVaArg ap(methodID, args); \ - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ - ret = jvalue.get_##ResultType(); \ - return ret;\ -@@ -1506,7 +1501,7 @@ - (const ResultType&)ret);\ - \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherArray ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherArray ap(methodID, args); \ - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ - ret = jvalue.get_##ResultType(); \ - return ret;\ -@@ -1539,7 +1534,7 @@ - va_list args; - va_start(args, methodID); - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK); - va_end(args); - JNI_END -@@ -1553,7 +1548,7 @@ - DT_VOID_RETURN_MARK(CallNonvirtualVoidMethodV); - - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK); - JNI_END - -@@ -1564,7 +1559,7 @@ - env, obj, cls, methodID); - DT_VOID_RETURN_MARK(CallNonvirtualVoidMethodA); - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherArray ap(THREAD, methodID, args); -+ JNI_ArgumentPusherArray ap(methodID, args); - jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK); - JNI_END - -@@ -1587,7 +1582,7 @@ - va_list args; \ - va_start(args, methodID); \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherVaArg ap(methodID, args); \ - jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ - va_end(args); \ - ret = jvalue.get_##ResultType(); \ -@@ -1603,7 +1598,7 @@ - (const ResultType&)ret);\ - \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherVaArg ap(methodID, args); \ - jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ - ret = jvalue.get_##ResultType(); \ - return ret;\ -@@ -1618,7 +1613,7 @@ - (const ResultType&)ret);\ - \ - JavaValue jvalue(Tag); \ -- JNI_ArgumentPusherArray ap(THREAD, methodID, args); \ -+ JNI_ArgumentPusherArray ap(methodID, args); \ - jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ - ret = jvalue.get_##ResultType(); \ - return ret;\ -@@ -1649,7 +1644,7 @@ - va_list args; - va_start(args, methodID); - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK); - va_end(args); - JNI_END -@@ -1661,7 +1656,7 @@ - DT_VOID_RETURN_MARK(CallStaticVoidMethodV); - - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherVaArg ap(THREAD, methodID, args); -+ JNI_ArgumentPusherVaArg ap(methodID, args); - jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK); - JNI_END - -@@ -1672,7 +1667,7 @@ - DT_VOID_RETURN_MARK(CallStaticVoidMethodA); - - JavaValue jvalue(T_VOID); -- JNI_ArgumentPusherArray ap(THREAD, methodID, args); -+ JNI_ArgumentPusherArray ap(methodID, args); - jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK); - JNI_END - -@@ -1694,11 +1689,9 @@ - // The class should have been loaded (we have an instance of the class - // passed in) so the field and signature should already be in the symbol - // table. If they're not there, the field doesn't exist. -- symbolHandle fieldname = -- symbolHandle(THREAD, SymbolTable::probe(name, (int)strlen(name))); -- symbolHandle signame = -- symbolHandle(THREAD, SymbolTable::probe(sig, (int)strlen(sig))); -- if (fieldname.is_null() || signame.is_null()) { -+ TempNewSymbol fieldname = SymbolTable::probe(name, (int)strlen(name)); -+ TempNewSymbol signame = SymbolTable::probe(sig, (int)strlen(sig)); -+ if (fieldname == NULL || signame == NULL) { - THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name); - } - KlassHandle k(THREAD, -@@ -1708,7 +1701,7 @@ - - fieldDescriptor fd; - if (!Klass::cast(k())->oop_is_instance() || -- !instanceKlass::cast(k())->find_field(fieldname(), signame(), false, &fd)) { -+ !instanceKlass::cast(k())->find_field(fieldname, signame, false, &fd)) { - THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name); - } - -@@ -1893,11 +1886,9 @@ - // The class should have been loaded (we have an instance of the class - // passed in) so the field and signature should already be in the symbol - // table. If they're not there, the field doesn't exist. -- symbolHandle fieldname = -- symbolHandle(THREAD, SymbolTable::probe(name, (int)strlen(name))); -- symbolHandle signame = -- symbolHandle(THREAD, SymbolTable::probe(sig, (int)strlen(sig))); -- if (fieldname.is_null() || signame.is_null()) { -+ TempNewSymbol fieldname = SymbolTable::probe(name, (int)strlen(name)); -+ TempNewSymbol signame = SymbolTable::probe(sig, (int)strlen(sig)); -+ if (fieldname == NULL || signame == NULL) { - THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name); - } - KlassHandle k(THREAD, -@@ -1907,7 +1898,7 @@ - - fieldDescriptor fd; - if (!Klass::cast(k())->oop_is_instance() || -- !instanceKlass::cast(k())->find_field(fieldname(), signame(), true, &fd)) { -+ !instanceKlass::cast(k())->find_field(fieldname, signame, true, &fd)) { - THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name); - } - -@@ -2387,7 +2378,7 @@ - // to see if the native method is now wrapped with the prefixes. See the - // SetNativeMethodPrefix(es) functions in the JVM TI Spec for details. - static methodOop find_prefixed_native(KlassHandle k, -- symbolHandle name, symbolHandle signature, TRAPS) { -+ Symbol* name, Symbol* signature, TRAPS) { - ResourceMark rm(THREAD); - methodOop method; - int name_len = name->utf8_length(); -@@ -2403,11 +2394,11 @@ - char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1); - strcpy(trial_name_str, prefix); - strcat(trial_name_str, name_str); -- symbolHandle trial_name(THREAD, SymbolTable::probe(trial_name_str, trial_len)); -- if (trial_name.is_null()) { -+ TempNewSymbol trial_name = SymbolTable::probe(trial_name_str, trial_len); -+ if (trial_name == NULL) { - continue; // no such symbol, so this prefix wasn't used, try the next prefix - } -- method = Klass::cast(k())->lookup_method(trial_name(), signature()); -+ method = Klass::cast(k())->lookup_method(trial_name, signature); - if (method == NULL) { - continue; // signature doesn't match, try the next prefix - } -@@ -2422,13 +2413,13 @@ - return NULL; // not found - } - --static bool register_native(KlassHandle k, symbolHandle name, symbolHandle signature, address entry, TRAPS) { -- methodOop method = Klass::cast(k())->lookup_method(name(), signature()); -+static bool register_native(KlassHandle k, Symbol* name, Symbol* signature, address entry, TRAPS) { -+ methodOop method = Klass::cast(k())->lookup_method(name, signature); - if (method == NULL) { - ResourceMark rm; - stringStream st; - st.print("Method %s name or signature does not match", -- methodOopDesc::name_and_sig_as_C_string(Klass::cast(k()), name(), signature())); -+ methodOopDesc::name_and_sig_as_C_string(Klass::cast(k()), name, signature)); - THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), st.as_string(), false); - } - if (!method->is_native()) { -@@ -2438,7 +2429,7 @@ - ResourceMark rm; - stringStream st; - st.print("Method %s is not declared as native", -- methodOopDesc::name_and_sig_as_C_string(Klass::cast(k()), name(), signature())); -+ methodOopDesc::name_and_sig_as_C_string(Klass::cast(k()), name, signature)); - THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), st.as_string(), false); - } - } -@@ -2478,10 +2469,10 @@ - // The class should have been loaded (we have an instance of the class - // passed in) so the method and signature should already be in the symbol - // table. If they're not there, the method doesn't exist. -- symbolHandle name(THREAD, SymbolTable::probe(meth_name, meth_name_len)); -- symbolHandle signature(THREAD, SymbolTable::probe(meth_sig, (int)strlen(meth_sig))); -- -- if (name.is_null() || signature.is_null()) { -+ TempNewSymbol name = SymbolTable::probe(meth_name, meth_name_len); -+ TempNewSymbol signature = SymbolTable::probe(meth_sig, (int)strlen(meth_sig)); -+ -+ if (name == NULL || signature == NULL) { - ResourceMark rm; - stringStream st; - st.print("Method %s.%s%s not found", Klass::cast(h_k())->external_name(), meth_name, meth_sig); -@@ -2715,7 +2706,7 @@ - Handle loader; // null (bootstrap) loader - Handle protection_domain; // null protection domain - -- symbolHandle sym = oopFactory::new_symbol_handle(name, CHECK_NULL); -+ TempNewSymbol sym = SymbolTable::new_symbol(name, CHECK_NULL); - jclass result = find_class_from_class_loader(env, sym, true, loader, protection_domain, true, CHECK_NULL); - - if (TraceClassResolution && result != NULL) { -diff --git a/src/share/vm/prims/jniCheck.cpp b/src/share/vm/prims/jniCheck.cpp ---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp -@@ -27,7 +27,7 @@ - #include "classfile/vmSymbols.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jni.h" - #include "prims/jniCheck.hpp" - #include "prims/jvm_misc.hpp" -diff --git a/src/share/vm/prims/jvm.cpp b/src/share/vm/prims/jvm.cpp ---- openjdk/hotspot/src/share/vm/prims/jvm.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp -@@ -124,9 +124,9 @@ - vframeStream vfst(jthread); - - // scan up the stack skipping ClassLoader, AccessController and PrivilegedAction frames -- symbolHandle access_controller = oopFactory::new_symbol_handle("java/security/AccessController", CHECK); -+ TempNewSymbol access_controller = SymbolTable::new_symbol("java/security/AccessController", CHECK); - klassOop access_controller_klass = SystemDictionary::resolve_or_fail(access_controller, false, CHECK); -- symbolHandle privileged_action = oopFactory::new_symbol_handle("java/security/PrivilegedAction", CHECK); -+ TempNewSymbol privileged_action = SymbolTable::new_symbol("java/security/PrivilegedAction", CHECK); - klassOop privileged_action_klass = SystemDictionary::resolve_or_fail(privileged_action, false, CHECK); - - methodOop last_caller = NULL; -@@ -175,7 +175,7 @@ - // show method name if it's a native method - trace = vfst.method()->name_and_sig_as_C_string(); - } -- symbolOop s = instanceKlass::cast(caller)->source_file_name(); -+ Symbol* s = instanceKlass::cast(caller)->source_file_name(); - if (s != NULL) { - source_file = s->as_C_string(); - } -@@ -311,8 +311,8 @@ - JavaCalls::call_virtual(&r, - props, - KlassHandle(THREAD, SystemDictionary::Properties_klass()), -- vmSymbolHandles::put_name(), -- vmSymbolHandles::object_object_object_signature(), -+ vmSymbols::put_name(), -+ vmSymbols::object_object_object_signature(), - key_str, - value_str, - THREAD); -@@ -716,13 +716,13 @@ - JVMWrapper2("JVM_FindClassFromBootLoader %s", name); - - // Java libraries should ensure that name is never null... -- if (name == NULL || (int)strlen(name) > symbolOopDesc::max_length()) { -+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) { - // It's impossible to create this class; the name cannot fit - // into the constant pool. - return NULL; - } - -- symbolHandle h_name = oopFactory::new_symbol_handle(name, CHECK_NULL); -+ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL); - klassOop k = SystemDictionary::resolve_or_null(h_name, CHECK_NULL); - if (k == NULL) { - return NULL; -@@ -740,7 +740,7 @@ - JVMWrapper3("JVM_FindClassFromClassLoader %s throw %s", name, - throwError ? "error" : "exception"); - // Java libraries should ensure that name is never null... -- if (name == NULL || (int)strlen(name) > symbolOopDesc::max_length()) { -+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) { - // It's impossible to create this class; the name cannot fit - // into the constant pool. - if (throwError) { -@@ -749,7 +749,7 @@ - THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), name); - } - } -- symbolHandle h_name = oopFactory::new_symbol_handle(name, CHECK_NULL); -+ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL); - Handle h_loader(THREAD, JNIHandles::resolve(loader)); - jclass result = find_class_from_class_loader(env, h_name, init, h_loader, - Handle(), throwError, THREAD); -@@ -764,12 +764,12 @@ - JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name, - jboolean init, jclass from)) - JVMWrapper2("JVM_FindClassFromClass %s", name); -- if (name == NULL || (int)strlen(name) > symbolOopDesc::max_length()) { -+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) { - // It's impossible to create this class; the name cannot fit - // into the constant pool. - THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name); - } -- symbolHandle h_name = oopFactory::new_symbol_handle(name, CHECK_NULL); -+ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL); - oop from_class_oop = JNIHandles::resolve(from); - klassOop from_class = (from_class_oop == NULL) - ? (klassOop)NULL -@@ -838,15 +838,15 @@ - - // Since exceptions can be thrown, class initialization can take place - // if name is NULL no check for class name in .class stream has to be made. -- symbolHandle class_name; -+ TempNewSymbol class_name = NULL; - if (name != NULL) { - const int str_len = (int)strlen(name); -- if (str_len > symbolOopDesc::max_length()) { -+ if (str_len > Symbol::max_length()) { - // It's impossible to create this class; the name cannot fit - // into the constant pool. - THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name); - } -- class_name = oopFactory::new_symbol_handle(name, str_len, CHECK_NULL); -+ class_name = SymbolTable::new_symbol(name, str_len, CHECK_NULL); - } - - ResourceMark rm(THREAD); -@@ -905,12 +905,12 @@ - if (str == NULL) return NULL; - - const int str_len = (int)strlen(str); -- if (str_len > symbolOopDesc::max_length()) { -+ if (str_len > Symbol::max_length()) { - // It's impossible to create this class; the name cannot fit - // into the constant pool. - return NULL; - } -- symbolHandle klass_name = oopFactory::new_symbol_handle(str, str_len,CHECK_NULL); -+ TempNewSymbol klass_name = SymbolTable::new_symbol(str, str_len, CHECK_NULL); - - // Security Note: - // The Java level wrapper will perform the necessary security check allowing -@@ -1224,8 +1224,8 @@ - !pending_exception->is_a(SystemDictionary::RuntimeException_klass())) { - // Throw a java.security.PrivilegedActionException(Exception e) exception - JavaCallArguments args(pending_exception); -- THROW_ARG_0(vmSymbolHandles::java_security_PrivilegedActionException(), -- vmSymbolHandles::exception_void_signature(), -+ THROW_ARG_0(vmSymbols::java_security_PrivilegedActionException(), -+ vmSymbols::exception_void_signature(), - &args); - } - } -@@ -1521,8 +1521,8 @@ - if (!java_lang_Class::is_primitive(JNIHandles::resolve(cls))) { - klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve(cls)); - if (Klass::cast(k)->oop_is_instance()) { -- symbolHandle sym = symbolHandle(THREAD, instanceKlass::cast(k)->generic_signature()); -- if (sym.is_null()) return NULL; -+ Symbol* sym = instanceKlass::cast(k)->generic_signature(); -+ if (sym == NULL) return NULL; - Handle str = java_lang_String::create_from_symbol(sym, CHECK_NULL); - return (jstring) JNIHandles::make_local(env, str()); - } -@@ -1911,8 +1911,8 @@ - if (k_o == NULL) return NULL; - } - instanceKlassHandle k(THREAD, k_o); -- symbolOop name = cp->uncached_name_ref_at(index); -- symbolOop sig = cp->uncached_signature_ref_at(index); -+ Symbol* name = cp->uncached_name_ref_at(index); -+ Symbol* sig = cp->uncached_signature_ref_at(index); - methodHandle m (THREAD, k->find_method(name, sig)); - if (m.is_null()) { - THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "Unable to look up method in target class"); -@@ -1962,8 +1962,8 @@ - if (k_o == NULL) return NULL; - } - instanceKlassHandle k(THREAD, k_o); -- symbolOop name = cp->uncached_name_ref_at(index); -- symbolOop sig = cp->uncached_signature_ref_at(index); -+ Symbol* name = cp->uncached_name_ref_at(index); -+ Symbol* sig = cp->uncached_signature_ref_at(index); - fieldDescriptor fd; - klassOop target_klass = k->find_field(name, sig, &fd); - if (target_klass == NULL) { -@@ -2006,9 +2006,9 @@ - THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index"); - } - int klass_ref = cp->uncached_klass_ref_index_at(index); -- symbolHandle klass_name (THREAD, cp->klass_name_at(klass_ref)); -- symbolHandle member_name(THREAD, cp->uncached_name_ref_at(index)); -- symbolHandle member_sig (THREAD, cp->uncached_signature_ref_at(index)); -+ Symbol* klass_name = cp->klass_name_at(klass_ref); -+ Symbol* member_name = cp->uncached_name_ref_at(index); -+ Symbol* member_sig = cp->uncached_signature_ref_at(index); - objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::String_klass(), 3, CHECK_NULL); - objArrayHandle dest(THREAD, dest_o); - Handle str = java_lang_String::create_from_symbol(klass_name, CHECK_NULL); -@@ -2097,8 +2097,7 @@ - if (!tag.is_symbol()) { - THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index"); - } -- symbolOop sym_o = cp->symbol_at(index); -- symbolHandle sym(THREAD, sym_o); -+ Symbol* sym = cp->symbol_at(index); - Handle str = java_lang_String::create_from_symbol(sym, CHECK_NULL); - return (jstring) JNIHandles::make_local(str()); - } -@@ -2425,7 +2424,7 @@ - klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls)); - k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread); - constantPoolOop cp = instanceKlass::cast(k)->constants(); -- symbolOop classname = cp->klass_name_at(cp_index); -+ Symbol* classname = cp->klass_name_at(cp_index); - return classname->as_utf8(); - JVM_END - -@@ -2438,7 +2437,7 @@ - switch (cp->tag_at(cp_index).value()) { - case JVM_CONSTANT_Fieldref: { - int class_index = cp->uncached_klass_ref_index_at(cp_index); -- symbolOop classname = cp->klass_name_at(class_index); -+ Symbol* classname = cp->klass_name_at(class_index); - return classname->as_utf8(); - } - default: -@@ -2458,7 +2457,7 @@ - case JVM_CONSTANT_Methodref: - case JVM_CONSTANT_InterfaceMethodref: { - int class_index = cp->uncached_klass_ref_index_at(cp_index); -- symbolOop classname = cp->klass_name_at(class_index); -+ Symbol* classname = cp->klass_name_at(class_index); - return classname->as_utf8(); - } - default: -@@ -2479,8 +2478,8 @@ - constantPoolOop cp_called = instanceKlass::cast(k_called)->constants(); - switch (cp->tag_at(cp_index).value()) { - case JVM_CONSTANT_Fieldref: { -- symbolOop name = cp->uncached_name_ref_at(cp_index); -- symbolOop signature = cp->uncached_signature_ref_at(cp_index); -+ Symbol* name = cp->uncached_name_ref_at(cp_index); -+ Symbol* signature = cp->uncached_signature_ref_at(cp_index); - typeArrayOop fields = instanceKlass::cast(k_called)->fields(); - int fields_count = fields->length(); - for (int i = 0; i < fields_count; i += instanceKlass::next_offset) { -@@ -2509,8 +2508,8 @@ - switch (cp->tag_at(cp_index).value()) { - case JVM_CONSTANT_Methodref: - case JVM_CONSTANT_InterfaceMethodref: { -- symbolOop name = cp->uncached_name_ref_at(cp_index); -- symbolOop signature = cp->uncached_signature_ref_at(cp_index); -+ Symbol* name = cp->uncached_name_ref_at(cp_index); -+ Symbol* signature = cp->uncached_signature_ref_at(cp_index); - objArrayOop methods = instanceKlass::cast(k_called)->methods(); - int methods_count = methods->length(); - for (int i = 0; i < methods_count; i++) { -@@ -2698,8 +2697,8 @@ - JavaCalls::call_virtual(&result, - obj, - KlassHandle(THREAD, SystemDictionary::Thread_klass()), -- vmSymbolHandles::run_method_name(), -- vmSymbolHandles::void_method_signature(), -+ vmSymbols::run_method_name(), -+ vmSymbols::void_method_signature(), - THREAD); - } - -@@ -3175,9 +3174,8 @@ - Handle class_name_str = java_lang_String::internalize_classname(h_name, CHECK_0); - - const char* str = java_lang_String::as_utf8_string(class_name_str()); -- symbolHandle class_name_sym = -- symbolHandle(THREAD, SymbolTable::probe(str, (int)strlen(str))); -- if (class_name_sym.is_null()) { -+ TempNewSymbol class_name_sym = SymbolTable::probe(str, (int)strlen(str)); -+ if (class_name_sym == NULL) { - return -1; - } - -@@ -3187,7 +3185,7 @@ - if (!vfst.method()->is_native()) { - klassOop holder = vfst.method()->method_holder(); - assert(holder->is_klass(), "just checking"); -- if (instanceKlass::cast(holder)->name() == class_name_sym()) { -+ if (instanceKlass::cast(holder)->name() == class_name_sym) { - return depth; - } - depth++; -@@ -3386,13 +3384,13 @@ - - const char* str = java_lang_String::as_utf8_string(string()); - -- if (str == NULL || (int)strlen(str) > symbolOopDesc::max_length()) { -+ if (str == NULL || (int)strlen(str) > Symbol::max_length()) { - // It's impossible to create this class; the name cannot fit - // into the constant pool. - THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), str); - } - -- symbolHandle name = oopFactory::new_symbol_handle(str, CHECK_NULL); -+ TempNewSymbol name = SymbolTable::new_symbol(str, CHECK_NULL); - Handle curr_klass (THREAD, JNIHandles::resolve(currClass)); - // Find the most recent class on the stack with a non-null classloader - oop loader = NULL; -@@ -4035,7 +4033,7 @@ - - // Shared JNI/JVM entry points ////////////////////////////////////////////////////////////// - --jclass find_class_from_class_loader(JNIEnv* env, symbolHandle name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS) { -+jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS) { - // Security Note: - // The Java level wrapper will perform the necessary security check allowing - // us to pass the NULL as the initiating class loader. -@@ -4131,14 +4129,13 @@ - Handle str (THREAD, JNIHandles::resolve_non_null(name)); - - const char* cstr = java_lang_String::as_utf8_string(str()); -- symbolHandle field_name = -- symbolHandle(THREAD, SymbolTable::probe(cstr, (int)strlen(cstr))); -- if (field_name.is_null()) { -+ TempNewSymbol field_name = SymbolTable::probe(cstr, (int)strlen(cstr)); -+ if (field_name == NULL) { - THROW_0(vmSymbols::java_lang_NoSuchFieldException()); - } - - oop mirror = JNIHandles::resolve_non_null(cls); -- oop result = Reflection::reflect_field(mirror, field_name(), which, CHECK_NULL); -+ oop result = Reflection::reflect_field(mirror, field_name, which, CHECK_NULL); - if (result == NULL) { - THROW_0(vmSymbols::java_lang_NoSuchFieldException()); - } -@@ -4155,9 +4152,8 @@ - Handle str (THREAD, JNIHandles::resolve_non_null(name)); - - const char* cstr = java_lang_String::as_utf8_string(str()); -- symbolHandle method_name = -- symbolHandle(THREAD, SymbolTable::probe(cstr, (int)strlen(cstr))); -- if (method_name.is_null()) { -+ TempNewSymbol method_name = SymbolTable::probe(cstr, (int)strlen(cstr)); -+ if (method_name == NULL) { - THROW_0(vmSymbols::java_lang_NoSuchMethodException()); - } - -@@ -4530,16 +4526,14 @@ - dest->obj_at_put(0, Klass::cast(enc_k)->java_mirror()); - int encl_method_method_idx = ik_h->enclosing_method_method_index(); - if (encl_method_method_idx != 0) { -- symbolOop sym_o = ik_h->constants()->symbol_at( -+ Symbol* sym = ik_h->constants()->symbol_at( - extract_low_short_from_int( - ik_h->constants()->name_and_type_at(encl_method_method_idx))); -- symbolHandle sym(THREAD, sym_o); - Handle str = java_lang_String::create_from_symbol(sym, CHECK_NULL); - dest->obj_at_put(1, str()); -- sym_o = ik_h->constants()->symbol_at( -+ sym = ik_h->constants()->symbol_at( - extract_high_short_from_int( - ik_h->constants()->name_and_type_at(encl_method_method_idx))); -- sym = symbolHandle(THREAD, sym_o); - str = java_lang_String::create_from_symbol(sym, CHECK_NULL); - dest->obj_at_put(2, str()); - } -diff --git a/src/share/vm/prims/jvm_misc.hpp b/src/share/vm/prims/jvm_misc.hpp ---- openjdk/hotspot/src/share/vm/prims/jvm_misc.hpp -+++ openjdk/hotspot/src/share/vm/prims/jvm_misc.hpp -@@ -31,7 +31,7 @@ - // Useful entry points shared by JNI and JVM interface. - // We do not allow real JNI or JVM entry point to call each other. - --jclass find_class_from_class_loader(JNIEnv* env, symbolHandle name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS); -+jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS); - - void trace_class_resolution(klassOop to_class); - -diff --git a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp -@@ -461,11 +461,11 @@ - // JVMSpec| attribute_info attributes[attributes_count]; - void JvmtiClassFileReconstituter::write_class_attributes() { - u2 inner_classes_length = inner_classes_attribute_length(); -- symbolHandle generic_signature(thread(), ikh()->generic_signature()); -+ Symbol* generic_signature = ikh()->generic_signature(); - typeArrayHandle anno(thread(), ikh()->class_annotations()); - - int attr_count = 0; -- if (generic_signature() != NULL) { -+ if (generic_signature != NULL) { - ++attr_count; - } - if (ikh()->source_file_name() != NULL) { -@@ -483,8 +483,8 @@ - - write_u2(attr_count); - -- if (generic_signature() != NULL) { -- write_signature_attribute(symbol_to_cpool_index(generic_signature())); -+ if (generic_signature != NULL) { -+ write_signature_attribute(symbol_to_cpool_index(generic_signature)); - } - if (ikh()->source_file_name() != NULL) { - write_source_file_attribute(); -@@ -609,8 +609,7 @@ - } - - void JvmtiClassFileReconstituter::write_attribute_name_index(const char* name) { -- unsigned int hash_ignored; -- symbolOop sym = SymbolTable::lookup_only(name, (int)strlen(name), hash_ignored); -+ TempNewSymbol sym = SymbolTable::probe(name, (int)strlen(name)); - assert(sym != NULL, "attribute name symbol not found"); - u2 attr_name_index = symbol_to_cpool_index(sym); - assert(attr_name_index != 0, "attribute name symbol not in constant pool"); -diff --git a/src/share/vm/prims/jvmtiClassFileReconstituter.hpp b/src/share/vm/prims/jvmtiClassFileReconstituter.hpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp -@@ -41,11 +41,11 @@ - instanceKlassHandle ikh() { return _ikh; }; - constantPoolHandle cpool() { return _cpool; }; - -- u2 symbol_to_cpool_index(symbolOop sym) { -+ u2 symbol_to_cpool_index(Symbol* sym) { - return _symmap->symbol_to_value(sym); - } - -- u2 class_symbol_to_cpool_index(symbolOop sym) { -+ u2 class_symbol_to_cpool_index(Symbol* sym) { - return _classmap->symbol_to_value(sym); - } - -diff --git a/src/share/vm/prims/jvmtiEnv.cpp b/src/share/vm/prims/jvmtiEnv.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp -@@ -541,12 +541,12 @@ - JavaCalls::call_special(&res, - loader, - loader_ik, -- vmSymbolHandles::appendToClassPathForInstrumentation_name(), -- vmSymbolHandles::appendToClassPathForInstrumentation_signature(), -+ vmSymbols::appendToClassPathForInstrumentation_name(), -+ vmSymbols::appendToClassPathForInstrumentation_signature(), - path, - THREAD); - if (HAS_PENDING_EXCEPTION) { -- symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); -+ Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); - CLEAR_PENDING_EXCEPTION; - - if (ex_name == vmSymbols::java_lang_NoSuchMethodError()) { -@@ -2124,7 +2124,7 @@ - if (generic_ptr != NULL) { - *generic_ptr = NULL; - if (!isPrimitive && Klass::cast(k)->oop_is_instance()) { -- symbolOop soo = instanceKlass::cast(k)->generic_signature(); -+ Symbol* soo = instanceKlass::cast(k)->generic_signature(); - if (soo != NULL) { - const char *gen_sig = soo->as_C_string(); - if (gen_sig != NULL) { -@@ -2176,7 +2176,7 @@ - return JVMTI_ERROR_ABSENT_INFORMATION; - } - -- symbolOop sfnOop = instanceKlass::cast(k_klass)->source_file_name(); -+ Symbol* sfnOop = instanceKlass::cast(k_klass)->source_file_name(); - NULL_CHECK(sfnOop, JVMTI_ERROR_ABSENT_INFORMATION); - { - JavaThread* current_thread = JavaThread::current(); -@@ -2539,7 +2539,7 @@ - if (!Klass::cast(k)->oop_is_instance()) { - return JVMTI_ERROR_ABSENT_INFORMATION; - } -- symbolOop sdeOop = instanceKlass::cast(k)->source_debug_extension(); -+ Symbol* sdeOop = instanceKlass::cast(k)->source_debug_extension(); - NULL_CHECK(sdeOop, JVMTI_ERROR_ABSENT_INFORMATION); - - { -@@ -2619,7 +2619,7 @@ - } - if (generic_ptr != NULL) { - *generic_ptr = NULL; -- symbolOop soop = fdesc_ptr->generic_signature(); -+ Symbol* soop = fdesc_ptr->generic_signature(); - if (soop != NULL) { - const char* gen_sig = soop->as_C_string(); - if (gen_sig != NULL) { -@@ -2695,7 +2695,7 @@ - - if (generic_ptr != NULL) { - *generic_ptr = NULL; -- symbolOop soop = method_oop->generic_signature(); -+ Symbol* soop = method_oop->generic_signature(); - if (soop != NULL) { - const char* gen_sig = soop->as_C_string(); - if (gen_sig != NULL) { -diff --git a/src/share/vm/prims/jvmtiEnvBase.cpp b/src/share/vm/prims/jvmtiEnvBase.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp -@@ -1353,7 +1353,7 @@ - } - - // Get information about method return type -- symbolHandle signature(current_thread, jvf->method()->signature()); -+ Symbol* signature = jvf->method()->signature(); - - ResultTypeFinder rtf(signature); - TosState fr_tos = as_TosState(rtf.type()); -diff --git a/src/share/vm/prims/jvmtiExport.cpp b/src/share/vm/prims/jvmtiExport.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp -@@ -268,9 +268,9 @@ - jclass _class_being_redefined; - - public: -- JvmtiClassFileLoadEventMark(JavaThread *thread, symbolHandle name, -+ JvmtiClassFileLoadEventMark(JavaThread *thread, Symbol* name, - Handle class_loader, Handle prot_domain, KlassHandle *class_being_redefined) : JvmtiThreadEventMark(thread) { -- _class_name = name() != NULL? name->as_utf8() : NULL; -+ _class_name = name != NULL? name->as_utf8() : NULL; - _jloader = (jobject)to_jobject(class_loader()); - _protection_domain = (jobject)to_jobject(prot_domain()); - if (class_being_redefined == NULL) { -@@ -506,7 +506,7 @@ - - class JvmtiClassFileLoadHookPoster : public StackObj { - private: -- symbolHandle _h_name; -+ Symbol* _h_name; - Handle _class_loader; - Handle _h_protection_domain; - unsigned char ** _data_ptr; -@@ -522,7 +522,7 @@ - JvmtiClassLoadKind _load_kind; - - public: -- inline JvmtiClassFileLoadHookPoster(symbolHandle h_name, Handle class_loader, -+ inline JvmtiClassFileLoadHookPoster(Symbol* h_name, Handle class_loader, - Handle h_protection_domain, - unsigned char **data_ptr, unsigned char **end_ptr, - unsigned char **cached_data_ptr, -@@ -597,7 +597,7 @@ - // EVT_TRACE(JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, - // ("JVMTI [%s] class file load hook event sent %s data_ptr = %d, data_len = %d", - // JvmtiTrace::safe_get_thread_name(_thread), --// _h_name.is_null() ? "NULL" : _h_name->as_utf8(), -+// _h_name == NULL ? "NULL" : _h_name->as_utf8(), - // _curr_data, _curr_len )); - JvmtiClassFileLoadEventMark jem(_thread, _h_name, _class_loader, - _h_protection_domain, -@@ -655,7 +655,7 @@ - bool JvmtiExport::_should_post_class_file_load_hook = false; - - // this entry is for class file load hook on class load, redefine and retransform --void JvmtiExport::post_class_file_load_hook(symbolHandle h_name, -+void JvmtiExport::post_class_file_load_hook(Symbol* h_name, - Handle class_loader, - Handle h_protection_domain, - unsigned char **data_ptr, -diff --git a/src/share/vm/prims/jvmtiExport.hpp b/src/share/vm/prims/jvmtiExport.hpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.hpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.hpp -@@ -306,7 +306,7 @@ - static bool _should_post_class_file_load_hook; - inline static void set_should_post_class_file_load_hook(bool on) { _should_post_class_file_load_hook = on; } - inline static bool should_post_class_file_load_hook() { return _should_post_class_file_load_hook; } -- static void post_class_file_load_hook(symbolHandle h_name, Handle class_loader, -+ static void post_class_file_load_hook(Symbol* h_name, Handle class_loader, - Handle h_protection_domain, - unsigned char **data_ptr, unsigned char **end_ptr, - unsigned char **cached_data_ptr, -diff --git a/src/share/vm/prims/jvmtiImpl.cpp b/src/share/vm/prims/jvmtiImpl.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp -@@ -285,8 +285,8 @@ - // not saved in the PreviousVersionInfo. - Thread *thread = Thread::current(); - instanceKlassHandle ikh = instanceKlassHandle(thread, _method->method_holder()); -- symbolOop m_name = _method->name(); -- symbolOop m_signature = _method->signature(); -+ Symbol* m_name = _method->name(); -+ Symbol* m_signature = _method->signature(); - - { - ResourceMark rm(thread); -@@ -628,22 +628,22 @@ - ty_sign++; - len -= 2; - } -- symbolHandle ty_sym = oopFactory::new_symbol_handle(ty_sign, len, thread); -- if (klass->name() == ty_sym()) { -+ TempNewSymbol ty_sym = SymbolTable::new_symbol(ty_sign, len, thread); -+ if (klass->name() == ty_sym) { - return true; - } - // Compare primary supers - int super_depth = klass->super_depth(); - int idx; - for (idx = 0; idx < super_depth; idx++) { -- if (Klass::cast(klass->primary_super_of_depth(idx))->name() == ty_sym()) { -+ if (Klass::cast(klass->primary_super_of_depth(idx))->name() == ty_sym) { - return true; - } - } - // Compare secondary supers - objArrayOop sec_supers = klass->secondary_supers(); - for (idx = 0; idx < sec_supers->length(); idx++) { -- if (Klass::cast((klassOop) sec_supers->obj_at(idx))->name() == ty_sym()) { -+ if (Klass::cast((klassOop) sec_supers->obj_at(idx))->name() == ty_sym) { - return true; - } - } -@@ -690,7 +690,7 @@ - _result = JVMTI_ERROR_INVALID_SLOT; - return false; // Incorrect slot index - } -- symbolOop sign_sym = method_oop->constants()->symbol_at(signature_idx); -+ Symbol* sign_sym = method_oop->constants()->symbol_at(signature_idx); - const char* signature = (const char *) sign_sym->as_utf8(); - BasicType slot_type = char2type(signature[0]); - -diff --git a/src/share/vm/prims/jvmtiRedefineClasses.cpp b/src/share/vm/prims/jvmtiRedefineClasses.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp -@@ -235,7 +235,7 @@ - case JVM_CONSTANT_String: // fall through - - // These were indirect CP entries, but they have been changed into -- // symbolOops so these entries can be directly appended. -+ // Symbol*s so these entries can be directly appended. - case JVM_CONSTANT_UnresolvedClass: // fall through - case JVM_CONSTANT_UnresolvedString: - { -@@ -575,12 +575,12 @@ - // name and signature - jshort name_index = k_old_fields->short_at(i + instanceKlass::name_index_offset); - jshort sig_index = k_old_fields->short_at(i +instanceKlass::signature_index_offset); -- symbolOop name_sym1 = the_class->constants()->symbol_at(name_index); -- symbolOop sig_sym1 = the_class->constants()->symbol_at(sig_index); -+ Symbol* name_sym1 = the_class->constants()->symbol_at(name_index); -+ Symbol* sig_sym1 = the_class->constants()->symbol_at(sig_index); - name_index = k_new_fields->short_at(i + instanceKlass::name_index_offset); - sig_index = k_new_fields->short_at(i + instanceKlass::signature_index_offset); -- symbolOop name_sym2 = scratch_class->constants()->symbol_at(name_index); -- symbolOop sig_sym2 = scratch_class->constants()->symbol_at(sig_index); -+ Symbol* name_sym2 = scratch_class->constants()->symbol_at(name_index); -+ Symbol* sig_sym2 = scratch_class->constants()->symbol_at(sig_index); - if (name_sym1 != name_sym2 || sig_sym1 != sig_sym2) { - return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; - } -@@ -855,7 +855,7 @@ - } - klassOop the_class_oop = java_lang_Class::as_klassOop(mirror); - instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop); -- symbolHandle the_class_sym = symbolHandle(THREAD, the_class->name()); -+ Symbol* the_class_sym = the_class->name(); - - // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark - RC_TRACE_WITH_THREAD(0x00000001, THREAD, -@@ -886,7 +886,7 @@ - instanceKlassHandle scratch_class (THREAD, k); - - if (HAS_PENDING_EXCEPTION) { -- symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); -+ Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); - // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark - RC_TRACE_WITH_THREAD(0x00000002, THREAD, ("parse_stream exception: '%s'", - ex_name->as_C_string())); -@@ -912,7 +912,7 @@ - if (!the_class->is_linked()) { - the_class->link_class(THREAD); - if (HAS_PENDING_EXCEPTION) { -- symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); -+ Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); - // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark - RC_TRACE_WITH_THREAD(0x00000002, THREAD, ("link_class exception: '%s'", - ex_name->as_C_string())); -@@ -950,7 +950,7 @@ - } - - if (HAS_PENDING_EXCEPTION) { -- symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); -+ Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); - // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark - RC_TRACE_WITH_THREAD(0x00000002, THREAD, - ("verify_byte_codes exception: '%s'", ex_name->as_C_string())); -@@ -976,7 +976,7 @@ - } - - if (HAS_PENDING_EXCEPTION) { -- symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); -+ Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); - // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark - RC_TRACE_WITH_THREAD(0x00000002, THREAD, - ("verify_byte_codes post merge-CP exception: '%s'", -@@ -993,7 +993,7 @@ - - Rewriter::rewrite(scratch_class, THREAD); - if (HAS_PENDING_EXCEPTION) { -- symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); -+ Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); - CLEAR_PENDING_EXCEPTION; - if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { - return JVMTI_ERROR_OUT_OF_MEMORY; -@@ -2857,8 +2857,8 @@ - // (2) with the prefix. - // where 'prefix' is the prefix at that 'depth' (first prefix, second prefix,...) - methodOop search_prefix_name_space(int depth, char* name_str, size_t name_len, -- symbolOop signature) { -- symbolOop name_symbol = SymbolTable::probe(name_str, (int)name_len); -+ Symbol* signature) { -+ TempNewSymbol name_symbol = SymbolTable::probe(name_str, (int)name_len); - if (name_symbol != NULL) { - methodOop method = Klass::cast(the_class())->lookup_method(name_symbol, signature); - if (method != NULL) { -@@ -2897,7 +2897,7 @@ - - // Return the method name with old prefixes stripped away. - char* method_name_without_prefixes(methodOop method) { -- symbolOop name = method->name(); -+ Symbol* name = method->name(); - char* name_str = name->as_utf8(); - - // Old prefixing may be defunct, strip prefixes, if any. -diff --git a/src/share/vm/prims/jvmtiRedefineClasses.hpp b/src/share/vm/prims/jvmtiRedefineClasses.hpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp -@@ -223,8 +223,8 @@ - // JVM_CONSTANT_UnresolvedClass and JVM_CONSTANT_UnresolvedString - // entries. During this conversion process, the UTF8 values that are - // indirectly referenced by the JVM_CONSTANT_ClassIndex and --// JVM_CONSTANT_StringIndex entries are changed into symbolOops and the --// entries are modified to refer to the symbolOops. This optimization -+// JVM_CONSTANT_StringIndex entries are changed into Symbol*s and the -+// entries are modified to refer to the Symbol*s. This optimization - // eliminates one level of indirection for those two CP entry types and - // gets the entries ready for verification. During class file parsing - // it is also possible for JVM_CONSTANT_UnresolvedString entries to be -diff --git a/src/share/vm/prims/jvmtiTagMap.cpp b/src/share/vm/prims/jvmtiTagMap.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.cpp -@@ -2611,7 +2611,7 @@ - } - - // some objects are ignored - in the case of simple -- // roots it's mostly symbolOops that we are skipping -+ // roots it's mostly Symbol*s that we are skipping - // here. - if (!ServiceUtil::visible_oop(o)) { - return; -diff --git a/src/share/vm/prims/methodComparator.cpp b/src/share/vm/prims/methodComparator.cpp ---- openjdk/hotspot/src/share/vm/prims/methodComparator.cpp -+++ openjdk/hotspot/src/share/vm/prims/methodComparator.cpp -@@ -24,7 +24,7 @@ - - #include "precompiled.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvmtiRedefineClassesTrace.hpp" - #include "prims/methodComparator.hpp" - #include "runtime/handles.inline.hpp" -diff --git a/src/share/vm/prims/methodHandleWalk.cpp b/src/share/vm/prims/methodHandleWalk.cpp ---- openjdk/hotspot/src/share/vm/prims/methodHandleWalk.cpp -+++ openjdk/hotspot/src/share/vm/prims/methodHandleWalk.cpp -@@ -120,6 +120,7 @@ - if (cur_slot == arg_slot) - return T_OBJECT; - } -+ ResourceMark rm(THREAD); - for (SignatureStream ss(m->signature()); !ss.is_done(); ss.next()) { - BasicType bt = ss.type(); - cur_slot -= type2size[bt]; -@@ -961,9 +962,9 @@ - m = vmIntrinsics::method_for(iid); - } - -- klassOop klass = m->method_holder(); -- symbolOop name = m->name(); -- symbolOop signature = m->signature(); -+ klassOop klass = m->method_holder(); -+ Symbol* name = m->name(); -+ Symbol* signature = m->signature(); - - if (tailcall) { - // Actually, in order to make these methods more recognizable, -@@ -1141,7 +1142,7 @@ - for (int i = 1; i < _constants.length(); i++) { - ConstantValue* cv = _constants.at(i); - switch (cv->tag()) { -- case JVM_CONSTANT_Utf8: cpool->symbol_at_put( i, cv->symbol_oop() ); break; -+ case JVM_CONSTANT_Utf8: cpool->symbol_at_put( i, cv->symbol() ); break; - case JVM_CONSTANT_Integer: cpool->int_at_put( i, cv->get_jint() ); break; - case JVM_CONSTANT_Float: cpool->float_at_put( i, cv->get_jfloat() ); break; - case JVM_CONSTANT_Long: cpool->long_at_put( i, cv->get_jlong() ); break; -@@ -1331,7 +1332,7 @@ - virtual ArgToken make_invoke(methodOop m, vmIntrinsics::ID iid, - Bytecodes::Code op, bool tailcall, - int argc, ArgToken* argv, TRAPS) { -- symbolOop name, sig; -+ Symbol* name, sig; - if (m != NULL) { - name = m->name(); - sig = m->signature(); -diff --git a/src/share/vm/prims/methodHandleWalk.hpp b/src/share/vm/prims/methodHandleWalk.hpp ---- openjdk/hotspot/src/share/vm/prims/methodHandleWalk.hpp -+++ openjdk/hotspot/src/share/vm/prims/methodHandleWalk.hpp -@@ -258,16 +258,20 @@ - int _tag; // Constant pool tag type. - JavaValue _value; - Handle _handle; -+ Symbol* _sym; - - public: - // Constructor for oop types. - ConstantValue(int tag, Handle con) : _tag(tag), _handle(con) { -- assert(tag == JVM_CONSTANT_Utf8 || -- tag == JVM_CONSTANT_Class || -+ assert(tag == JVM_CONSTANT_Class || - tag == JVM_CONSTANT_String || - tag == JVM_CONSTANT_Object, "must be oop type"); - } - -+ ConstantValue(int tag, Symbol* con) : _tag(tag), _sym(con) { -+ assert(tag == JVM_CONSTANT_Utf8, "must be symbol type"); -+ } -+ - // Constructor for oop reference types. - ConstantValue(int tag, int index) : _tag(tag) { - assert(JVM_CONSTANT_Fieldref <= tag && tag <= JVM_CONSTANT_NameAndType, "must be ref type"); -@@ -291,7 +295,7 @@ - } - - int tag() const { return _tag; } -- symbolOop symbol_oop() const { return (symbolOop) _handle(); } -+ Symbol* symbol() const { return _sym; } - klassOop klass_oop() const { return (klassOop) _handle(); } - oop object_oop() const { return _handle(); } - int index() const { return _value.get_jint(); } -@@ -336,6 +340,12 @@ - return _constants.append(cv); - } - -+ int cpool_symbol_put(int tag, Symbol* con) { -+ if (con == NULL) return 0; -+ ConstantValue* cv = new ConstantValue(tag, con); -+ return _constants.append(cv); -+ } -+ - int cpool_oop_reference_put(int tag, int first_index, int second_index) { - if (first_index == 0 && second_index == 0) return 0; - assert(first_index != 0 && second_index != 0, "no zero indexes"); -@@ -365,8 +375,8 @@ - int cpool_object_put(Handle obj) { - return cpool_oop_put(JVM_CONSTANT_Object, obj); - } -- int cpool_symbol_put(symbolOop sym) { -- return cpool_oop_put(JVM_CONSTANT_Utf8, sym); -+ int cpool_symbol_put(Symbol* sym) { -+ return cpool_symbol_put(JVM_CONSTANT_Utf8, sym); - } - int cpool_klass_put(klassOop klass) { - return cpool_oop_put(JVM_CONSTANT_Class, klass); -diff --git a/src/share/vm/prims/methodHandles.cpp b/src/share/vm/prims/methodHandles.cpp ---- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp -+++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp -@@ -278,7 +278,7 @@ - assert(m->is_method(), ""); - if (m->is_static()) { - // check that signature begins '(L' or '([' (not '(I', '()', etc.) -- symbolOop sig = m->signature(); -+ Symbol* sig = m->signature(); - BasicType recv_bt = char2type(sig->byte_at(1)); - // Note: recv_bt might be T_ILLEGAL if byte_at(2) is ')' - assert(sig->byte_at(0) == '(', "must be method sig"); -@@ -438,6 +438,25 @@ - return m; - } - -+// convert the external string or reflective type to an internal signature -+Symbol* MethodHandles::convert_to_signature(oop type_str, -+ bool polymorphic, -+ TRAPS) { -+ if (java_dyn_MethodType::is_instance(type_str)) { -+ return java_dyn_MethodType::as_signature(type_str, polymorphic, CHECK_NULL); -+ } else if (java_lang_Class::is_instance(type_str)) { -+ return java_lang_Class::as_signature(type_str, false, CHECK_NULL); -+ } else if (java_lang_String::is_instance(type_str)) { -+ if (polymorphic) { -+ return java_lang_String::as_symbol(type_str, CHECK_NULL); -+ } else { -+ return java_lang_String::as_symbol_or_null(type_str); -+ } -+ } else { -+ THROW_MSG_(vmSymbols::java_lang_InternalError(), "unrecognized type", NULL); -+ } -+} -+ - // An unresolved member name is a mere symbolic reference. - // Resolving it plants a vmtarget/vmindex in it, - // which refers dirctly to JVM internals. -@@ -478,39 +497,24 @@ - defc->link_class(CHECK); - - // convert the external string name to an internal symbol -- symbolHandle name(THREAD, java_lang_String::as_symbol_or_null(name_str)); -- if (name.is_null()) return; // no such name -+ TempNewSymbol name = java_lang_String::as_symbol_or_null(name_str); -+ if (name == NULL) return; // no such name - name_str = NULL; // safety - - Handle polymorphic_method_type; - bool polymorphic_signature = false; - if ((flags & ALL_KINDS) == IS_METHOD && - (defc() == SystemDictionary::MethodHandle_klass() && -- methodOopDesc::is_method_handle_invoke_name(name()))) -+ methodOopDesc::is_method_handle_invoke_name(name))) - polymorphic_signature = true; - - // convert the external string or reflective type to an internal signature -- symbolHandle type; { -- symbolOop type_sym = NULL; -- if (java_dyn_MethodType::is_instance(type_str)) { -- type_sym = java_dyn_MethodType::as_signature(type_str, polymorphic_signature, CHECK); -- if (polymorphic_signature) -- polymorphic_method_type = Handle(THREAD, type_str); //preserve exactly -- } else if (java_lang_Class::is_instance(type_str)) { -- type_sym = java_lang_Class::as_signature(type_str, false, CHECK); -- } else if (java_lang_String::is_instance(type_str)) { -- if (polymorphic_signature) { -- type = java_lang_String::as_symbol(type_str, CHECK); -- } else { -- type_sym = java_lang_String::as_symbol_or_null(type_str); -- } -- } else { -- THROW_MSG(vmSymbols::java_lang_InternalError(), "unrecognized type"); -- } -- if (type_sym != NULL) -- type = symbolHandle(THREAD, type_sym); -+ TempNewSymbol type = convert_to_signature(type_str, polymorphic_signature, CHECK); -+ if (java_dyn_MethodType::is_instance(type_str) && polymorphic_signature) { -+ polymorphic_method_type = Handle(THREAD, type_str); //preserve exactly - } -- if (type.is_null()) return; // no such signature exists in the VM -+ -+ if (type == NULL) return; // no such signature exists in the VM - type_str = NULL; // safety - - // Time to do the lookup. -@@ -566,7 +570,7 @@ - CallInfo result; - { - EXCEPTION_MARK; -- if (name() == vmSymbols::object_initializer_name()) { -+ if (name == vmSymbols::object_initializer_name()) { - LinkResolver::resolve_special_call(result, - defc, name, type, KlassHandle(), false, THREAD); - } else { -@@ -594,7 +598,7 @@ - { - // This is taken from LinkResolver::resolve_field, sans access checks. - fieldDescriptor fd; // find_field initializes fd if found -- KlassHandle sel_klass(THREAD, instanceKlass::cast(defc())->find_field(name(), type(), &fd)); -+ KlassHandle sel_klass(THREAD, instanceKlass::cast(defc())->find_field(name, type, &fd)); - // check if field exists; i.e., if a klass containing the field def has been selected - if (sel_klass.is_null()) return; - oop vmtarget = sel_klass->as_klassOop(); -@@ -725,7 +729,7 @@ - } - - int MethodHandles::find_MemberNames(klassOop k, -- symbolOop name, symbolOop sig, -+ Symbol* name, Symbol* sig, - int mflags, klassOop caller, - int skip, objArrayOop results) { - DEBUG_ONLY(No_Safepoint_Verifier nsv); -@@ -782,8 +786,8 @@ - - if ((match_flags & (IS_METHOD | IS_CONSTRUCTOR)) != 0) { - // watch out for these guys: -- symbolOop init_name = vmSymbols::object_initializer_name(); -- symbolOop clinit_name = vmSymbols::class_initializer_name(); -+ Symbol* init_name = vmSymbols::object_initializer_name(); -+ Symbol* clinit_name = vmSymbols::class_initializer_name(); - if (name == clinit_name) clinit_name = NULL; // hack for exposing <clinit> - bool negate_name_test = false; - // fix name so that it captures the intention of IS_CONSTRUCTOR -@@ -807,7 +811,7 @@ - } - for (MethodStream st(k, local_only, !search_intfc); !st.eos(); st.next()) { - methodOop m = st.method(); -- symbolOop m_name = m->name(); -+ Symbol* m_name = m->name(); - if (m_name == clinit_name) - continue; - if (name != NULL && ((m_name != name) ^ negate_name_test)) -@@ -928,7 +932,7 @@ - // Must be on the boot class path: - if (ik->class_loader() != NULL) return false; - // Check the name. -- symbolOop name = ik->name(); -+ Symbol* name = ik->name(); - for (int i = 0; ; i++) { - const char* test_name = always_null_names[i]; - if (test_name == NULL) break; -@@ -1026,6 +1030,7 @@ - int pmax = ptypes->length(); - int mnum = 0; // method argument - const char* err = NULL; -+ ResourceMark rm(THREAD); - for (SignatureStream ss(m->signature()); !ss.is_done(); ss.next()) { - oop ptype_oop = NULL; - if (ss.at_return_type()) { -@@ -1061,15 +1066,14 @@ - } - KlassHandle pklass_handle(THREAD, pklass); pklass = NULL; - // If we fail to resolve types at this point, we will throw an error. -- symbolOop name_oop = ss.as_symbol(CHECK); -- symbolHandle name(THREAD, name_oop); -+ Symbol* name = ss.as_symbol(CHECK); - instanceKlass* mk = instanceKlass::cast(m->method_holder()); - Handle loader(THREAD, mk->class_loader()); - Handle domain(THREAD, mk->protection_domain()); - mklass = SystemDictionary::resolve_or_null(name, loader, domain, CHECK); - pklass = pklass_handle(); - if (mklass == NULL && pklass != NULL && -- Klass::cast(pklass)->name() == name() && -+ Klass::cast(pklass)->name() == name && - m->is_method_handle_invoke()) { - // Assume a match. We can't really decode the signature of MH.invoke*. - continue; -@@ -2288,7 +2292,8 @@ - tty->print("creating MethodType form "); - if (WizardMode || Verbose) { // Warning: this calls Java code on the MH! - // call Object.toString() -- symbolOop name = vmSymbols::toString_name(), sig = vmSymbols::void_string_signature(); -+ Symbol* name = vmSymbols::toString_name(); -+ Symbol* sig = vmSymbols::void_string_signature(); - JavaCallArguments args(Handle(THREAD, JNIHandles::resolve_non_null(erased_jh))); - JavaValue result(T_OBJECT); - JavaCalls::call_virtual(&result, SystemDictionary::Object_klass(), name, sig, -@@ -2452,7 +2457,8 @@ - objArrayOop results = (objArrayOop) JNIHandles::resolve(results_jh); - if (results == NULL || !results->is_objArray()) return -1; - -- symbolOop name = NULL, sig = NULL; -+ TempNewSymbol name = NULL; -+ TempNewSymbol sig = NULL; - if (name_jh != NULL) { - name = java_lang_String::as_symbol_or_null(JNIHandles::resolve_non_null(name_jh)); - if (name == NULL) return 0; // a match is not possible -@@ -2611,10 +2617,10 @@ - if (enable_MH) { - KlassHandle MHI_klass = SystemDictionaryHandles::MethodHandleImpl_klass(); - if (MHI_klass.not_null()) { -- symbolHandle raiseException_name = oopFactory::new_symbol_handle("raiseException", CHECK); -- symbolHandle raiseException_sig = oopFactory::new_symbol_handle("(ILjava/lang/Object;Ljava/lang/Object;)V", CHECK); -+ TempNewSymbol raiseException_name = SymbolTable::new_symbol("raiseException", CHECK); -+ TempNewSymbol raiseException_sig = SymbolTable::new_symbol("(ILjava/lang/Object;Ljava/lang/Object;)V", CHECK); - methodOop raiseException_method = instanceKlass::cast(MHI_klass->as_klassOop()) -- ->find_method(raiseException_name(), raiseException_sig()); -+ ->find_method(raiseException_name, raiseException_sig); - if (raiseException_method != NULL && raiseException_method->is_static()) { - MethodHandles::set_raise_exception_method(raiseException_method); - } else { -diff --git a/src/share/vm/prims/methodHandles.hpp b/src/share/vm/prims/methodHandles.hpp ---- openjdk/hotspot/src/share/vm/prims/methodHandles.hpp -+++ openjdk/hotspot/src/share/vm/prims/methodHandles.hpp -@@ -287,7 +287,7 @@ - static void init_MemberName(oop mname_oop, oop target); // compute vmtarget/vmindex from target - static void init_MemberName(oop mname_oop, methodOop m, bool do_dispatch = true); - static void init_MemberName(oop mname_oop, klassOop field_holder, AccessFlags mods, int offset); -- static int find_MemberNames(klassOop k, symbolOop name, symbolOop sig, -+ static int find_MemberNames(klassOop k, Symbol* name, Symbol* sig, - int mflags, klassOop caller, - int skip, objArrayOop results); - // bit values for suppress argument to expand_MemberName: -@@ -466,6 +466,8 @@ - Register temp_reg, Register temp2_reg, Register temp3_reg = noreg); - - static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN; -+ -+ static Symbol* convert_to_signature(oop type_str, bool polymorphic, TRAPS); - }; - - -diff --git a/src/share/vm/prims/nativeLookup.cpp b/src/share/vm/prims/nativeLookup.cpp ---- openjdk/hotspot/src/share/vm/prims/nativeLookup.cpp -+++ openjdk/hotspot/src/share/vm/prims/nativeLookup.cpp -@@ -32,7 +32,7 @@ - #include "oops/instanceKlass.hpp" - #include "oops/methodOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvm_misc.hpp" - #include "prims/nativeLookup.hpp" - #include "runtime/arguments.hpp" -@@ -51,7 +51,7 @@ - #endif - - --static void mangle_name_on(outputStream* st, symbolOop name, int begin, int end) { -+static void mangle_name_on(outputStream* st, Symbol* name, int begin, int end) { - char* bytes = (char*)name->bytes() + begin; - char* end_bytes = (char*)name->bytes() + end; - while (bytes < end_bytes) { -@@ -70,7 +70,7 @@ - } - - --static void mangle_name_on(outputStream* st, symbolOop name) { -+static void mangle_name_on(outputStream* st, Symbol* name) { - mangle_name_on(st, name, 0, name->utf8_length()); - } - -@@ -91,7 +91,7 @@ - char* NativeLookup::long_jni_name(methodHandle method) { - // Signature ignore the wrapping parenteses and the trailing return type - stringStream st; -- symbolOop signature = method->signature(); -+ Symbol* signature = method->signature(); - st.print("__"); - // find ')' - int end; -@@ -168,8 +168,8 @@ - JavaValue result(T_LONG); - JavaCalls::call_static(&result, - klass, -- vmSymbolHandles::findNative_name(), -- vmSymbolHandles::classloader_string_long_signature(), -+ vmSymbols::findNative_name(), -+ vmSymbols::classloader_string_long_signature(), - // Arguments - loader, - name_arg, -@@ -249,10 +249,10 @@ - if (wrapper_name != in_name) { - // we have a name for a wrapping method - int wrapper_name_len = (int)strlen(wrapper_name); -- symbolHandle wrapper_symbol(THREAD, SymbolTable::probe(wrapper_name, wrapper_name_len)); -- if (!wrapper_symbol.is_null()) { -+ TempNewSymbol wrapper_symbol = SymbolTable::probe(wrapper_name, wrapper_name_len); -+ if (wrapper_symbol != NULL) { - KlassHandle kh(method->method_holder()); -- methodOop wrapper_method = Klass::cast(kh())->lookup_method(wrapper_symbol(), -+ methodOop wrapper_method = Klass::cast(kh())->lookup_method(wrapper_symbol, - method->signature()); - if (wrapper_method != NULL && !wrapper_method->is_native()) { - // we found a wrapper method, use its native entry -@@ -301,9 +301,9 @@ - address NativeLookup::base_library_lookup(const char* class_name, const char* method_name, const char* signature) { - EXCEPTION_MARK; - bool in_base_library = true; // SharedRuntime inits some math methods. -- symbolHandle c_name = oopFactory::new_symbol_handle(class_name, CATCH); -- symbolHandle m_name = oopFactory::new_symbol_handle(method_name, CATCH); -- symbolHandle s_name = oopFactory::new_symbol_handle(signature, CATCH); -+ TempNewSymbol c_name = SymbolTable::new_symbol(class_name, CATCH); -+ TempNewSymbol m_name = SymbolTable::new_symbol(method_name, CATCH); -+ TempNewSymbol s_name = SymbolTable::new_symbol(signature, CATCH); - - // Find the class - klassOop k = SystemDictionary::resolve_or_fail(c_name, true, CATCH); -@@ -311,7 +311,7 @@ - - // Find method and invoke standard lookup - methodHandle method (THREAD, -- klass->uncached_lookup_method(m_name(), s_name())); -+ klass->uncached_lookup_method(m_name, s_name)); - address result = lookup(method, in_base_library, CATCH); - assert(in_base_library, "must be in basic library"); - guarantee(result != NULL, "must be non NULL"); -diff --git a/src/share/vm/prims/unsafe.cpp b/src/share/vm/prims/unsafe.cpp ---- openjdk/hotspot/src/share/vm/prims/unsafe.cpp -+++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp -@@ -991,7 +991,7 @@ - - instanceKlassHandle anon_klass; - { -- symbolHandle no_class_name; -+ Symbol* no_class_name = NULL; - klassOop anonk = SystemDictionary::parse_stream(no_class_name, - host_loader, host_domain, - &st, host_klass, cp_patches, -diff --git a/src/share/vm/runtime/deoptimization.cpp b/src/share/vm/runtime/deoptimization.cpp ---- openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp -+++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp -@@ -396,7 +396,7 @@ - HandleMark hm; - methodHandle method(thread, array->element(0)->method()); - Bytecode_invoke invoke = Bytecode_invoke_check(method, array->element(0)->bci()); -- return_type = invoke.is_valid() ? invoke.result_type(thread) : T_ILLEGAL; -+ return_type = invoke.is_valid() ? invoke.result_type() : T_ILLEGAL; - } - - // Compute information for handling adapters and adjusting the frame size of the caller. -@@ -601,7 +601,7 @@ - cur_code == Bytecodes::_invokestatic || - cur_code == Bytecodes::_invokeinterface) { - Bytecode_invoke invoke(mh, iframe->interpreter_frame_bci()); -- symbolHandle signature(thread, invoke.signature()); -+ Symbol* signature = invoke.signature(); - ArgumentSizeComputer asc(signature); - cur_invoke_parameter_size = asc.size(); - if (cur_code != Bytecodes::_invokestatic) { -@@ -1156,7 +1156,7 @@ - if (!constant_pool->tag_at(index).is_symbol()) return; - - Handle class_loader (THREAD, instanceKlass::cast(constant_pool->pool_holder())->class_loader()); -- symbolHandle symbol (THREAD, constant_pool->symbol_at(index)); -+ Symbol* symbol = constant_pool->symbol_at(index); - - // class name? - if (symbol->byte_at(0) != '(') { -@@ -1166,10 +1166,10 @@ - } - - // then it must be a signature! -+ ResourceMark rm(THREAD); - for (SignatureStream ss(symbol); !ss.is_done(); ss.next()) { - if (ss.is_object()) { -- symbolOop s = ss.as_symbol(CHECK); -- symbolHandle class_name (THREAD, s); -+ Symbol* class_name = ss.as_symbol(CHECK); - Handle protection_domain (THREAD, Klass::cast(constant_pool->pool_holder())->protection_domain()); - SystemDictionary::resolve_or_null(class_name, class_loader, protection_domain, CHECK); - } -@@ -1246,19 +1246,17 @@ - format_trap_request(buf, sizeof(buf), trap_request)); - nm->log_identity(xtty); - } -- symbolHandle class_name; -+ Symbol* class_name = NULL; - bool unresolved = false; - if (unloaded_class_index >= 0) { - constantPoolHandle constants (THREAD, trap_method->constants()); - if (constants->tag_at(unloaded_class_index).is_unresolved_klass()) { -- class_name = symbolHandle(THREAD, -- constants->klass_name_at(unloaded_class_index)); -+ class_name = constants->klass_name_at(unloaded_class_index); - unresolved = true; - if (xtty != NULL) - xtty->print(" unresolved='1'"); - } else if (constants->tag_at(unloaded_class_index).is_symbol()) { -- class_name = symbolHandle(THREAD, -- constants->symbol_at(unloaded_class_index)); -+ class_name = constants->symbol_at(unloaded_class_index); - } - if (xtty != NULL) - xtty->name(class_name); -@@ -1294,7 +1292,7 @@ - trap_reason_name(reason), - trap_action_name(action), - unloaded_class_index); -- if (class_name.not_null()) { -+ if (class_name != NULL) { - tty->print(unresolved ? " unresolved class: " : " symbol: "); - class_name->print_symbol_on(tty); - } -diff --git a/src/share/vm/runtime/fieldDescriptor.hpp b/src/share/vm/runtime/fieldDescriptor.hpp ---- openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.hpp -+++ openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.hpp -@@ -28,7 +28,7 @@ - #include "oops/constantPoolOop.hpp" - #include "oops/klassOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/fieldType.hpp" - #include "utilities/accessFlags.hpp" - #include "utilities/constantTag.hpp" -@@ -49,15 +49,15 @@ - constantPoolHandle _cp; - - public: -- symbolOop name() const { return _cp->symbol_at(_name_index); } -- symbolOop signature() const { return _cp->symbol_at(_signature_index); } -+ Symbol* name() const { return _cp->symbol_at(_name_index); } -+ Symbol* signature() const { return _cp->symbol_at(_signature_index); } - klassOop field_holder() const { return _cp->pool_holder(); } - constantPoolOop constants() const { return _cp(); } - AccessFlags access_flags() const { return _access_flags; } - oop loader() const; - // Offset (in words) of field from start of instanceOop / klassOop - int offset() const { return _offset; } -- symbolOop generic_signature() const { return (_generic_signature_index > 0 ? _cp->symbol_at(_generic_signature_index) : (symbolOop)NULL); } -+ Symbol* generic_signature() const { return (_generic_signature_index > 0 ? _cp->symbol_at(_generic_signature_index) : (Symbol*)NULL); } - int index() const { return _index; } - typeArrayOop annotations() const; - -diff --git a/src/share/vm/runtime/fieldType.cpp b/src/share/vm/runtime/fieldType.cpp ---- openjdk/hotspot/src/share/vm/runtime/fieldType.cpp -+++ openjdk/hotspot/src/share/vm/runtime/fieldType.cpp -@@ -30,7 +30,7 @@ - #include "runtime/fieldType.hpp" - #include "runtime/signature.hpp" - --void FieldType::skip_optional_size(symbolOop signature, int* index) { -+void FieldType::skip_optional_size(Symbol* signature, int* index) { - jchar c = signature->byte_at(*index); - while (c >= '0' && c <= '9') { - *index = *index + 1; -@@ -38,12 +38,12 @@ - } - } - --BasicType FieldType::basic_type(symbolOop signature) { -+BasicType FieldType::basic_type(Symbol* signature) { - return char2type(signature->byte_at(0)); - } - - // Check if it is a valid array signature --bool FieldType::is_valid_array_signature(symbolOop sig) { -+bool FieldType::is_valid_array_signature(Symbol* sig) { - assert(sig->utf8_length() > 1, "this should already have been checked"); - assert(sig->byte_at(0) == '[', "this should already have been checked"); - // The first character is already checked -@@ -73,7 +73,7 @@ - } - - --BasicType FieldType::get_array_info(symbolOop signature, jint* dimension, symbolOop* object_key, TRAPS) { -+BasicType FieldType::get_array_info(Symbol* signature, FieldArrayInfo& fd, TRAPS) { - assert(basic_type(signature) == T_ARRAY, "must be array"); - int index = 1; - int dim = 1; -@@ -84,14 +84,15 @@ - skip_optional_size(signature, &index); - } - ResourceMark rm; -- symbolOop element = oopFactory::new_symbol(signature->as_C_string() + index, CHECK_(T_BYTE)); -- BasicType element_type = FieldType::basic_type(element); -+ char *element = signature->as_C_string() + index; -+ BasicType element_type = char2type(element[0]); - if (element_type == T_OBJECT) { -- char* object_type = element->as_C_string(); -- object_type[element->utf8_length() - 1] = '\0'; -- *object_key = oopFactory::new_symbol(object_type + 1, CHECK_(T_BYTE)); -+ int len = (int)strlen(element); -+ assert(element[len-1] == ';', "last char should be a semicolon"); -+ element[len-1] = '\0'; // chop off semicolon -+ fd._object_key = SymbolTable::new_symbol(element + 1, CHECK_(T_BYTE)); - } - // Pass dimension back to caller -- *dimension = dim; -+ fd._dimension = dim; - return element_type; - } -diff --git a/src/share/vm/runtime/fieldType.hpp b/src/share/vm/runtime/fieldType.hpp ---- openjdk/hotspot/src/share/vm/runtime/fieldType.hpp -+++ openjdk/hotspot/src/share/vm/runtime/fieldType.hpp -@@ -26,26 +26,42 @@ - #define SHARE_VM_RUNTIME_FIELDTYPE_HPP - - #include "memory/allocation.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - - // Note: FieldType should be based on the SignatureIterator (or vice versa). - // In any case, this structure should be re-thought at some point. - - // A FieldType is used to determine the type of a field from a signature string. - -+// Information returned by get_array_info, which is scoped to decrement -+// reference count if a Symbol is created in the case of T_OBJECT -+class FieldArrayInfo : public StackObj { -+ friend class FieldType; // field type can set these fields. -+ int _dimension; -+ Symbol* _object_key; -+ public: -+ int dimension() { return _dimension; } -+ Symbol* object_key() { return _object_key; } -+ // basic constructor -+ FieldArrayInfo() : _dimension(0), _object_key(NULL) {} -+ // destructor decrements object key's refcount if created -+ ~FieldArrayInfo() { if (_object_key != NULL) _object_key->decrement_refcount(); } -+}; -+ -+ - class FieldType: public AllStatic { - private: -- static void skip_optional_size(symbolOop signature, int* index); -- static bool is_valid_array_signature(symbolOop signature); -+ static void skip_optional_size(Symbol* signature, int* index); -+ static bool is_valid_array_signature(Symbol* signature); - public: - - // Return basic type -- static BasicType basic_type(symbolOop signature); -+ static BasicType basic_type(Symbol* signature); - - // Testing -- static bool is_array(symbolOop signature) { return signature->utf8_length() > 1 && signature->byte_at(0) == '[' && is_valid_array_signature(signature); } -+ static bool is_array(Symbol* signature) { return signature->utf8_length() > 1 && signature->byte_at(0) == '[' && is_valid_array_signature(signature); } - -- static bool is_obj(symbolOop signature) { -+ static bool is_obj(Symbol* signature) { - int sig_length = signature->utf8_length(); - // Must start with 'L' and end with ';' - return (sig_length >= 2 && -@@ -54,7 +70,7 @@ - } - - // Parse field and extract array information. Works for T_ARRAY only. -- static BasicType get_array_info(symbolOop signature, jint* dimension, symbolOop *object_key, TRAPS); -+ static BasicType get_array_info(Symbol* signature, FieldArrayInfo& ai, TRAPS); - }; - - #endif // SHARE_VM_RUNTIME_FIELDTYPE_HPP -diff --git a/src/share/vm/runtime/fprofiler.cpp b/src/share/vm/runtime/fprofiler.cpp ---- openjdk/hotspot/src/share/vm/runtime/fprofiler.cpp -+++ openjdk/hotspot/src/share/vm/runtime/fprofiler.cpp -@@ -31,7 +31,7 @@ - #include "memory/universe.inline.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/deoptimization.hpp" - #include "runtime/fprofiler.hpp" - #include "runtime/mutexLocker.hpp" -@@ -318,7 +318,7 @@ - int limit; - int i; - methodOop m = method(); -- symbolOop k = m->klass_name(); -+ Symbol* k = m->klass_name(); - // Print the class name with dots instead of slashes - limit = k->utf8_length(); - for (i = 0 ; i < limit ; i += 1) { -@@ -331,7 +331,7 @@ - if (limit > 0) { - st->print("."); - } -- symbolOop n = m->name(); -+ Symbol* n = m->name(); - limit = n->utf8_length(); - for (i = 0 ; i < limit ; i += 1) { - char c = (char) n->byte_at(i); -@@ -339,7 +339,7 @@ - } - if( Verbose ) { - // Disambiguate overloaded methods -- symbolOop sig = m->signature(); -+ Symbol* sig = m->signature(); - sig->print_symbol_on(st); - } - } -diff --git a/src/share/vm/runtime/frame.cpp b/src/share/vm/runtime/frame.cpp ---- openjdk/hotspot/src/share/vm/runtime/frame.cpp -+++ openjdk/hotspot/src/share/vm/runtime/frame.cpp -@@ -792,7 +792,7 @@ - } - - public: -- InterpretedArgumentOopFinder(symbolHandle signature, bool has_receiver, frame* fr, OopClosure* f) : SignatureInfo(signature), _has_receiver(has_receiver) { -+ InterpretedArgumentOopFinder(Symbol* signature, bool has_receiver, frame* fr, OopClosure* f) : SignatureInfo(signature), _has_receiver(has_receiver) { - // compute size of arguments - int args_size = ArgumentSizeComputer(signature).size() + (has_receiver ? 1 : 0); - assert(!fr->is_interpreted_frame() || -@@ -846,7 +846,7 @@ - } - - public: -- EntryFrameOopFinder(frame* frame, symbolHandle signature, bool is_static) : SignatureInfo(signature) { -+ EntryFrameOopFinder(frame* frame, Symbol* signature, bool is_static) : SignatureInfo(signature) { - _f = NULL; // will be set later - _fr = frame; - _is_static = is_static; -@@ -861,7 +861,7 @@ - - }; - --oop* frame::interpreter_callee_receiver_addr(symbolHandle signature) { -+oop* frame::interpreter_callee_receiver_addr(Symbol* signature) { - ArgumentSizeComputer asc(signature); - int size = asc.size(); - return (oop *)interpreter_frame_tos_at(size); -@@ -922,7 +922,7 @@ - - int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals(); - -- symbolHandle signature; -+ Symbol* signature = NULL; - bool has_receiver = false; - - // Process a callee's arguments if we are at a call site -@@ -932,7 +932,7 @@ - if (!m->is_native()) { - Bytecode_invoke call = Bytecode_invoke_check(m, bci); - if (call.is_valid()) { -- signature = symbolHandle(thread, call.signature()); -+ signature = call.signature(); - has_receiver = call.has_receiver(); - if (map->include_argument_oops() && - interpreter_frame_expression_stack_size() > 0) { -@@ -965,7 +965,7 @@ - } - - --void frame::oops_interpreted_arguments_do(symbolHandle signature, bool has_receiver, OopClosure* f) { -+void frame::oops_interpreted_arguments_do(Symbol* signature, bool has_receiver, OopClosure* f) { - InterpretedArgumentOopFinder finder(signature, has_receiver, this, f); - finder.oops_do(); - } -@@ -1014,7 +1014,7 @@ - } - - public: -- CompiledArgumentOopFinder(symbolHandle signature, bool has_receiver, OopClosure* f, frame fr, const RegisterMap* reg_map) -+ CompiledArgumentOopFinder(Symbol* signature, bool has_receiver, OopClosure* f, frame fr, const RegisterMap* reg_map) - : SignatureInfo(signature) { - - // initialize CompiledArgumentOopFinder -@@ -1026,7 +1026,7 @@ - _arg_size = ArgumentSizeComputer(signature).size() + (has_receiver ? 1 : 0); - - int arg_size; -- _regs = SharedRuntime::find_callee_arguments(signature(), has_receiver, &arg_size); -+ _regs = SharedRuntime::find_callee_arguments(signature, has_receiver, &arg_size); - assert(arg_size == _arg_size, "wrong arg size"); - } - -@@ -1039,7 +1039,7 @@ - } - }; - --void frame::oops_compiled_arguments_do(symbolHandle signature, bool has_receiver, const RegisterMap* reg_map, OopClosure* f) { -+void frame::oops_compiled_arguments_do(Symbol* signature, bool has_receiver, const RegisterMap* reg_map, OopClosure* f) { - ResourceMark rm; - CompiledArgumentOopFinder finder(signature, has_receiver, f, *this, reg_map); - finder.oops_do(); -@@ -1099,8 +1099,7 @@ - // must collect argument oops, as nobody else is doing it - Thread *thread = Thread::current(); - methodHandle m (thread, entry_frame_call_wrapper()->callee_method()); -- symbolHandle signature (thread, m->signature()); -- EntryFrameOopFinder finder(this, signature, m->is_static()); -+ EntryFrameOopFinder finder(this, m->signature(), m->is_static()); - finder.arguments_do(f); - } - // Traverse the Handle Block saved in the entry frame -diff --git a/src/share/vm/runtime/frame.hpp b/src/share/vm/runtime/frame.hpp ---- openjdk/hotspot/src/share/vm/runtime/frame.hpp -+++ openjdk/hotspot/src/share/vm/runtime/frame.hpp -@@ -261,10 +261,10 @@ - - // Find receiver for an invoke when arguments are just pushed on stack (i.e., callee stack-frame is - // not setup) -- oop interpreter_callee_receiver(symbolHandle signature) { return *interpreter_callee_receiver_addr(signature); } -+ oop interpreter_callee_receiver(Symbol* signature) { return *interpreter_callee_receiver_addr(signature); } - - -- oop* interpreter_callee_receiver_addr(symbolHandle signature); -+ oop* interpreter_callee_receiver_addr(Symbol* signature); - - - // expression stack (may go up or down, direction == 1 or -1) -@@ -386,11 +386,11 @@ - oop* oopmapreg_to_location(VMReg reg, const RegisterMap* regmap) const; - - // Oops-do's -- void oops_compiled_arguments_do(symbolHandle signature, bool has_receiver, const RegisterMap* reg_map, OopClosure* f); -+ void oops_compiled_arguments_do(Symbol* signature, bool has_receiver, const RegisterMap* reg_map, OopClosure* f); - void oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool query_oop_map_cache = true); - - private: -- void oops_interpreted_arguments_do(symbolHandle signature, bool has_receiver, OopClosure* f); -+ void oops_interpreted_arguments_do(Symbol* signature, bool has_receiver, OopClosure* f); - - // Iteration of oops - void oops_do_internal(OopClosure* f, CodeBlobClosure* cf, RegisterMap* map, bool use_interpreter_oop_map_cache); -diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp ---- openjdk/hotspot/src/share/vm/runtime/globals.hpp -+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp -@@ -607,6 +607,9 @@ - notproduct(bool, ZombieALot, false, \ - "creates zombies (non-entrant) at exit from the runt. system") \ - \ -+ product(bool, UnlinkSymbolsALot, false, \ -+ "unlink unreferenced symbols from the symbol table at safepoints")\ -+ \ - notproduct(bool, WalkStackALot, false, \ - "trace stack (no print) at every exit from the runtime system") \ - \ -diff --git a/src/share/vm/runtime/handles.hpp b/src/share/vm/runtime/handles.hpp ---- openjdk/hotspot/src/share/vm/runtime/handles.hpp -+++ openjdk/hotspot/src/share/vm/runtime/handles.hpp -@@ -196,7 +196,6 @@ - DEF_HANDLE(constantPoolCache, is_constantPoolCache) - DEF_HANDLE(objArray , is_objArray ) - DEF_HANDLE(typeArray , is_typeArray ) --DEF_HANDLE(symbol , is_symbol ) - - //------------------------------------------------------------------------------------------------------------------------ - // Specific KlassHandles for different Klass types -@@ -233,7 +232,6 @@ - DEF_KLASS_HANDLE(arrayKlass , oop_is_array ) - DEF_KLASS_HANDLE(typeArrayKlass , oop_is_typeArray_slow) - DEF_KLASS_HANDLE(objArrayKlass , oop_is_objArray_slow ) --DEF_KLASS_HANDLE(symbolKlass , oop_is_symbol ) - DEF_KLASS_HANDLE(constantPoolKlass , oop_is_constantPool ) - DEF_KLASS_HANDLE(constantPoolCacheKlass, oop_is_constantPool ) - -diff --git a/src/share/vm/runtime/interfaceSupport.cpp b/src/share/vm/runtime/interfaceSupport.cpp ---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.cpp -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.cpp -@@ -198,6 +198,11 @@ - } - } - -+void InterfaceSupport::unlinkSymbols() { -+ VM_UnlinkSymbols op; -+ VMThread::execute(&op); -+} -+ - void InterfaceSupport::deoptimizeAll() { - if (is_init_completed() ) { - if (DeoptimizeALot && deoptimizeAllCounter > DeoptimizeALotInterval) { -diff --git a/src/share/vm/runtime/interfaceSupport.hpp b/src/share/vm/runtime/interfaceSupport.hpp ---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp -@@ -97,6 +97,7 @@ - # endif - - static void zombieAll(); -+ static void unlinkSymbols(); - static void deoptimizeAll(); - static void stress_derived_pointers(); - static void verify_stack(); -@@ -375,6 +376,9 @@ - if (ZombieALot) { - InterfaceSupport::zombieAll(); - } -+ if (UnlinkSymbolsALot) { -+ InterfaceSupport::unlinkSymbols(); -+ } - // do verification AFTER potential deoptimization - if (VerifyStack) { - InterfaceSupport::verify_stack(); -diff --git a/src/share/vm/runtime/java.cpp b/src/share/vm/runtime/java.cpp ---- openjdk/hotspot/src/share/vm/runtime/java.cpp -+++ openjdk/hotspot/src/share/vm/runtime/java.cpp -@@ -41,7 +41,7 @@ - #include "oops/methodOop.hpp" - #include "oops/objArrayOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvmtiExport.hpp" - #include "runtime/aprofiler.hpp" - #include "runtime/arguments.hpp" -@@ -615,7 +615,7 @@ - vm_abort(false); - } - --void vm_exit_during_initialization(symbolHandle ex, const char* message) { -+void vm_exit_during_initialization(Symbol* ex, const char* message) { - ResourceMark rm; - vm_notify_during_shutdown(ex->as_C_string(), message); - -diff --git a/src/share/vm/runtime/java.hpp b/src/share/vm/runtime/java.hpp ---- openjdk/hotspot/src/share/vm/runtime/java.hpp -+++ openjdk/hotspot/src/share/vm/runtime/java.hpp -@@ -49,7 +49,7 @@ - - // VM exit if error occurs during initialization of VM - extern void vm_exit_during_initialization(Handle exception); --extern void vm_exit_during_initialization(symbolHandle exception_name, const char* message); -+extern void vm_exit_during_initialization(Symbol* exception_name, const char* message); - extern void vm_exit_during_initialization(const char* error, const char* message = NULL); - extern void vm_shutdown_during_initialization(const char* error, const char* message = NULL); - -diff --git a/src/share/vm/runtime/javaCalls.cpp b/src/share/vm/runtime/javaCalls.cpp ---- openjdk/hotspot/src/share/vm/runtime/javaCalls.cpp -+++ openjdk/hotspot/src/share/vm/runtime/javaCalls.cpp -@@ -200,7 +200,7 @@ - - // ============ Virtual calls ============ - --void JavaCalls::call_virtual(JavaValue* result, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS) { -+void JavaCalls::call_virtual(JavaValue* result, KlassHandle spec_klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) { - CallInfo callinfo; - Handle receiver = args->receiver(); - KlassHandle recvrKlass(THREAD, receiver.is_null() ? (klassOop)NULL : receiver->klass()); -@@ -215,13 +215,13 @@ - } - - --void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, TRAPS) { -+void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, TRAPS) { - JavaCallArguments args(receiver); // One oop argument - call_virtual(result, spec_klass, name, signature, &args, CHECK); - } - - --void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS) { -+void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS) { - JavaCallArguments args(receiver); // One oop argument - args.push_oop(arg1); - call_virtual(result, spec_klass, name, signature, &args, CHECK); -@@ -229,7 +229,7 @@ - - - --void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS) { -+void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS) { - JavaCallArguments args(receiver); // One oop argument - args.push_oop(arg1); - args.push_oop(arg2); -@@ -239,7 +239,7 @@ - - // ============ Special calls ============ - --void JavaCalls::call_special(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS) { -+void JavaCalls::call_special(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) { - CallInfo callinfo; - LinkResolver::resolve_special_call(callinfo, klass, name, signature, KlassHandle(), false, CHECK); - methodHandle method = callinfo.selected_method(); -@@ -250,20 +250,20 @@ - } - - --void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) { -+void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) { - JavaCallArguments args(receiver); // One oop argument - call_special(result, klass, name, signature, &args, CHECK); - } - - --void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS) { -+void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS) { - JavaCallArguments args(receiver); // One oop argument - args.push_oop(arg1); - call_special(result, klass, name, signature, &args, CHECK); - } - - --void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS) { -+void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS) { - JavaCallArguments args(receiver); // One oop argument - args.push_oop(arg1); - args.push_oop(arg2); -@@ -273,7 +273,7 @@ - - // ============ Static calls ============ - --void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS) { -+void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) { - CallInfo callinfo; - LinkResolver::resolve_static_call(callinfo, klass, name, signature, KlassHandle(), false, true, CHECK); - methodHandle method = callinfo.selected_method(); -@@ -284,19 +284,19 @@ - } - - --void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) { -+void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) { - JavaCallArguments args; // No argument - call_static(result, klass, name, signature, &args, CHECK); - } - - --void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS) { -+void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS) { - JavaCallArguments args(arg1); // One oop argument - call_static(result, klass, name, signature, &args, CHECK); - } - - --void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS) { -+void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS) { - JavaCallArguments args; // One oop argument - args.push_oop(arg1); - args.push_oop(arg2); -@@ -459,7 +459,7 @@ - public: - bool _is_return; - -- SignatureChekker(symbolHandle signature, BasicType return_type, bool is_static, bool* is_oop, intptr_t* value, Thread* thread) : SignatureIterator(signature) { -+ SignatureChekker(Symbol* signature, BasicType return_type, bool is_static, bool* is_oop, intptr_t* value, Thread* thread) : SignatureIterator(signature) { - _is_oop = is_oop; - _is_return = false; - _return_type = return_type; -@@ -550,7 +550,7 @@ - if (return_type == T_ARRAY) return_type = T_OBJECT; - - // Check that oop information is correct -- symbolHandle signature (thread, method->signature()); -+ Symbol* signature = method->signature(); - - SignatureChekker sc(signature, return_type, method->is_static(),_is_oop, _value, thread); - sc.iterate_parameters(); -diff --git a/src/share/vm/runtime/javaCalls.hpp b/src/share/vm/runtime/javaCalls.hpp ---- openjdk/hotspot/src/share/vm/runtime/javaCalls.hpp -+++ openjdk/hotspot/src/share/vm/runtime/javaCalls.hpp -@@ -189,29 +189,29 @@ - // call_special - // ------------ - // The receiver must be first oop in argument list -- static void call_special(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS); -+ static void call_special(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS); - -- static void call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS); // No args -- static void call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS); -- static void call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS); -+ static void call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); // No args -+ static void call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS); -+ static void call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS); - - // virtual call - // ------------ - - // The receiver must be first oop in argument list -- static void call_virtual(JavaValue* result, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS); -+ static void call_virtual(JavaValue* result, KlassHandle spec_klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS); - -- static void call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, TRAPS); // No args -- static void call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS); -- static void call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS); -+ static void call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, TRAPS); // No args -+ static void call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS); -+ static void call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS); - - // Static call - // ----------- -- static void call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS); -+ static void call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS); - -- static void call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS); -- static void call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS); -- static void call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS); -+ static void call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); -+ static void call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS); -+ static void call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS); - - // Low-level interface - static void call(JavaValue* result, methodHandle method, JavaCallArguments* args, TRAPS); -diff --git a/src/share/vm/runtime/objectMonitor.cpp b/src/share/vm/runtime/objectMonitor.cpp ---- openjdk/hotspot/src/share/vm/runtime/objectMonitor.cpp -+++ openjdk/hotspot/src/share/vm/runtime/objectMonitor.cpp -@@ -79,7 +79,7 @@ - char* bytes = NULL; \ - int len = 0; \ - jlong jtid = SharedRuntime::get_java_tid(thread); \ -- symbolOop klassname = ((oop)(klassOop))->klass()->klass_part()->name(); \ -+ Symbol* klassname = ((oop)(klassOop))->klass()->klass_part()->name(); \ - if (klassname != NULL) { \ - bytes = (char*)klassname->bytes(); \ - len = klassname->utf8_length(); \ -diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp ---- openjdk/hotspot/src/share/vm/runtime/os.cpp -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp -@@ -255,7 +255,7 @@ - default: { - // Dispatch the signal to java - HandleMark hm(THREAD); -- klassOop k = SystemDictionary::resolve_or_null(vmSymbolHandles::sun_misc_Signal(), THREAD); -+ klassOop k = SystemDictionary::resolve_or_null(vmSymbols::sun_misc_Signal(), THREAD); - KlassHandle klass (THREAD, k); - if (klass.not_null()) { - JavaValue result(T_VOID); -@@ -264,8 +264,8 @@ - JavaCalls::call_static( - &result, - klass, -- vmSymbolHandles::dispatch_name(), -- vmSymbolHandles::int_void_signature(), -+ vmSymbols::dispatch_name(), -+ vmSymbols::int_void_signature(), - &args, - THREAD - ); -@@ -298,7 +298,7 @@ - if (!ReduceSignalUsage) { - // Setup JavaThread for processing signals - EXCEPTION_MARK; -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), true, CHECK); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK); - instanceKlassHandle klass (THREAD, k); - instanceHandle thread_oop = klass->allocate_instance_handle(CHECK); - -@@ -310,8 +310,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_special(&result, thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - thread_group, - string, - CHECK); -@@ -320,8 +320,8 @@ - JavaCalls::call_special(&result, - thread_group, - group, -- vmSymbolHandles::add_method_name(), -- vmSymbolHandles::thread_void_signature(), -+ vmSymbols::add_method_name(), -+ vmSymbols::thread_void_signature(), - thread_oop, // ARG 1 - CHECK); - -diff --git a/src/share/vm/runtime/reflection.cpp b/src/share/vm/runtime/reflection.cpp ---- openjdk/hotspot/src/share/vm/runtime/reflection.cpp -+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp -@@ -64,7 +64,7 @@ - // this frame is a likely suspect - caller = vfst.method()->method_holder(); - line_number = vfst.method()->line_number_from_bci(vfst.bci()); -- symbolOop s = instanceKlass::cast(vfst.method()->method_holder())->source_file_name(); -+ Symbol* s = instanceKlass::cast(vfst.method()->method_holder())->source_file_name(); - if (s != NULL) { - source_file = s->as_C_string(); - } -@@ -622,7 +622,7 @@ - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, -- vmSymbolHandles::java_lang_IncompatibleClassChangeError(), -+ vmSymbols::java_lang_IncompatibleClassChangeError(), - "%s and %s disagree on InnerClasses attribute", - outer->external_name(), - inner->external_name() -@@ -638,11 +638,11 @@ - return java_lang_Class::primitive_mirror(ss->type()); - case T_OBJECT: - case T_ARRAY: -- symbolOop name = ss->as_symbol(CHECK_NULL); -+ Symbol* name = ss->as_symbol(CHECK_NULL); - oop loader = instanceKlass::cast(method->method_holder())->class_loader(); - oop protection_domain = instanceKlass::cast(method->method_holder())->protection_domain(); - klassOop k = SystemDictionary::resolve_or_fail( -- symbolHandle(THREAD, name), -+ name, - Handle(THREAD, loader), - Handle(THREAD, protection_domain), - true, CHECK_NULL); -@@ -660,7 +660,8 @@ - objArrayHandle mirrors (THREAD, m); - int index = 0; - // Collect parameter types -- symbolHandle signature (THREAD, method->signature()); -+ ResourceMark rm(THREAD); -+ Symbol* signature = method->signature(); - SignatureStream ss(signature); - while (!ss.at_return_type()) { - oop mirror = get_mirror_from_signature(method, &ss, CHECK_(objArrayHandle())); -@@ -681,9 +682,9 @@ - } - - --Handle Reflection::new_type(symbolHandle signature, KlassHandle k, TRAPS) { -+Handle Reflection::new_type(Symbol* signature, KlassHandle k, TRAPS) { - // Basic types -- BasicType type = vmSymbols::signature_type(signature()); -+ BasicType type = vmSymbols::signature_type(signature); - if (type != T_OBJECT) { - return Handle(THREAD, Universe::java_mirror(type)); - } -@@ -714,7 +715,7 @@ - instanceKlassHandle holder (THREAD, method->method_holder()); - int slot = method->method_idnum(); - -- symbolHandle signature (THREAD, method->signature()); -+ Symbol* signature = method->signature(); - int parameter_count = ArgumentCount(signature).size(); - oop return_type_oop = NULL; - objArrayHandle parameter_types = get_parameter_types(method, parameter_count, &return_type_oop, CHECK_NULL); -@@ -726,16 +727,16 @@ - - if (exception_types.is_null()) return NULL; - -- symbolHandle method_name(THREAD, method->name()); -+ Symbol* method_name = method->name(); - Handle name; - if (intern_name) { - // intern_name is only true with UseNewReflection -- oop name_oop = StringTable::intern(method_name(), CHECK_NULL); -+ oop name_oop = StringTable::intern(method_name, CHECK_NULL); - name = Handle(THREAD, name_oop); - } else { - name = java_lang_String::create_from_symbol(method_name, CHECK_NULL); - } -- if (name.is_null()) return NULL; -+ if (name == NULL) return NULL; - - int modifiers = method->access_flags().as_int() & JVM_RECOGNIZED_METHOD_MODIFIERS; - -@@ -751,7 +752,7 @@ - java_lang_reflect_Method::set_override(mh(), false); - if (java_lang_reflect_Method::has_signature_field() && - method->generic_signature() != NULL) { -- symbolHandle gs(THREAD, method->generic_signature()); -+ Symbol* gs = method->generic_signature(); - Handle sig = java_lang_String::create_from_symbol(gs, CHECK_NULL); - java_lang_reflect_Method::set_signature(mh(), sig()); - } -@@ -774,7 +775,7 @@ - instanceKlassHandle holder (THREAD, method->method_holder()); - int slot = method->method_idnum(); - -- symbolHandle signature (THREAD, method->signature()); -+ Symbol* signature = method->signature(); - int parameter_count = ArgumentCount(signature).size(); - objArrayHandle parameter_types = get_parameter_types(method, parameter_count, NULL, CHECK_NULL); - if (parameter_types.is_null()) return NULL; -@@ -794,7 +795,7 @@ - java_lang_reflect_Constructor::set_override(ch(), false); - if (java_lang_reflect_Constructor::has_signature_field() && - method->generic_signature() != NULL) { -- symbolHandle gs(THREAD, method->generic_signature()); -+ Symbol* gs = method->generic_signature(); - Handle sig = java_lang_String::create_from_symbol(gs, CHECK_NULL); - java_lang_reflect_Constructor::set_signature(ch(), sig()); - } -@@ -809,16 +810,16 @@ - - - oop Reflection::new_field(fieldDescriptor* fd, bool intern_name, TRAPS) { -- symbolHandle field_name(THREAD, fd->name()); -+ Symbol* field_name = fd->name(); - Handle name; - if (intern_name) { - // intern_name is only true with UseNewReflection -- oop name_oop = StringTable::intern(field_name(), CHECK_NULL); -+ oop name_oop = StringTable::intern(field_name, CHECK_NULL); - name = Handle(THREAD, name_oop); - } else { - name = java_lang_String::create_from_symbol(field_name, CHECK_NULL); - } -- symbolHandle signature (THREAD, fd->signature()); -+ Symbol* signature = fd->signature(); - KlassHandle holder (THREAD, fd->field_holder()); - Handle type = new_type(signature, holder, CHECK_NULL); - Handle rh = java_lang_reflect_Field::create(CHECK_NULL); -@@ -832,7 +833,7 @@ - java_lang_reflect_Field::set_override(rh(), false); - if (java_lang_reflect_Field::has_signature_field() && - fd->generic_signature() != NULL) { -- symbolHandle gs(THREAD, fd->generic_signature()); -+ Symbol* gs = fd->generic_signature(); - Handle sig = java_lang_String::create_from_symbol(gs, CHECK_NULL); - java_lang_reflect_Field::set_signature(rh(), sig()); - } -@@ -858,8 +859,8 @@ - assert(!method.is_null() , "method should not be null"); - - CallInfo info; -- symbolHandle signature (THREAD, method->signature()); -- symbolHandle name (THREAD, method->name()); -+ Symbol* signature = method->signature(); -+ Symbol* name = method->name(); - LinkResolver::resolve_interface_call(info, receiver, recv_klass, klass, - name, signature, - KlassHandle(), false, true, -@@ -912,8 +913,8 @@ - oop resolution_exception = PENDING_EXCEPTION; - CLEAR_PENDING_EXCEPTION; - JavaCallArguments args(Handle(THREAD, resolution_exception)); -- THROW_ARG_0(vmSymbolHandles::java_lang_reflect_InvocationTargetException(), -- vmSymbolHandles::throwable_void_signature(), -+ THROW_ARG_0(vmSymbols::java_lang_reflect_InvocationTargetException(), -+ vmSymbols::throwable_void_signature(), - &args); - } - } else { -@@ -941,8 +942,8 @@ - method->name(), - method->signature())); - JavaCallArguments args(h_origexception); -- THROW_ARG_0(vmSymbolHandles::java_lang_reflect_InvocationTargetException(), -- vmSymbolHandles::throwable_void_signature(), -+ THROW_ARG_0(vmSymbols::java_lang_reflect_InvocationTargetException(), -+ vmSymbols::throwable_void_signature(), - &args); - } else { - ResourceMark rm(THREAD); -@@ -1043,8 +1044,8 @@ - oop target_exception = PENDING_EXCEPTION; - CLEAR_PENDING_EXCEPTION; - JavaCallArguments args(Handle(THREAD, target_exception)); -- THROW_ARG_0(vmSymbolHandles::java_lang_reflect_InvocationTargetException(), -- vmSymbolHandles::throwable_void_signature(), -+ THROW_ARG_0(vmSymbols::java_lang_reflect_InvocationTargetException(), -+ vmSymbols::throwable_void_signature(), - &args); - } else { - if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT) -@@ -1097,9 +1098,9 @@ - - - oop Reflection::new_field(FieldStream* st, TRAPS) { -- symbolHandle field_name(THREAD, st->name()); -+ Symbol* field_name = st->name(); - Handle name = java_lang_String::create_from_symbol(field_name, CHECK_NULL); -- symbolHandle signature(THREAD, st->signature()); -+ Symbol* signature = st->signature(); - Handle type = new_type(signature, st->klass(), CHECK_NULL); - Handle rh = java_lang_reflect_Field::create(CHECK_NULL); - oop result = rh(); -@@ -1242,7 +1243,7 @@ - case T_ARRAY: { - Handle obj(THREAD, (oop) value->l); - if (obj.not_null()) { -- symbolHandle signature(THREAD, fd->signature()); -+ Symbol* signature = fd->signature(); - Handle loader (THREAD, fd->loader()); - Handle protect (THREAD, Klass::cast(fd->field_holder())->protection_domain()); - klassOop k = SystemDictionary::resolve_or_fail(signature, loader, protect, true, CHECK); // may block -@@ -1259,7 +1260,7 @@ - } - - --oop Reflection::reflect_field(oop mirror, symbolOop field_name, jint which, TRAPS) { -+oop Reflection::reflect_field(oop mirror, Symbol* field_name, jint which, TRAPS) { - // Exclude primitive types and array types - if (java_lang_Class::is_primitive(mirror)) return NULL; - if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) return NULL; -@@ -1287,7 +1288,7 @@ - // Exclude primitive types and array types - if (java_lang_Class::is_primitive(mirror) - || Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) { -- symbolHandle name = vmSymbolHandles::java_lang_reflect_Field(); -+ Symbol* name = vmSymbols::java_lang_reflect_Field(); - klassOop klass = SystemDictionary::resolve_or_fail(name, true, CHECK_NULL); - return oopFactory::new_objArray(klass, 0, CHECK_NULL); // Return empty array - } -@@ -1308,7 +1309,7 @@ - } - - // Allocate result -- symbolHandle name = vmSymbolHandles::java_lang_reflect_Field(); -+ Symbol* name = vmSymbols::java_lang_reflect_Field(); - klassOop klass = SystemDictionary::resolve_or_fail(name, true, CHECK_NULL); - objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL); - objArrayHandle result (THREAD, r); -@@ -1327,7 +1328,7 @@ - } - - --oop Reflection::reflect_method(oop mirror, symbolHandle method_name, objArrayHandle types, jint which, TRAPS) { -+oop Reflection::reflect_method(oop mirror, Symbol* method_name, objArrayHandle types, jint which, TRAPS) { - if (java_lang_Class::is_primitive(mirror)) return NULL; - klassOop klass = java_lang_Class::as_klassOop(mirror); - if (Klass::cast(klass)->oop_is_array() && which == MEMBER_DECLARED) return NULL; -@@ -1351,8 +1352,8 @@ - for (MethodStream st(h_k, false, false); !st.eos(); st.next()) { - methodHandle m(THREAD, st.method()); - // For interfaces include static initializers since classic does that! -- if (method_name() == m->name() && (include_clinit || (m->is_public() && !m->is_static() && !m->is_initializer()))) { -- symbolHandle signature(THREAD, m->signature()); -+ if (method_name == m->name() && (include_clinit || (m->is_public() && !m->is_static() && !m->is_initializer()))) { -+ Symbol* signature = m->signature(); - bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL); - if (parameter_match) { - return new_method(m, false, false, THREAD); -@@ -1364,8 +1365,8 @@ - { - for (MethodStream st(h_k, false, false); !st.eos(); st.next()) { - methodHandle m(THREAD, st.method()); -- if (method_name() == m->name() && m->is_public() && m->is_static() && !m->is_initializer()) { -- symbolHandle signature(THREAD, m->signature()); -+ if (method_name == m->name() && m->is_public() && m->is_static() && !m->is_initializer()) { -+ Symbol* signature = m->signature(); - bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL); - if (parameter_match) { - return new_method(m, false, false, THREAD); -@@ -1379,8 +1380,8 @@ - { - for (MethodStream st(h_k, true, true); !st.eos(); st.next()) { - methodHandle m(THREAD, st.method()); -- if (method_name() == m->name() && !m->is_initializer()) { -- symbolHandle signature(THREAD, m->signature()); -+ if (method_name == m->name() && !m->is_initializer()) { -+ Symbol* signature = m->signature(); - bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL); - if (parameter_match) { - return new_method(m, false, false, THREAD); -@@ -1531,7 +1532,7 @@ - for (MethodStream st(h_k, true, true); !st.eos(); st.next()) { - methodHandle m(THREAD, st.method()); - if (m->name() == vmSymbols::object_initializer_name() && (local_only || m->is_public())) { -- symbolHandle signature(THREAD, m->signature()); -+ Symbol* signature = m->signature(); - bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL); - if (parameter_match) { - return new_constructor(m, THREAD); -@@ -1569,7 +1570,7 @@ - } - - // Allocate result -- symbolHandle name = vmSymbolHandles::java_lang_reflect_Constructor(); -+ Symbol* name = vmSymbols::java_lang_reflect_Constructor(); - klassOop klass = SystemDictionary::resolve_or_fail(name, true, CHECK_NULL); - objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL); - objArrayHandle h_result (THREAD, r); -diff --git a/src/share/vm/runtime/reflection.hpp b/src/share/vm/runtime/reflection.hpp ---- openjdk/hotspot/src/share/vm/runtime/reflection.hpp -+++ openjdk/hotspot/src/share/vm/runtime/reflection.hpp -@@ -55,7 +55,7 @@ - static objArrayHandle get_parameter_types(methodHandle method, int parameter_count, oop* return_type, TRAPS); - static objArrayHandle get_exception_types(methodHandle method, TRAPS); - // Creating new java.lang.reflect.xxx wrappers -- static Handle new_type(symbolHandle signature, KlassHandle k, TRAPS); -+ static Handle new_type(Symbol* signature, KlassHandle k, TRAPS); - - public: - // Constants defined by java reflection api classes -@@ -157,11 +157,11 @@ - static void field_set(jvalue* value, fieldDescriptor* fd, Handle receiver, BasicType value_type, TRAPS); - - // Reflective lookup of fields. Returns java.lang.reflect.Field instances. -- static oop reflect_field(oop mirror, symbolOop field_name, jint which, TRAPS); -+ static oop reflect_field(oop mirror, Symbol* field_name, jint which, TRAPS); - static objArrayOop reflect_fields(oop mirror, jint which, TRAPS); - - // Reflective lookup of methods. Returns java.lang.reflect.Method instances. -- static oop reflect_method(oop mirror, symbolHandle method_name, objArrayHandle types, jint which, TRAPS); -+ static oop reflect_method(oop mirror, Symbol* method_name, objArrayHandle types, jint which, TRAPS); - static objArrayOop reflect_methods(oop mirror, jint which, TRAPS); - - // Reflective lookup of constructors. Returns java.lang.reflect.Constructor instances. -diff --git a/src/share/vm/runtime/reflectionUtils.hpp b/src/share/vm/runtime/reflectionUtils.hpp ---- openjdk/hotspot/src/share/vm/runtime/reflectionUtils.hpp -+++ openjdk/hotspot/src/share/vm/runtime/reflectionUtils.hpp -@@ -100,7 +100,7 @@ - // Usage: - // - // for (FieldStream st(k, false, false); !st.eos(); st.next()) { --// symbolOop field_name = st.name(); -+// Symbol* field_name = st.name(); - // ... - // } - -@@ -126,11 +126,11 @@ - flags.set_flags(fields()->ushort_at(index() + instanceKlass::access_flags_offset)); - return flags; - } -- symbolOop name() const { -+ Symbol* name() const { - int name_index = fields()->ushort_at(index() + instanceKlass::name_index_offset); - return constants()->symbol_at(name_index); - } -- symbolOop signature() const { -+ Symbol* signature() const { - int signature_index = fields()->ushort_at(index() + - instanceKlass::signature_index_offset); - return constants()->symbol_at(signature_index); -@@ -197,7 +197,7 @@ - // Usage: - // - // for (FilteredFieldStream st(k, false, false); !st.eos(); st.next()) { --// symbolOop field_name = st.name(); -+// Symbol* field_name = st.name(); - // ... - // } - -diff --git a/src/share/vm/runtime/rframe.cpp b/src/share/vm/runtime/rframe.cpp ---- openjdk/hotspot/src/share/vm/runtime/rframe.cpp -+++ openjdk/hotspot/src/share/vm/runtime/rframe.cpp -@@ -25,7 +25,7 @@ - #include "precompiled.hpp" - #include "interpreter/interpreter.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/frame.inline.hpp" - #include "runtime/rframe.hpp" - #include "runtime/vframe.hpp" -diff --git a/src/share/vm/runtime/safepoint.cpp b/src/share/vm/runtime/safepoint.cpp ---- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp -+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp -@@ -35,7 +35,7 @@ - #include "memory/resourceArea.hpp" - #include "memory/universe.inline.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/compilationPolicy.hpp" - #include "runtime/deoptimization.hpp" - #include "runtime/frame.inline.hpp" -diff --git a/src/share/vm/runtime/sharedRuntime.cpp b/src/share/vm/runtime/sharedRuntime.cpp ---- openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp -+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp -@@ -527,7 +527,7 @@ - } - - --oop SharedRuntime::retrieve_receiver( symbolHandle sig, frame caller ) { -+oop SharedRuntime::retrieve_receiver( Symbol* sig, frame caller ) { - assert(caller.is_interpreted_frame(), ""); - int args_size = ArgumentSizeComputer(sig).size() + 1; - assert(args_size <= caller.interpreter_frame_expression_stack_size(), "receiver must be on interpreter stack"); -@@ -547,7 +547,7 @@ - Exceptions::_throw(thread, __FILE__, __LINE__, h_exception); - } - --void SharedRuntime::throw_and_post_jvmti_exception(JavaThread *thread, symbolOop name, const char *message) { -+void SharedRuntime::throw_and_post_jvmti_exception(JavaThread *thread, Symbol* name, const char *message) { - Handle h_exception = Exceptions::new_exception(thread, name, message); - throw_and_post_jvmti_exception(thread, h_exception); - } -@@ -880,7 +880,7 @@ - assert(DTraceAllocProbes, "wrong call"); - Klass* klass = o->blueprint(); - int size = o->size(); -- symbolOop name = klass->name(); -+ Symbol* name = klass->name(); - HS_DTRACE_PROBE4(hotspot, object__alloc, get_java_tid(thread), - name->bytes(), name->utf8_length(), size * HeapWordSize); - return 0; -@@ -889,9 +889,9 @@ - JRT_LEAF(int, SharedRuntime::dtrace_method_entry( - JavaThread* thread, methodOopDesc* method)) - assert(DTraceMethodProbes, "wrong call"); -- symbolOop kname = method->klass_name(); -- symbolOop name = method->name(); -- symbolOop sig = method->signature(); -+ Symbol* kname = method->klass_name(); -+ Symbol* name = method->name(); -+ Symbol* sig = method->signature(); - HS_DTRACE_PROBE7(hotspot, method__entry, get_java_tid(thread), - kname->bytes(), kname->utf8_length(), - name->bytes(), name->utf8_length(), -@@ -902,9 +902,9 @@ - JRT_LEAF(int, SharedRuntime::dtrace_method_exit( - JavaThread* thread, methodOopDesc* method)) - assert(DTraceMethodProbes, "wrong call"); -- symbolOop kname = method->klass_name(); -- symbolOop name = method->name(); -- symbolOop sig = method->signature(); -+ Symbol* kname = method->klass_name(); -+ Symbol* name = method->name(); -+ Symbol* sig = method->signature(); - HS_DTRACE_PROBE7(hotspot, method__return, get_java_tid(thread), - kname->bytes(), kname->utf8_length(), - name->bytes(), name->utf8_length(), -@@ -2637,7 +2637,7 @@ - return regs.first(); - } - --VMRegPair *SharedRuntime::find_callee_arguments(symbolOop sig, bool has_receiver, int* arg_size) { -+VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver, int* arg_size) { - // This method is returning a data structure allocating as a - // ResourceObject, so do not put any ResourceMarks in here. - char *s = sig->as_C_string(); -diff --git a/src/share/vm/runtime/sharedRuntime.hpp b/src/share/vm/runtime/sharedRuntime.hpp ---- openjdk/hotspot/src/share/vm/runtime/sharedRuntime.hpp -+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.hpp -@@ -223,7 +223,7 @@ - - // Helper routine for full-speed JVMTI exception throwing support - static void throw_and_post_jvmti_exception(JavaThread *thread, Handle h_exception); -- static void throw_and_post_jvmti_exception(JavaThread *thread, symbolOop name, const char *message = NULL); -+ static void throw_and_post_jvmti_exception(JavaThread *thread, Symbol* name, const char *message = NULL); - - // RedefineClasses() tracing support for obsolete method entry - static int rc_trace_method_entry(JavaThread* thread, methodOopDesc* m); -@@ -237,7 +237,7 @@ - // Used to back off a spin lock that is under heavy contention - static void yield_all(JavaThread* thread, int attempts = 0); - -- static oop retrieve_receiver( symbolHandle sig, frame caller ); -+ static oop retrieve_receiver( Symbol* sig, frame caller ); - - static void register_finalizer(JavaThread* thread, oopDesc* obj); - -@@ -417,7 +417,7 @@ - - // Convert a sig into a calling convention register layout - // and find interesting things about it. -- static VMRegPair* find_callee_arguments(symbolOop sig, bool has_receiver, int *arg_size); -+ static VMRegPair* find_callee_arguments(Symbol* sig, bool has_receiver, int *arg_size); - static VMReg name_for_receiver(); - - // "Top of Stack" slots that may be unused by the calling convention but must -diff --git a/src/share/vm/runtime/signature.cpp b/src/share/vm/runtime/signature.cpp ---- openjdk/hotspot/src/share/vm/runtime/signature.cpp -+++ openjdk/hotspot/src/share/vm/runtime/signature.cpp -@@ -28,7 +28,7 @@ - #include "memory/oopFactory.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "oops/typeArrayKlass.hpp" - #include "runtime/signature.hpp" - -@@ -44,25 +44,11 @@ - // ClassName = string. - - --SignatureIterator::SignatureIterator(symbolHandle signature) { -- assert(signature->is_symbol(), "not a symbol"); -+SignatureIterator::SignatureIterator(Symbol* signature) { - _signature = signature; - _parameter_index = 0; - } - --// Overloaded version called without handle --SignatureIterator::SignatureIterator(symbolOop signature) { -- symbolHandle sh(Thread::current(), signature); -- _signature = sh; -- _parameter_index = 0; --} -- --SignatureIterator::SignatureIterator(Thread *thread, symbolOop signature) { -- symbolHandle sh(thread, signature); -- _signature = sh; -- _parameter_index = 0; --} -- - void SignatureIterator::expect(char c) { - if (_signature->byte_at(_index) != c) fatal(err_msg("expecting %c", c)); - _index++; -@@ -70,7 +56,7 @@ - - - void SignatureIterator::skip_optional_size() { -- symbolOop sig = _signature(); -+ Symbol* sig = _signature; - char c = sig->byte_at(_index); - while ('0' <= c && c <= '9') c = sig->byte_at(++_index); - } -@@ -104,7 +90,7 @@ - _index++; size = T_VOID_size; ; break; - case 'L': - { int begin = ++_index; -- symbolOop sig = _signature(); -+ Symbol* sig = _signature; - while (sig->byte_at(_index++) != ';') ; - do_object(begin, _index); - } -@@ -114,7 +100,7 @@ - case '[': - { int begin = ++_index; - skip_optional_size(); -- symbolOop sig = _signature(); -+ Symbol* sig = _signature; - while (sig->byte_at(_index) == '[') { - _index++; - skip_optional_size(); -@@ -237,7 +223,7 @@ - // Ignore parameters - _index = 0; - expect('('); -- symbolOop sig = _signature(); -+ Symbol* sig = _signature; - while (sig->byte_at(_index) != ')') _index++; - expect(')'); - // Parse return type -@@ -264,9 +250,22 @@ - - - // Implementation of SignatureStream -+SignatureStream::SignatureStream(Symbol* signature, bool is_method) : -+ _signature(signature), _at_return_type(false) { -+ _begin = _end = (is_method ? 1 : 0); // skip first '(' in method signatures -+ _names = new GrowableArray<Symbol*>(10); -+ next(); -+} -+ -+SignatureStream::~SignatureStream() { -+ // decrement refcount for names created during signature parsing -+ for (int i = 0; i < _names->length(); i++) { -+ _names->at(i)->decrement_refcount(); -+ } -+} - - bool SignatureStream::is_done() const { -- return _end > _signature()->utf8_length(); -+ return _end > _signature->utf8_length(); - } - - -@@ -274,13 +273,13 @@ - switch (t) { - case 'L': { - _type = T_OBJECT; -- symbolOop sig = _signature(); -+ Symbol* sig = _signature; - while (sig->byte_at(_end++) != ';'); - break; - } - case '[': { - _type = T_ARRAY; -- symbolOop sig = _signature(); -+ Symbol* sig = _signature; - char c = sig->byte_at(_end); - while ('0' <= c && c <= '9') c = sig->byte_at(_end++); - while (sig->byte_at(_end) == '[') { -@@ -319,25 +318,28 @@ - return _type == T_ARRAY; - } - --symbolOop SignatureStream::as_symbol(TRAPS) { -+Symbol* SignatureStream::as_symbol(TRAPS) { - // Create a symbol from for string _begin _end - int begin = _begin; - int end = _end; - -- if ( _signature()->byte_at(_begin) == 'L' -- && _signature()->byte_at(_end-1) == ';') { -+ if ( _signature->byte_at(_begin) == 'L' -+ && _signature->byte_at(_end-1) == ';') { - begin++; - end--; - } - -- symbolOop result = oopFactory::new_symbol(_signature, begin, end, CHECK_NULL); -- return result; -+ // Save names for cleaning up reference count at the end of -+ // SignatureStream scope. -+ Symbol* name = SymbolTable::new_symbol(_signature, begin, end, CHECK_NULL); -+ _names->push(name); // save new symbol for decrementing later -+ return name; - } - - klassOop SignatureStream::as_klass(Handle class_loader, Handle protection_domain, - FailureMode failure_mode, TRAPS) { - if (!is_object()) return NULL; -- symbolOop name = as_symbol(CHECK_NULL); -+ Symbol* name = as_symbol(CHECK_NULL); - if (failure_mode == ReturnNull) { - return SystemDictionary::resolve_or_null(name, class_loader, protection_domain, THREAD); - } else { -@@ -355,28 +357,28 @@ - return Klass::cast(klass)->java_mirror(); - } - --symbolOop SignatureStream::as_symbol_or_null() { -+Symbol* SignatureStream::as_symbol_or_null() { - // Create a symbol from for string _begin _end - ResourceMark rm; - - int begin = _begin; - int end = _end; - -- if ( _signature()->byte_at(_begin) == 'L' -- && _signature()->byte_at(_end-1) == ';') { -+ if ( _signature->byte_at(_begin) == 'L' -+ && _signature->byte_at(_end-1) == ';') { - begin++; - end--; - } - - char* buffer = NEW_RESOURCE_ARRAY(char, end - begin); - for (int index = begin; index < end; index++) { -- buffer[index - begin] = _signature()->byte_at(index); -+ buffer[index - begin] = _signature->byte_at(index); - } -- symbolOop result = SymbolTable::probe(buffer, end - begin); -+ Symbol* result = SymbolTable::probe(buffer, end - begin); - return result; - } - --bool SignatureVerifier::is_valid_signature(symbolHandle sig) { -+bool SignatureVerifier::is_valid_signature(Symbol* sig) { - const char* signature = (const char*)sig->bytes(); - ssize_t len = sig->utf8_length(); - if (signature == NULL || signature[0] == '\0' || len < 1) { -@@ -388,7 +390,7 @@ - } - } - --bool SignatureVerifier::is_valid_method_signature(symbolHandle sig) { -+bool SignatureVerifier::is_valid_method_signature(Symbol* sig) { - const char* method_sig = (const char*)sig->bytes(); - ssize_t len = sig->utf8_length(); - ssize_t index = 0; -@@ -411,7 +413,7 @@ - return false; - } - --bool SignatureVerifier::is_valid_type_signature(symbolHandle sig) { -+bool SignatureVerifier::is_valid_type_signature(Symbol* sig) { - const char* type_sig = (const char*)sig->bytes(); - ssize_t len = sig->utf8_length(); - return (type_sig != NULL && len >= 1 && -diff --git a/src/share/vm/runtime/signature.hpp b/src/share/vm/runtime/signature.hpp ---- openjdk/hotspot/src/share/vm/runtime/signature.hpp -+++ openjdk/hotspot/src/share/vm/runtime/signature.hpp -@@ -47,7 +47,7 @@ - - class SignatureIterator: public ResourceObj { - protected: -- symbolHandle _signature; // the signature to iterate over -+ Symbol* _signature; // the signature to iterate over - int _index; // the current character index (only valid during iteration) - int _parameter_index; // the current parameter index (0 outside iteration phase) - BasicType _return_type; -@@ -87,9 +87,7 @@ - }; - - // Constructors -- SignatureIterator(symbolOop signature); -- SignatureIterator(Thread *thread, symbolOop signature); -- SignatureIterator(symbolHandle signature); -+ SignatureIterator(Symbol* signature); - - // Iteration - void dispatch_field(); // dispatches once for field signatures -@@ -138,7 +136,7 @@ - void do_array (int begin, int end) { type_name("jobject" ); } - - public: -- SignatureTypeNames(symbolHandle signature) : SignatureIterator(signature) {} -+ SignatureTypeNames(Symbol* signature) : SignatureIterator(signature) {} - }; - - -@@ -166,7 +164,7 @@ - void do_array (int begin, int end) { set(T_ARRAY_size , T_ARRAY ); } - - public: -- SignatureInfo(symbolHandle signature) : SignatureIterator(signature) { -+ SignatureInfo(Symbol* signature) : SignatureIterator(signature) { - _has_iterated = _has_iterated_return = false; - _size = 0; - _return_type = T_ILLEGAL; -@@ -181,7 +179,7 @@ - private: - void set(int size, BasicType type) { _size += size; } - public: -- ArgumentSizeComputer(symbolHandle signature) : SignatureInfo(signature) {} -+ ArgumentSizeComputer(Symbol* signature) : SignatureInfo(signature) {} - - int size() { lazy_iterate_parameters(); return _size; } - }; -@@ -191,7 +189,7 @@ - private: - void set(int size, BasicType type) { _size ++; } - public: -- ArgumentCount(symbolHandle signature) : SignatureInfo(signature) {} -+ ArgumentCount(Symbol* signature) : SignatureInfo(signature) {} - - int size() { lazy_iterate_parameters(); return _size; } - }; -@@ -205,7 +203,7 @@ - public: - BasicType type() { lazy_iterate_return(); return _return_type; } - -- ResultTypeFinder(symbolHandle signature) : SignatureInfo(signature) {} -+ ResultTypeFinder(Symbol* signature) : SignatureInfo(signature) {} - }; - - -@@ -238,11 +236,6 @@ - _fingerprint = 0; - } - -- Fingerprinter(Thread *thread, methodHandle method) : SignatureIterator(thread, method->signature()) { -- mh = method; -- _fingerprint = 0; -- } -- - uint64_t fingerprint() { - // See if we fingerprinted this method already - if (mh->constMethod()->fingerprint() != CONST64(0)) { -@@ -356,18 +349,19 @@ - - class SignatureStream : public StackObj { - private: -- symbolHandle _signature; -+ Symbol* _signature; - int _begin; - int _end; - BasicType _type; - bool _at_return_type; -+ GrowableArray<Symbol*>* _names; // symbols created while parsing signature - - public: - bool at_return_type() const { return _at_return_type; } - bool is_done() const; - void next_non_primitive(int t); - void next() { -- symbolOop sig = _signature(); -+ Symbol* sig = _signature; - int len = sig->utf8_length(); - if (_end >= len) { - _end = len + 1; -@@ -392,32 +386,28 @@ - _end++; - } - -- SignatureStream(symbolHandle signature, -- bool is_method = true) : -- _signature(signature), _at_return_type(false) { -- _begin = _end = (is_method ? 1 : 0); // skip first '(' in method signatures -- next(); -- } -+ SignatureStream(Symbol* signature, bool is_method = true); -+ ~SignatureStream(); - - bool is_object() const; // True if this argument is an object - bool is_array() const; // True if this argument is an array - BasicType type() const { return _type; } -- symbolOop as_symbol(TRAPS); -+ Symbol* as_symbol(TRAPS); - enum FailureMode { ReturnNull, CNFException, NCDFError }; - klassOop as_klass(Handle class_loader, Handle protection_domain, FailureMode failure_mode, TRAPS); - oop as_java_mirror(Handle class_loader, Handle protection_domain, FailureMode failure_mode, TRAPS); - - // return same as_symbol except allocation of new symbols is avoided. -- symbolOop as_symbol_or_null(); -+ Symbol* as_symbol_or_null(); - }; - - class SignatureVerifier : public StackObj { - public: - // Returns true if the symbol is valid method or type signature -- static bool is_valid_signature(symbolHandle sig); -+ static bool is_valid_signature(Symbol* sig); - -- static bool is_valid_method_signature(symbolHandle sig); -- static bool is_valid_type_signature(symbolHandle sig); -+ static bool is_valid_method_signature(Symbol* sig); -+ static bool is_valid_type_signature(Symbol* sig); - private: - - static ssize_t is_valid_type(const char*, ssize_t); -diff --git a/src/share/vm/runtime/statSampler.cpp b/src/share/vm/runtime/statSampler.cpp ---- openjdk/hotspot/src/share/vm/runtime/statSampler.cpp -+++ openjdk/hotspot/src/share/vm/runtime/statSampler.cpp -@@ -196,8 +196,8 @@ - // public static String getProperty(String key, String def); - JavaCalls::call_static(&result, - KlassHandle(THREAD, SystemDictionary::System_klass()), -- vmSymbolHandles::getProperty_name(), -- vmSymbolHandles::string_string_signature(), -+ vmSymbols::getProperty_name(), -+ vmSymbols::string_string_signature(), - key_str, - CHECK_NULL); - -diff --git a/src/share/vm/runtime/synchronizer.cpp b/src/share/vm/runtime/synchronizer.cpp ---- openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp -+++ openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp -@@ -82,7 +82,7 @@ - char* bytes = NULL; \ - int len = 0; \ - jlong jtid = SharedRuntime::get_java_tid(thread); \ -- symbolOop klassname = ((oop)(klassOop))->klass()->klass_part()->name(); \ -+ Symbol* klassname = ((oop)(klassOop))->klass()->klass_part()->name(); \ - if (klassname != NULL) { \ - bytes = (char*)klassname->bytes(); \ - len = klassname->utf8_length(); \ -diff --git a/src/share/vm/runtime/thread.cpp b/src/share/vm/runtime/thread.cpp ---- openjdk/hotspot/src/share/vm/runtime/thread.cpp -+++ openjdk/hotspot/src/share/vm/runtime/thread.cpp -@@ -37,7 +37,7 @@ - #include "oops/instanceKlass.hpp" - #include "oops/objArrayOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "prims/jvm_misc.hpp" - #include "prims/jvmtiExport.hpp" - #include "prims/jvmtiThreadState.hpp" -@@ -891,7 +891,7 @@ - return os::create_main_thread((JavaThread*)this); - } - --static void initialize_class(symbolHandle class_name, TRAPS) { -+static void initialize_class(Symbol* class_name, TRAPS) { - klassOop klass = SystemDictionary::resolve_or_fail(class_name, true, CHECK); - instanceKlass::cast(klass)->initialize(CHECK); - } -@@ -899,7 +899,7 @@ - - // Creates the initial ThreadGroup - static Handle create_initial_thread_group(TRAPS) { -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_ThreadGroup(), true, CHECK_NH); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ThreadGroup(), true, CHECK_NH); - instanceKlassHandle klass (THREAD, k); - - Handle system_instance = klass->allocate_instance_handle(CHECK_NH); -@@ -908,8 +908,8 @@ - JavaCalls::call_special(&result, - system_instance, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::void_method_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::void_method_signature(), - CHECK_NH); - } - Universe::set_system_thread_group(system_instance()); -@@ -921,8 +921,8 @@ - JavaCalls::call_special(&result, - main_instance, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - system_instance, - string, - CHECK_NH); -@@ -932,7 +932,7 @@ - - // Creates the initial Thread - static oop create_initial_thread(Handle thread_group, JavaThread* thread, TRAPS) { -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), true, CHECK_NULL); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK_NULL); - instanceKlassHandle klass (THREAD, k); - instanceHandle thread_oop = klass->allocate_instance_handle(CHECK_NULL); - -@@ -945,8 +945,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_special(&result, thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - thread_group, - string, - CHECK_NULL); -@@ -954,12 +954,12 @@ - } - - static void call_initializeSystemClass(TRAPS) { -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_System(), true, CHECK); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK); - instanceKlassHandle klass (THREAD, k); - - JavaValue result(T_VOID); -- JavaCalls::call_static(&result, klass, vmSymbolHandles::initializeSystemClass_name(), -- vmSymbolHandles::void_method_signature(), CHECK); -+ JavaCalls::call_static(&result, klass, vmSymbols::initializeSystemClass_name(), -+ vmSymbols::void_method_signature(), CHECK); - } - - #ifdef KERNEL -@@ -973,8 +973,8 @@ - } - - JavaValue result(T_VOID); -- JavaCalls::call_static(&result, klass, vmSymbolHandles::setBootClassLoaderHook_name(), -- vmSymbolHandles::void_method_signature(), CHECK); -+ JavaCalls::call_static(&result, klass, vmSymbols::setBootClassLoaderHook_name(), -+ vmSymbols::void_method_signature(), CHECK); - } - #endif // KERNEL - -@@ -985,8 +985,8 @@ - instanceKlassHandle klass (THREAD, k); - if (klass.not_null()) { - JavaValue result(T_VOID); -- JavaCalls::call_static(&result, klass, vmSymbolHandles::run_method_name(), -- vmSymbolHandles::void_method_signature(), -+ JavaCalls::call_static(&result, klass, vmSymbols::run_method_name(), -+ vmSymbols::void_method_signature(), - CHECK); - } - } -@@ -997,7 +997,7 @@ - const char *vm_info = VM_Version::vm_info_string(); - - // java.lang.System class -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_System(), true, CHECK); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK); - instanceKlassHandle klass (THREAD, k); - - // setProperty arguments -@@ -1010,8 +1010,8 @@ - // public static String setProperty(String key, String value); - JavaCalls::call_static(&r, - klass, -- vmSymbolHandles::setProperty_name(), -- vmSymbolHandles::string_string_string_signature(), -+ vmSymbols::setProperty_name(), -+ vmSymbols::string_string_string_signature(), - key_str, - value_str, - CHECK); -@@ -1022,7 +1022,7 @@ - assert(thread_group.not_null(), "thread group should be specified"); - assert(threadObj() == NULL, "should only create Java thread object once"); - -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), true, CHECK); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK); - instanceKlassHandle klass (THREAD, k); - instanceHandle thread_oop = klass->allocate_instance_handle(CHECK); - -@@ -1037,8 +1037,8 @@ - JavaCalls::call_special(&result, - thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - thread_group, // Argument 1 - name, // Argument 2 - THREAD); -@@ -1048,8 +1048,8 @@ - JavaCalls::call_special(&result, - thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_runnable_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_runnable_void_signature(), - thread_group, // Argument 1 - Handle(), // Argument 2 - THREAD); -@@ -1070,8 +1070,8 @@ - JavaCalls::call_special(&result, - thread_group, - group, -- vmSymbolHandles::add_method_name(), -- vmSymbolHandles::thread_void_signature(), -+ vmSymbols::add_method_name(), -+ vmSymbols::thread_void_signature(), - threadObj, // Arg 1 - THREAD); - -@@ -1590,8 +1590,8 @@ - CallInfo callinfo; - KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass()); - LinkResolver::resolve_virtual_call(callinfo, threadObj, recvrKlass, thread_klass, -- vmSymbolHandles::dispatchUncaughtException_name(), -- vmSymbolHandles::throwable_void_signature(), -+ vmSymbols::dispatchUncaughtException_name(), -+ vmSymbols::throwable_void_signature(), - KlassHandle(), false, false, THREAD); - CLEAR_PENDING_EXCEPTION; - methodHandle method = callinfo.selected_method(); -@@ -1599,8 +1599,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_virtual(&result, - threadObj, thread_klass, -- vmSymbolHandles::dispatchUncaughtException_name(), -- vmSymbolHandles::throwable_void_signature(), -+ vmSymbols::dispatchUncaughtException_name(), -+ vmSymbols::throwable_void_signature(), - uncaught_exception, - THREAD); - } else { -@@ -1608,8 +1608,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_virtual(&result, - group, thread_group, -- vmSymbolHandles::uncaughtException_name(), -- vmSymbolHandles::thread_throwable_void_signature(), -+ vmSymbols::uncaughtException_name(), -+ vmSymbols::thread_throwable_void_signature(), - threadObj, // Arg 1 - uncaught_exception, // Arg 2 - THREAD); -@@ -1628,8 +1628,8 @@ - KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass()); - JavaCalls::call_virtual(&result, - threadObj, thread_klass, -- vmSymbolHandles::exit_method_name(), -- vmSymbolHandles::void_method_signature(), -+ vmSymbols::exit_method_name(), -+ vmSymbols::void_method_signature(), - THREAD); - CLEAR_PENDING_EXCEPTION; - } -@@ -3161,7 +3161,7 @@ - } - - if (InitializeJavaLangString) { -- initialize_class(vmSymbolHandles::java_lang_String(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_String(), CHECK_0); - } else { - warning("java.lang.String not initialized"); - } -@@ -3171,10 +3171,10 @@ - // Forcibly initialize java/util/HashMap and mutate the private - // static final "frontCacheEnabled" field before we start creating instances - #ifdef ASSERT -- klassOop tmp_k = SystemDictionary::find(vmSymbolHandles::java_util_HashMap(), Handle(), Handle(), CHECK_0); -+ klassOop tmp_k = SystemDictionary::find(vmSymbols::java_util_HashMap(), Handle(), Handle(), CHECK_0); - assert(tmp_k == NULL, "java/util/HashMap should not be loaded yet"); - #endif -- klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_util_HashMap(), Handle(), Handle(), CHECK_0); -+ klassOop k_o = SystemDictionary::resolve_or_null(vmSymbols::java_util_HashMap(), Handle(), Handle(), CHECK_0); - KlassHandle k = KlassHandle(THREAD, k_o); - guarantee(k.not_null(), "Must find java/util/HashMap"); - instanceKlassHandle ik = instanceKlassHandle(THREAD, k()); -@@ -3189,7 +3189,7 @@ - if (UseStringCache) { - // Forcibly initialize java/lang/StringValue and mutate the private - // static final "stringCacheEnabled" field before we start creating instances -- klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_StringValue(), Handle(), Handle(), CHECK_0); -+ klassOop k_o = SystemDictionary::resolve_or_null(vmSymbols::java_lang_StringValue(), Handle(), Handle(), CHECK_0); - // Possible that StringValue isn't present: if so, silently don't break - if (k_o != NULL) { - KlassHandle k = KlassHandle(THREAD, k_o); -@@ -3206,11 +3206,11 @@ - - // Initialize java_lang.System (needed before creating the thread) - if (InitializeJavaLangSystem) { -- initialize_class(vmSymbolHandles::java_lang_System(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_ThreadGroup(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_System(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_ThreadGroup(), CHECK_0); - Handle thread_group = create_initial_thread_group(CHECK_0); - Universe::set_main_thread_group(thread_group()); -- initialize_class(vmSymbolHandles::java_lang_Thread(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_Thread(), CHECK_0); - oop thread_object = create_initial_thread(thread_group, main_thread, CHECK_0); - main_thread->set_threadObj(thread_object); - // Set thread status to running since main thread has -@@ -3219,10 +3219,10 @@ - java_lang_Thread::RUNNABLE); - - // The VM preresolve methods to these classes. Make sure that get initialized -- initialize_class(vmSymbolHandles::java_lang_reflect_Method(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_ref_Finalizer(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0); - // The VM creates & returns objects of this class. Make sure it's initialized. -- initialize_class(vmSymbolHandles::java_lang_Class(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_Class(), CHECK_0); - call_initializeSystemClass(CHECK_0); - } else { - warning("java.lang.System not initialized"); -@@ -3230,13 +3230,13 @@ - - // an instance of OutOfMemory exception has been allocated earlier - if (InitializeJavaLangExceptionsErrors) { -- initialize_class(vmSymbolHandles::java_lang_OutOfMemoryError(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_NullPointerException(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_ClassCastException(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_ArrayStoreException(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_ArithmeticException(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_StackOverflowError(), CHECK_0); -- initialize_class(vmSymbolHandles::java_lang_IllegalMonitorStateException(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_OutOfMemoryError(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_NullPointerException(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_ClassCastException(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_ArrayStoreException(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_ArithmeticException(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_StackOverflowError(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_IllegalMonitorStateException(), CHECK_0); - } else { - warning("java.lang.OutOfMemoryError has not been initialized"); - warning("java.lang.NullPointerException has not been initialized"); -@@ -3262,7 +3262,7 @@ - // Future Fix : the best fix is to grant everyone permissions to read "java.compiler" and - // read and write"java.vm.info" in the default policy file. See bugid 4211383 - // Once that is done, we should remove this hack. -- initialize_class(vmSymbolHandles::java_lang_Compiler(), CHECK_0); -+ initialize_class(vmSymbols::java_lang_Compiler(), CHECK_0); - - // More hackery - the static initializer of java.lang.Compiler adds the string "nojit" to - // the java.vm.info property if no jit gets loaded through java.lang.Compiler (the hotspot -@@ -3588,7 +3588,7 @@ - - EXCEPTION_MARK; - klassOop k = -- SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_Shutdown(), -+ SystemDictionary::resolve_or_null(vmSymbols::java_lang_Shutdown(), - THREAD); - if (k != NULL) { - // SystemDictionary::resolve_or_null will return null if there was -@@ -3602,8 +3602,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_static(&result, - shutdown_klass, -- vmSymbolHandles::shutdown_method_name(), -- vmSymbolHandles::void_method_signature(), -+ vmSymbols::shutdown_method_name(), -+ vmSymbols::void_method_signature(), - THREAD); - } - CLEAR_PENDING_EXCEPTION; -diff --git a/src/share/vm/runtime/vframe.cpp b/src/share/vm/runtime/vframe.cpp ---- openjdk/hotspot/src/share/vm/runtime/vframe.cpp -+++ openjdk/hotspot/src/share/vm/runtime/vframe.cpp -@@ -552,7 +552,7 @@ - tty->print("%s.%s", Klass::cast(k)->internal_name(), m->name()->as_C_string()); - - if (!m->is_native()) { -- symbolOop source_name = instanceKlass::cast(k)->source_file_name(); -+ Symbol* source_name = instanceKlass::cast(k)->source_file_name(); - int line_number = m->line_number_from_bci(bci()); - if (source_name != NULL && (line_number != -1)) { - tty->print("(%s:%d)", source_name->as_C_string(), line_number); -diff --git a/src/share/vm/runtime/vmStructs.cpp b/src/share/vm/runtime/vmStructs.cpp ---- openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp -@@ -83,8 +83,7 @@ - #include "oops/objArrayKlassKlass.hpp" - #include "oops/objArrayOop.hpp" - #include "oops/oop.inline.hpp" --#include "oops/symbolKlass.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "oops/typeArrayKlass.hpp" - #include "oops/typeArrayKlassKlass.hpp" - #include "oops/typeArrayOop.hpp" -@@ -246,8 +245,8 @@ - nonstatic_field(instanceKlass, _class_loader, oop) \ - nonstatic_field(instanceKlass, _protection_domain, oop) \ - nonstatic_field(instanceKlass, _signers, objArrayOop) \ -- nonstatic_field(instanceKlass, _source_file_name, symbolOop) \ -- nonstatic_field(instanceKlass, _source_debug_extension, symbolOop) \ -+ nonstatic_field(instanceKlass, _source_file_name, Symbol*) \ -+ nonstatic_field(instanceKlass, _source_debug_extension, Symbol*) \ - nonstatic_field(instanceKlass, _inner_classes, typeArrayOop) \ - nonstatic_field(instanceKlass, _nonstatic_field_size, int) \ - nonstatic_field(instanceKlass, _static_field_size, int) \ -@@ -265,7 +264,7 @@ - nonstatic_field(instanceKlass, _jni_ids, JNIid*) \ - nonstatic_field(instanceKlass, _osr_nmethods_head, nmethod*) \ - nonstatic_field(instanceKlass, _breakpoints, BreakpointInfo*) \ -- nonstatic_field(instanceKlass, _generic_signature, symbolOop) \ -+ nonstatic_field(instanceKlass, _generic_signature, Symbol*) \ - nonstatic_field(instanceKlass, _methods_jmethod_ids, jmethodID*) \ - nonstatic_field(instanceKlass, _methods_cached_itable_indices, int*) \ - volatile_nonstatic_field(instanceKlass, _idnum_allocated_count, u2) \ -@@ -282,7 +281,7 @@ - nonstatic_field(Klass, _modifier_flags, jint) \ - nonstatic_field(Klass, _super, klassOop) \ - nonstatic_field(Klass, _layout_helper, jint) \ -- nonstatic_field(Klass, _name, symbolOop) \ -+ nonstatic_field(Klass, _name, Symbol*) \ - nonstatic_field(Klass, _access_flags, AccessFlags) \ - nonstatic_field(Klass, _subklass, klassOop) \ - nonstatic_field(Klass, _next_sibling, klassOop) \ -@@ -326,9 +325,10 @@ - nonstatic_field(constMethodOopDesc, _generic_signature_index, u2) \ - nonstatic_field(objArrayKlass, _element_klass, klassOop) \ - nonstatic_field(objArrayKlass, _bottom_klass, klassOop) \ -- nonstatic_field(symbolKlass, _alloc_size, juint) \ -- nonstatic_field(symbolOopDesc, _length, unsigned short) \ -- unchecked_nonstatic_field(symbolOopDesc, _body, sizeof(jbyte)) /* NOTE: no type */ \ -+ volatile_nonstatic_field(Symbol, _refcount, int) \ -+ nonstatic_field(Symbol, _identity_hash, int) \ -+ nonstatic_field(Symbol, _length, unsigned short) \ -+ unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \ - nonstatic_field(typeArrayKlass, _max_length, int) \ - \ - /***********************/ \ -@@ -375,7 +375,6 @@ - static_field(Universe, _longArrayKlassObj, klassOop) \ - static_field(Universe, _singleArrayKlassObj, klassOop) \ - static_field(Universe, _doubleArrayKlassObj, klassOop) \ -- static_field(Universe, _symbolKlassObj, klassOop) \ - static_field(Universe, _methodKlassObj, klassOop) \ - static_field(Universe, _constMethodKlassObj, klassOop) \ - static_field(Universe, _methodDataKlassObj, klassOop) \ -@@ -648,7 +647,7 @@ - \ - nonstatic_field(BasicHashtableEntry, _next, BasicHashtableEntry*) \ - nonstatic_field(BasicHashtableEntry, _hash, unsigned int) \ -- nonstatic_field(HashtableEntry, _literal, oop) \ -+ nonstatic_field(HashtableEntry<intptr_t>, _literal, intptr_t) \ - \ - /*************/ \ - /* Hashtable */ \ -@@ -683,7 +682,7 @@ - /* LoaderConstraintEntry */ \ - /*************************/ \ - \ -- nonstatic_field(LoaderConstraintEntry, _name, symbolOop) \ -+ nonstatic_field(LoaderConstraintEntry, _name, Symbol*) \ - nonstatic_field(LoaderConstraintEntry, _num_loaders, int) \ - nonstatic_field(LoaderConstraintEntry, _max_loaders, int) \ - nonstatic_field(LoaderConstraintEntry, _loaders, oop*) \ -@@ -1097,11 +1096,11 @@ - declare_type(objArrayKlassKlass, arrayKlassKlass) \ - declare_type(objArrayOopDesc, arrayOopDesc) \ - declare_type(constMethodOopDesc, oopDesc) \ -- declare_type(symbolKlass, Klass) \ -- declare_type(symbolOopDesc, oopDesc) \ - declare_type(typeArrayKlass, arrayKlass) \ - declare_type(typeArrayKlassKlass, arrayKlassKlass) \ - declare_type(typeArrayOopDesc, arrayOopDesc) \ -+ declare_toplevel_type(Symbol) \ -+ declare_toplevel_type(Symbol*) \ - \ - /********/ \ - /* Oops */ \ -@@ -1118,7 +1117,6 @@ - declare_oop_type(narrowOop) \ - declare_oop_type(wideKlassOop) \ - declare_oop_type(constMethodOop) \ -- declare_oop_type(symbolOop) \ - declare_oop_type(typeArrayOop) \ - \ - /*************************************/ \ -@@ -1216,33 +1214,21 @@ - /*********************************/ \ - \ - declare_toplevel_type(BasicHashtable) \ -- declare_type(Hashtable, BasicHashtable) \ -- declare_type(SymbolTable, Hashtable) \ -- declare_type(StringTable, Hashtable) \ -- declare_type(LoaderConstraintTable, Hashtable) \ -- declare_type(TwoOopHashtable, Hashtable) \ -- declare_type(Dictionary, TwoOopHashtable) \ -- declare_type(PlaceholderTable, TwoOopHashtable) \ -- declare_toplevel_type(Hashtable*) \ -- declare_toplevel_type(SymbolTable*) \ -- declare_toplevel_type(StringTable*) \ -- declare_toplevel_type(LoaderConstraintTable*) \ -- declare_toplevel_type(TwoOopHashtable*) \ -- declare_toplevel_type(Dictionary*) \ -- declare_toplevel_type(PlaceholderTable*) \ -+ declare_type(Hashtable<intptr_t>, BasicHashtable) \ -+ declare_type(SymbolTable, Hashtable<Symbol*>) \ -+ declare_type(StringTable, Hashtable<oop>) \ -+ declare_type(LoaderConstraintTable, Hashtable<klassOop>) \ -+ declare_type(TwoOopHashtable<klassOop>, Hashtable<klassOop>) \ -+ declare_type(Dictionary, TwoOopHashtable<klassOop>) \ -+ declare_type(PlaceholderTable, TwoOopHashtable<Symbol*>) \ - declare_toplevel_type(BasicHashtableEntry) \ -- declare_toplevel_type(BasicHashtableEntry*) \ -- declare_type(HashtableEntry, BasicHashtableEntry) \ -- declare_type(DictionaryEntry, HashtableEntry) \ -- declare_type(PlaceholderEntry, HashtableEntry) \ -- declare_type(LoaderConstraintEntry, HashtableEntry) \ -- declare_toplevel_type(HashtableEntry*) \ -- declare_toplevel_type(DictionaryEntry*) \ -+ declare_type(HashtableEntry<intptr_t>, BasicHashtableEntry) \ -+ declare_type(DictionaryEntry, HashtableEntry<klassOop>) \ -+ declare_type(PlaceholderEntry, HashtableEntry<Symbol*>) \ -+ declare_type(LoaderConstraintEntry, HashtableEntry<klassOop>) \ - declare_toplevel_type(HashtableBucket) \ -- declare_toplevel_type(HashtableBucket*) \ - declare_toplevel_type(SystemDictionary) \ - declare_toplevel_type(ProtectionDomainEntry) \ -- declare_toplevel_type(ProtectionDomainEntry*) \ - \ - /***********************************************************/ \ - /* Thread hierarchy (needed for run-time type information) */ \ -@@ -1677,10 +1663,10 @@ - declare_constant(instanceKlass::initialization_error) \ - \ - /*********************************/ \ -- /* symbolOop - symbol max length */ \ -+ /* Symbol* - symbol max length */ \ - /*********************************/ \ - \ -- declare_constant(symbolOopDesc::max_symbol_length) \ -+ declare_constant(Symbol::max_symbol_length) \ - \ - /*************************************************/ \ - /* constantPoolOop layout enum for InvokeDynamic */ \ -@@ -2432,17 +2418,69 @@ - } - - #ifdef ASSERT -+static int recursiveFindType(VMTypeEntry* origtypes, const char* typeName, bool isRecurse) { -+ { -+ VMTypeEntry* types = origtypes; -+ while (types->typeName != NULL) { -+ if (!strcmp(typeName, types->typeName)) { -+ return 1; -+ } -+ ++types; -+ } -+ } -+ size_t len = strlen(typeName); -+ if (typeName[len-1] == '*') { -+ char * s = new char[len]; -+ strncpy(s, typeName, len - 1); -+ s[len-1] = '\0'; -+ // tty->print_cr("checking \"%s\" for \"%s\"", s, typeName); -+ if (recursiveFindType(origtypes, s, true) == 1) { -+ delete s; -+ return 1; -+ } -+ delete s; -+ } -+ if (strstr(typeName, "GrowableArray<") == typeName) { -+ const char * start = typeName + strlen("GrowableArray<"); -+ const char * end = strrchr(typeName, '>'); -+ int len = end - start + 1; -+ char * s = new char[len]; -+ strncpy(s, start, len - 1); -+ s[len-1] = '\0'; -+ // tty->print_cr("checking \"%s\" for \"%s\"", s, typeName); -+ if (recursiveFindType(origtypes, s, true) == 1) { -+ delete s; -+ return 1; -+ } -+ delete s; -+ } -+ if (strstr(typeName, "const ") == typeName) { -+ const char * s = typeName + strlen("const "); -+ // tty->print_cr("checking \"%s\" for \"%s\"", s, typeName); -+ if (recursiveFindType(origtypes, s, true) == 1) { -+ return 1; -+ } -+ } -+ if (strstr(typeName, " const") == typeName + len - 6) { -+ char * s = strdup(typeName); -+ s[len - 6] = '\0'; -+ // tty->print_cr("checking \"%s\" for \"%s\"", s, typeName); -+ if (recursiveFindType(origtypes, s, true) == 1) { -+ return 1; -+ } -+ } -+ if (!isRecurse) { -+ tty->print_cr("type \"%s\" not found", typeName); -+ } -+ return 2; -+} -+ -+ - int - VMStructs::findType(const char* typeName) { - VMTypeEntry* types = gHotSpotVMTypes; - -- while (types->typeName != NULL) { -- if (!strcmp(typeName, types->typeName)) { -- return 1; -- } -- ++types; -- } -- return 0; -+ return recursiveFindType(types, typeName, false); - } - #endif - -diff --git a/src/share/vm/runtime/vmStructs.hpp b/src/share/vm/runtime/vmStructs.hpp ---- openjdk/hotspot/src/share/vm/runtime/vmStructs.hpp -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.hpp -@@ -68,7 +68,7 @@ - typedef struct { - const char* typeName; // The type name containing the given field (example: "Klass") - const char* fieldName; // The field name within the type (example: "_name") -- const char* typeString; // Quoted name of the type of this field (example: "symbolOopDesc*"; -+ const char* typeString; // Quoted name of the type of this field (example: "Symbol*"; - // parsed in Java to ensure type correctness - int32_t isStatic; // Indicates whether following field is an offset or an address - uint64_t offset; // Offset of field within structure; only used for nonstatic fields -diff --git a/src/share/vm/runtime/vm_operations.cpp b/src/share/vm/runtime/vm_operations.cpp ---- openjdk/hotspot/src/share/vm/runtime/vm_operations.cpp -+++ openjdk/hotspot/src/share/vm/runtime/vm_operations.cpp -@@ -23,11 +23,13 @@ - */ - - #include "precompiled.hpp" -+#include "classfile/symbolTable.hpp" - #include "classfile/vmSymbols.hpp" - #include "compiler/compileBroker.hpp" - #include "compiler/compilerOracle.hpp" - #include "gc_implementation/shared/isGCActiveMark.hpp" - #include "memory/resourceArea.hpp" -+#include "oops/symbol.hpp" - #include "runtime/arguments.hpp" - #include "runtime/deoptimization.hpp" - #include "runtime/interfaceSupport.hpp" -@@ -170,6 +172,12 @@ - - #endif // !PRODUCT - -+void VM_UnlinkSymbols::doit() { -+ JavaThread *thread = (JavaThread *)calling_thread(); -+ assert(thread->is_Java_thread(), "must be a Java thread"); -+ SymbolTable::unlink(); -+} -+ - void VM_HandleFullCodeCache::doit() { - NMethodSweeper::speculative_disconnect_nmethods(_is_full); - } -diff --git a/src/share/vm/runtime/vm_operations.hpp b/src/share/vm/runtime/vm_operations.hpp ---- openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp -+++ openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp -@@ -50,6 +50,7 @@ - template(DeoptimizeFrame) \ - template(DeoptimizeAll) \ - template(ZombieAll) \ -+ template(UnlinkSymbols) \ - template(HandleFullCodeCache) \ - template(Verify) \ - template(PrintJNI) \ -@@ -288,6 +289,14 @@ - }; - #endif // PRODUCT - -+class VM_UnlinkSymbols: public VM_Operation { -+ public: -+ VM_UnlinkSymbols() {} -+ VMOp_Type type() const { return VMOp_UnlinkSymbols; } -+ void doit(); -+ bool allow_nested_vm_operations() const { return true; } -+}; -+ - class VM_Verify: public VM_Operation { - private: - KlassHandle _dependee; -diff --git a/src/share/vm/services/attachListener.cpp b/src/share/vm/services/attachListener.cpp ---- openjdk/hotspot/src/share/vm/services/attachListener.cpp -+++ openjdk/hotspot/src/share/vm/services/attachListener.cpp -@@ -43,7 +43,7 @@ - // Invokes sun.misc.VMSupport.serializePropertiesToByteArray to serialize - // the system properties into a byte array. - --static klassOop load_and_initialize_klass(symbolHandle sh, TRAPS) { -+static klassOop load_and_initialize_klass(Symbol* sh, TRAPS) { - klassOop k = SystemDictionary::resolve_or_fail(sh, true, CHECK_NULL); - instanceKlassHandle ik (THREAD, k); - if (ik->should_be_initialized()) { -@@ -52,12 +52,12 @@ - return ik(); - } - --static jint get_properties(AttachOperation* op, outputStream* out, symbolHandle serializePropertiesMethod) { -+static jint get_properties(AttachOperation* op, outputStream* out, Symbol* serializePropertiesMethod) { - Thread* THREAD = Thread::current(); - HandleMark hm; - - // load sun.misc.VMSupport -- symbolHandle klass = vmSymbolHandles::sun_misc_VMSupport(); -+ Symbol* klass = vmSymbols::sun_misc_VMSupport(); - klassOop k = load_and_initialize_klass(klass, THREAD); - if (HAS_PENDING_EXCEPTION) { - java_lang_Throwable::print(PENDING_EXCEPTION, out); -@@ -71,7 +71,7 @@ - JavaCallArguments args; - - -- symbolHandle signature = vmSymbolHandles::serializePropertiesToByteArray_signature(); -+ Symbol* signature = vmSymbols::serializePropertiesToByteArray_signature(); - JavaCalls::call_static(&result, - ik, - serializePropertiesMethod, -@@ -99,12 +99,12 @@ - - // Implementation of "properties" command. - static jint get_system_properties(AttachOperation* op, outputStream* out) { -- return get_properties(op, out, vmSymbolHandles::serializePropertiesToByteArray_name()); -+ return get_properties(op, out, vmSymbols::serializePropertiesToByteArray_name()); - } - - // Implementation of "agent_properties" command. - static jint get_agent_properties(AttachOperation* op, outputStream* out) { -- return get_properties(op, out, vmSymbolHandles::serializeAgentPropertiesToByteArray_name()); -+ return get_properties(op, out, vmSymbols::serializeAgentPropertiesToByteArray_name()); - } - - // Implementation of "datadump" command. -@@ -430,7 +430,7 @@ - // Starts the Attach Listener thread - void AttachListener::init() { - EXCEPTION_MARK; -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), true, CHECK); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK); - instanceKlassHandle klass (THREAD, k); - instanceHandle thread_oop = klass->allocate_instance_handle(CHECK); - -@@ -442,8 +442,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_special(&result, thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - thread_group, - string, - CHECK); -@@ -452,8 +452,8 @@ - JavaCalls::call_special(&result, - thread_group, - group, -- vmSymbolHandles::add_method_name(), -- vmSymbolHandles::thread_void_signature(), -+ vmSymbols::add_method_name(), -+ vmSymbols::thread_void_signature(), - thread_oop, // ARG 1 - CHECK); - -diff --git a/src/share/vm/services/classLoadingService.cpp b/src/share/vm/services/classLoadingService.cpp ---- openjdk/hotspot/src/share/vm/services/classLoadingService.cpp -+++ openjdk/hotspot/src/share/vm/services/classLoadingService.cpp -@@ -43,7 +43,7 @@ - { \ - char* data = NULL; \ - int len = 0; \ -- symbolOop name = (clss)->name(); \ -+ Symbol* name = (clss)->name(); \ - if (name != NULL) { \ - data = (char*)name->bytes(); \ - len = name->utf8_length(); \ -diff --git a/src/share/vm/services/heapDumper.cpp b/src/share/vm/services/heapDumper.cpp ---- openjdk/hotspot/src/share/vm/services/heapDumper.cpp -+++ openjdk/hotspot/src/share/vm/services/heapDumper.cpp -@@ -425,6 +425,7 @@ - void write_u4(u4 x); - void write_u8(u8 x); - void write_objectID(oop o); -+ void write_symbolID(Symbol* o); - void write_classID(Klass* k); - void write_id(u4 x); - }; -@@ -568,6 +569,15 @@ - #endif - } - -+void DumpWriter::write_symbolID(Symbol* s) { -+ address a = (address)((uintptr_t)s); -+#ifdef _LP64 -+ write_u8((u8)a); -+#else -+ write_u4((u4)a); -+#endif -+} -+ - void DumpWriter::write_id(u4 x) { - #ifdef _LP64 - write_u8((u8) x); -@@ -592,7 +602,7 @@ - static void write_header(DumpWriter* writer, hprofTag tag, u4 len); - - // returns hprof tag for the given type signature -- static hprofTag sig2tag(symbolOop sig); -+ static hprofTag sig2tag(Symbol* sig); - // returns hprof tag for the given basic type - static hprofTag type2tag(BasicType type); - -@@ -636,7 +646,7 @@ - } - - // returns hprof tag for the given type signature --hprofTag DumperSupport::sig2tag(symbolOop sig) { -+hprofTag DumperSupport::sig2tag(Symbol* sig) { - switch (sig->byte_at(0)) { - case JVM_SIGNATURE_CLASS : return HPROF_NORMAL_OBJECT; - case JVM_SIGNATURE_ARRAY : return HPROF_NORMAL_OBJECT; -@@ -775,7 +785,7 @@ - - for (FieldStream fld(ikh, false, false); !fld.eos(); fld.next()) { - if (!fld.access_flags().is_static()) { -- symbolOop sig = fld.signature(); -+ Symbol* sig = fld.signature(); - switch (sig->byte_at(0)) { - case JVM_SIGNATURE_CLASS : - case JVM_SIGNATURE_ARRAY : size += oopSize; break; -@@ -815,9 +825,9 @@ - // pass 2 - dump the field descriptors and raw values - for (FieldStream fld(ikh, true, true); !fld.eos(); fld.next()) { - if (fld.access_flags().is_static()) { -- symbolOop sig = fld.signature(); -+ Symbol* sig = fld.signature(); - -- writer->write_objectID(fld.name()); // name -+ writer->write_symbolID(fld.name()); // name - writer->write_u1(sig2tag(sig)); // type - - // value -@@ -836,7 +846,7 @@ - - for (FieldStream fld(ikh, false, false); !fld.eos(); fld.next()) { - if (!fld.access_flags().is_static()) { -- symbolOop sig = fld.signature(); -+ Symbol* sig = fld.signature(); - address addr = (address)o + fld.offset(); - - dump_field_value(writer, sig->byte_at(0), addr); -@@ -860,9 +870,9 @@ - // pass 2 - dump the field descriptors - for (FieldStream fld(ikh, true, true); !fld.eos(); fld.next()) { - if (!fld.access_flags().is_static()) { -- symbolOop sig = fld.signature(); -+ Symbol* sig = fld.signature(); - -- writer->write_objectID(fld.name()); // name -+ writer->write_symbolID(fld.name()); // name - writer->write_u1(sig2tag(sig)); // type - } - } -@@ -1115,42 +1125,40 @@ - - write_header(writer, HPROF_FRAME, 4*oopSize + 2*sizeof(u4)); - writer->write_id(frame_serial_num); // frame serial number -- writer->write_objectID(m->name()); // method's name -- writer->write_objectID(m->signature()); // method's signature -+ writer->write_symbolID(m->name()); // method's name -+ writer->write_symbolID(m->signature()); // method's signature - - assert(Klass::cast(m->method_holder())->oop_is_instance(), "not instanceKlass"); -- writer->write_objectID(instanceKlass::cast(m->method_holder())->source_file_name()); // source file name -+ writer->write_symbolID(instanceKlass::cast(m->method_holder())->source_file_name()); // source file name - writer->write_u4(class_serial_num); // class serial number - writer->write_u4((u4) line_number); // line number - } - -+ - // Support class used to generate HPROF_UTF8 records from the entries in the - // SymbolTable. - --class SymbolTableDumper : public OopClosure { -+class SymbolTableDumper : public SymbolClosure { - private: - DumpWriter* _writer; - DumpWriter* writer() const { return _writer; } - public: - SymbolTableDumper(DumpWriter* writer) { _writer = writer; } -- void do_oop(oop* obj_p); -- void do_oop(narrowOop* obj_p) { ShouldNotReachHere(); } -+ void do_symbol(Symbol** p); - }; - --void SymbolTableDumper::do_oop(oop* obj_p) { -+void SymbolTableDumper::do_symbol(Symbol** p) { - ResourceMark rm; -- symbolOop sym = (symbolOop)*obj_p; -- -+ Symbol* sym = load_symbol(p); - int len = sym->utf8_length(); - if (len > 0) { - char* s = sym->as_utf8(); - DumperSupport::write_header(writer(), HPROF_UTF8, oopSize + len); -- writer()->write_objectID(sym); -+ writer()->write_symbolID(sym); - writer()->write_raw(s, len); - } - } - -- - // Support class used to generate HPROF_GC_ROOT_JNI_LOCAL records - - class JNILocalsDumper : public OopClosure { -@@ -1548,8 +1556,8 @@ - writer()->write_u4(STACK_TRACE_ID); - - // class name ID -- symbolOop name = klass->name(); -- writer()->write_objectID(name); -+ Symbol* name = klass->name(); -+ writer()->write_symbolID(name); - - // write a LOAD_CLASS record for the array type (if it exists) - k = klass->array_klass_or_null(); -@@ -1727,7 +1735,7 @@ - - // HPROF_UTF8 records - SymbolTableDumper sym_dumper(writer()); -- SymbolTable::oops_do(&sym_dumper); -+ SymbolTable::symbols_do(&sym_dumper); - - // write HPROF_LOAD_CLASS records - SystemDictionary::classes_do(&do_load_class); -diff --git a/src/share/vm/services/lowMemoryDetector.cpp b/src/share/vm/services/lowMemoryDetector.cpp ---- openjdk/hotspot/src/share/vm/services/lowMemoryDetector.cpp -+++ openjdk/hotspot/src/share/vm/services/lowMemoryDetector.cpp -@@ -52,8 +52,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_special(&result, thread_oop, - klass, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::threadgroup_string_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::threadgroup_string_void_signature(), - thread_group, - string, - CHECK); -@@ -377,8 +377,8 @@ - - JavaCalls::call_virtual(&result, - sensorKlass, -- vmSymbolHandles::trigger_name(), -- vmSymbolHandles::trigger_method_signature(), -+ vmSymbols::trigger_name(), -+ vmSymbols::trigger_method_signature(), - &args, - CHECK); - } -@@ -403,8 +403,8 @@ - args.push_int((int) count); - JavaCalls::call_virtual(&result, - sensorKlass, -- vmSymbolHandles::clear_name(), -- vmSymbolHandles::int_void_signature(), -+ vmSymbols::clear_name(), -+ vmSymbols::int_void_signature(), - &args, - CHECK); - } -diff --git a/src/share/vm/services/management.cpp b/src/share/vm/services/management.cpp ---- openjdk/hotspot/src/share/vm/services/management.cpp -+++ openjdk/hotspot/src/share/vm/services/management.cpp -@@ -122,7 +122,7 @@ - // Load and initialize the sun.management.Agent class - // invoke startAgent method to start the management server - Handle loader = Handle(THREAD, SystemDictionary::java_system_loader()); -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::sun_management_Agent(), -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::sun_management_Agent(), - loader, - Handle(), - true, -@@ -132,8 +132,8 @@ - JavaValue result(T_VOID); - JavaCalls::call_static(&result, - ik, -- vmSymbolHandles::startAgent_name(), -- vmSymbolHandles::void_method_signature(), -+ vmSymbols::startAgent_name(), -+ vmSymbols::void_method_signature(), - CHECK); - } - } -@@ -142,7 +142,7 @@ - memcpy(support, &_optional_support, sizeof(jmmOptionalSupport)); - } - --klassOop Management::load_and_initialize_klass(symbolHandle sh, TRAPS) { -+klassOop Management::load_and_initialize_klass(Symbol* sh, TRAPS) { - klassOop k = SystemDictionary::resolve_or_fail(sh, true, CHECK_NULL); - instanceKlassHandle ik (THREAD, k); - if (ik->should_be_initialized()) { -@@ -182,49 +182,49 @@ - - klassOop Management::java_lang_management_ThreadInfo_klass(TRAPS) { - if (_threadInfo_klass == NULL) { -- _threadInfo_klass = load_and_initialize_klass(vmSymbolHandles::java_lang_management_ThreadInfo(), CHECK_NULL); -+ _threadInfo_klass = load_and_initialize_klass(vmSymbols::java_lang_management_ThreadInfo(), CHECK_NULL); - } - return _threadInfo_klass; - } - - klassOop Management::java_lang_management_MemoryUsage_klass(TRAPS) { - if (_memoryUsage_klass == NULL) { -- _memoryUsage_klass = load_and_initialize_klass(vmSymbolHandles::java_lang_management_MemoryUsage(), CHECK_NULL); -+ _memoryUsage_klass = load_and_initialize_klass(vmSymbols::java_lang_management_MemoryUsage(), CHECK_NULL); - } - return _memoryUsage_klass; - } - - klassOop Management::java_lang_management_MemoryPoolMXBean_klass(TRAPS) { - if (_memoryPoolMXBean_klass == NULL) { -- _memoryPoolMXBean_klass = load_and_initialize_klass(vmSymbolHandles::java_lang_management_MemoryPoolMXBean(), CHECK_NULL); -+ _memoryPoolMXBean_klass = load_and_initialize_klass(vmSymbols::java_lang_management_MemoryPoolMXBean(), CHECK_NULL); - } - return _memoryPoolMXBean_klass; - } - - klassOop Management::java_lang_management_MemoryManagerMXBean_klass(TRAPS) { - if (_memoryManagerMXBean_klass == NULL) { -- _memoryManagerMXBean_klass = load_and_initialize_klass(vmSymbolHandles::java_lang_management_MemoryManagerMXBean(), CHECK_NULL); -+ _memoryManagerMXBean_klass = load_and_initialize_klass(vmSymbols::java_lang_management_MemoryManagerMXBean(), CHECK_NULL); - } - return _memoryManagerMXBean_klass; - } - - klassOop Management::java_lang_management_GarbageCollectorMXBean_klass(TRAPS) { - if (_garbageCollectorMXBean_klass == NULL) { -- _garbageCollectorMXBean_klass = load_and_initialize_klass(vmSymbolHandles::java_lang_management_GarbageCollectorMXBean(), CHECK_NULL); -+ _garbageCollectorMXBean_klass = load_and_initialize_klass(vmSymbols::java_lang_management_GarbageCollectorMXBean(), CHECK_NULL); - } - return _garbageCollectorMXBean_klass; - } - - klassOop Management::sun_management_Sensor_klass(TRAPS) { - if (_sensor_klass == NULL) { -- _sensor_klass = load_and_initialize_klass(vmSymbolHandles::sun_management_Sensor(), CHECK_NULL); -+ _sensor_klass = load_and_initialize_klass(vmSymbols::sun_management_Sensor(), CHECK_NULL); - } - return _sensor_klass; - } - - klassOop Management::sun_management_ManagementFactory_klass(TRAPS) { - if (_managementFactory_klass == NULL) { -- _managementFactory_klass = load_and_initialize_klass(vmSymbolHandles::sun_management_ManagementFactory(), CHECK_NULL); -+ _managementFactory_klass = load_and_initialize_klass(vmSymbols::sun_management_ManagementFactory(), CHECK_NULL); - } - return _managementFactory_klass; - } -@@ -290,8 +290,8 @@ - // Call ThreadInfo constructor with no locked monitors and synchronizers - JavaCalls::call_special(&result, - ik, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::java_lang_management_ThreadInfo_constructor_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::java_lang_management_ThreadInfo_constructor_signature(), - &args, - CHECK_NULL); - -@@ -325,8 +325,8 @@ - // Call ThreadInfo constructor with locked monitors and synchronizers - JavaCalls::call_special(&result, - ik, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::java_lang_management_ThreadInfo_with_locks_constructor_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::java_lang_management_ThreadInfo_with_locks_constructor_signature(), - &args, - CHECK_NULL); - -diff --git a/src/share/vm/services/management.hpp b/src/share/vm/services/management.hpp ---- openjdk/hotspot/src/share/vm/services/management.hpp -+++ openjdk/hotspot/src/share/vm/services/management.hpp -@@ -50,7 +50,7 @@ - static klassOop _garbageCollectorMXBean_klass; - static klassOop _managementFactory_klass; - -- static klassOop load_and_initialize_klass(symbolHandle sh, TRAPS); -+ static klassOop load_and_initialize_klass(Symbol* sh, TRAPS); - - public: - static void init(); -diff --git a/src/share/vm/services/memoryManager.cpp b/src/share/vm/services/memoryManager.cpp ---- openjdk/hotspot/src/share/vm/services/memoryManager.cpp -+++ openjdk/hotspot/src/share/vm/services/memoryManager.cpp -@@ -106,15 +106,15 @@ - JavaCallArguments args; - args.push_oop(mgr_name); // Argument 1 - -- symbolHandle method_name; -- symbolHandle signature; -+ Symbol* method_name = NULL; -+ Symbol* signature = NULL; - if (is_gc_memory_manager()) { -- method_name = vmSymbolHandles::createGarbageCollector_name(); -- signature = vmSymbolHandles::createGarbageCollector_signature(); -+ method_name = vmSymbols::createGarbageCollector_name(); -+ signature = vmSymbols::createGarbageCollector_signature(); - args.push_oop(Handle()); // Argument 2 (for future extension) - } else { -- method_name = vmSymbolHandles::createMemoryManager_name(); -- signature = vmSymbolHandles::createMemoryManager_signature(); -+ method_name = vmSymbols::createMemoryManager_name(); -+ signature = vmSymbols::createMemoryManager_signature(); - } - - JavaCalls::call_static(&result, -diff --git a/src/share/vm/services/memoryPool.cpp b/src/share/vm/services/memoryPool.cpp ---- openjdk/hotspot/src/share/vm/services/memoryPool.cpp -+++ openjdk/hotspot/src/share/vm/services/memoryPool.cpp -@@ -89,8 +89,8 @@ - args.push_oop(pool_name); // Argument 1 - args.push_int((int) is_heap()); // Argument 2 - -- symbolHandle method_name = vmSymbolHandles::createMemoryPool_name(); -- symbolHandle signature = vmSymbolHandles::createMemoryPool_signature(); -+ Symbol* method_name = vmSymbols::createMemoryPool_name(); -+ Symbol* signature = vmSymbols::createMemoryPool_signature(); - - args.push_long(usage_threshold_value); // Argument 3 - args.push_long(gc_usage_threshold_value); // Argument 4 -diff --git a/src/share/vm/services/memoryService.cpp b/src/share/vm/services/memoryService.cpp ---- openjdk/hotspot/src/share/vm/services/memoryService.cpp -+++ openjdk/hotspot/src/share/vm/services/memoryService.cpp -@@ -619,8 +619,8 @@ - - JavaCalls::call_special(&result, - ik, -- vmSymbolHandles::object_initializer_name(), -- vmSymbolHandles::long_long_long_long_void_signature(), -+ vmSymbols::object_initializer_name(), -+ vmSymbols::long_long_long_long_void_signature(), - &args, - CHECK_NH); - return obj; -diff --git a/src/share/vm/services/threadService.cpp b/src/share/vm/services/threadService.cpp ---- openjdk/hotspot/src/share/vm/services/threadService.cpp -+++ openjdk/hotspot/src/share/vm/services/threadService.cpp -@@ -249,7 +249,7 @@ - // Allocate the resulting StackTraceElement[][] object - - ResourceMark rm(THREAD); -- klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_StackTraceElement_array(), true, CHECK_NH); -+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_StackTraceElement_array(), true, CHECK_NH); - objArrayKlassHandle ik (THREAD, k); - objArrayOop r = oopFactory::new_objArray(ik(), num_threads, CHECK_NH); - objArrayHandle result_obj(THREAD, r); -diff --git a/src/share/vm/utilities/debug.cpp b/src/share/vm/utilities/debug.cpp ---- openjdk/hotspot/src/share/vm/utilities/debug.cpp -+++ openjdk/hotspot/src/share/vm/utilities/debug.cpp -@@ -263,6 +263,27 @@ - #endif // PRODUCT - } - -+void report_out_of_shared_space(SharedSpaceType shared_space) { -+ static const char* name[] = { -+ "permanent generation", -+ "shared read only space", -+ "shared read write space", -+ "shared miscellaneous data space" -+ }; -+ static const char* flag[] = { -+ "PermGen", -+ "SharedReadOnlySize", -+ "SharedReadWriteSize", -+ "SharedMiscDataSize" -+ }; -+ -+ warning("\nThe %s is not large enough\n" -+ "to preload requested classes. Use -XX:%s=\n" -+ "to increase the initial size of %s.\n", -+ name[shared_space], flag[shared_space], name[shared_space]); -+ exit(2); -+} -+ - void report_java_out_of_memory(const char* message) { - static jint out_of_memory_reported = 0; - -diff --git a/src/share/vm/utilities/debug.hpp b/src/share/vm/utilities/debug.hpp ---- openjdk/hotspot/src/share/vm/utilities/debug.hpp -+++ openjdk/hotspot/src/share/vm/utilities/debug.hpp -@@ -176,6 +176,16 @@ - - void warning(const char* format, ...); - -+// out of shared space reporting -+enum SharedSpaceType { -+ SharedPermGen, -+ SharedReadOnly, -+ SharedReadWrite, -+ SharedMiscData -+}; -+ -+void report_out_of_shared_space(SharedSpaceType space_type); -+ - // out of memory reporting - void report_java_out_of_memory(const char* message); - -diff --git a/src/share/vm/utilities/exceptions.cpp b/src/share/vm/utilities/exceptions.cpp ---- openjdk/hotspot/src/share/vm/utilities/exceptions.cpp -+++ openjdk/hotspot/src/share/vm/utilities/exceptions.cpp -@@ -102,10 +102,10 @@ - return false; - } - --bool Exceptions::special_exception(Thread* thread, const char* file, int line, symbolHandle h_name, const char* message) { -+bool Exceptions::special_exception(Thread* thread, const char* file, int line, Symbol* h_name, const char* message) { - // bootstrapping check - if (!Universe::is_fully_initialized()) { -- if (h_name.is_null()) { -+ if (h_name == NULL) { - // atleast an informative message. - vm_exit_during_initialization("Exception", message); - } else { -@@ -161,7 +161,7 @@ - } - - --void Exceptions::_throw_msg(Thread* thread, const char* file, int line, symbolHandle h_name, const char* message, Handle h_loader, Handle h_protection_domain) { -+void Exceptions::_throw_msg(Thread* thread, const char* file, int line, Symbol* h_name, const char* message, Handle h_loader, Handle h_protection_domain) { - // Check for special boot-strapping/vm-thread handling - if (special_exception(thread, file, line, h_name, message)) return; - // Create and throw exception -@@ -171,7 +171,7 @@ - } - - // Throw an exception with a message and a cause --void Exceptions::_throw_msg_cause(Thread* thread, const char* file, int line, symbolHandle h_name, const char* message, Handle h_cause, Handle h_loader, Handle h_protection_domain) { -+void Exceptions::_throw_msg_cause(Thread* thread, const char* file, int line, Symbol* h_name, const char* message, Handle h_cause, Handle h_loader, Handle h_protection_domain) { - // Check for special boot-strapping/vm-thread handling - if (special_exception(thread, file, line, h_name, message)) return; - // Create and throw exception and init cause -@@ -179,18 +179,9 @@ - _throw(thread, file, line, h_exception, message); - } - --// This version creates handles and calls the other version --void Exceptions::_throw_msg(Thread* thread, const char* file, int line, -- symbolOop name, const char* message) { -- symbolHandle h_name(thread, name); -- Handle h_loader(thread, NULL); -- Handle h_protection_domain(thread, NULL); -- Exceptions::_throw_msg(thread, file, line, h_name, message, h_loader, h_protection_domain); --} -- - // This version already has a handle for name - void Exceptions::_throw_msg(Thread* thread, const char* file, int line, -- symbolHandle name, const char* message) { -+ Symbol* name, const char* message) { - Handle h_loader(thread, NULL); - Handle h_protection_domain(thread, NULL); - Exceptions::_throw_msg(thread, file, line, name, message, h_loader, h_protection_domain); -@@ -198,13 +189,13 @@ - - // This version already has a handle for name - void Exceptions::_throw_msg_cause(Thread* thread, const char* file, int line, -- symbolHandle name, const char* message, Handle cause) { -+ Symbol* name, const char* message, Handle cause) { - Handle h_loader(thread, NULL); - Handle h_protection_domain(thread, NULL); - Exceptions::_throw_msg_cause(thread, file, line, name, message, cause, h_loader, h_protection_domain); - } - --void Exceptions::_throw_args(Thread* thread, const char* file, int line, symbolHandle h_name, symbolHandle h_signature, JavaCallArguments *args) { -+void Exceptions::_throw_args(Thread* thread, const char* file, int line, Symbol* h_name, Symbol* h_signature, JavaCallArguments *args) { - // Check for special boot-strapping/vm-thread handling - if (special_exception(thread, file, line, h_name, NULL)) return; - // Create and throw exception -@@ -233,7 +224,7 @@ - _throw_oop(THREAD, file, line, exception()); - } - --void Exceptions::fthrow(Thread* thread, const char* file, int line, symbolHandle h_name, const char* format, ...) { -+void Exceptions::fthrow(Thread* thread, const char* file, int line, Symbol* h_name, const char* format, ...) { - const int max_msg_size = 1024; - va_list ap; - va_start(ap, format); -@@ -247,8 +238,8 @@ - // Creates an exception oop, calls the <init> method with the given signature. - // and returns a Handle - // Initializes the cause if cause non-null --Handle Exceptions::new_exception(Thread *thread, symbolHandle h_name, -- symbolHandle signature, -+Handle Exceptions::new_exception(Thread *thread, Symbol* h_name, -+ Symbol* signature, - JavaCallArguments *args, - Handle h_cause, Handle h_loader, - Handle h_protection_domain) { -@@ -275,7 +266,7 @@ - args->set_receiver(h_exception); - // Call constructor - JavaCalls::call_special(&result, klass, -- vmSymbolHandles::object_initializer_name(), -+ vmSymbols::object_initializer_name(), - signature, - args, - thread); -@@ -292,8 +283,8 @@ - args1.set_receiver(h_exception); - args1.push_oop(h_cause); - JavaCalls::call_virtual(&result1, klass, -- vmSymbolHandles::initCause_name(), -- vmSymbolHandles::throwable_throwable_signature(), -+ vmSymbols::initCause_name(), -+ vmSymbols::throwable_throwable_signature(), - &args1, - thread); - } -@@ -309,15 +300,15 @@ - - // Convenience method. Calls either the <init>() or <init>(String) method when - // creating a new exception --Handle Exceptions::new_exception(Thread* thread, symbolHandle h_name, -+Handle Exceptions::new_exception(Thread* thread, Symbol* h_name, - const char* message, Handle h_cause, - Handle h_loader, - Handle h_protection_domain, - ExceptionMsgToUtf8Mode to_utf8_safe) { - JavaCallArguments args; -- symbolHandle signature; -+ Symbol* signature = NULL; - if (message == NULL) { -- signature = vmSymbolHandles::void_method_signature(); -+ signature = vmSymbols::void_method_signature(); - } else { - // We want to allocate storage, but we can't do that if there's - // a pending exception, so we preserve any pending exception -@@ -348,7 +339,7 @@ - return incoming_exception; - } - args.push_oop(msg); -- signature = vmSymbolHandles::string_void_signature(); -+ signature = vmSymbols::string_void_signature(); - } - return new_exception(thread, h_name, signature, &args, h_cause, h_loader, h_protection_domain); - } -@@ -362,15 +353,14 @@ - // point is to push this flag down to class java_lang_String since other - // classes may need similar functionalities. - Handle Exceptions::new_exception(Thread* thread, -- symbolOop name, -+ Symbol* name, - const char* message, - ExceptionMsgToUtf8Mode to_utf8_safe) { - -- symbolHandle h_name(thread, name); - Handle h_loader(thread, NULL); - Handle h_prot(thread, NULL); - Handle h_cause(thread, NULL); -- return Exceptions::new_exception(thread, h_name, message, h_cause, h_loader, -+ return Exceptions::new_exception(thread, name, message, h_cause, h_loader, - h_prot, to_utf8_safe); - } - -diff --git a/src/share/vm/utilities/exceptions.hpp b/src/share/vm/utilities/exceptions.hpp ---- openjdk/hotspot/src/share/vm/utilities/exceptions.hpp -+++ openjdk/hotspot/src/share/vm/utilities/exceptions.hpp -@@ -50,8 +50,7 @@ - - class Thread; - class Handle; --class symbolHandle; --class symbolOopDesc; -+class Symbol; - class JavaCallArguments; - - // The ThreadShadow class is a helper class to access the _pending_exception -@@ -100,7 +99,7 @@ - - class Exceptions { - static bool special_exception(Thread *thread, const char* file, int line, Handle exception); -- static bool special_exception(Thread* thread, const char* file, int line, symbolHandle name, const char* message); -+ static bool special_exception(Thread* thread, const char* file, int line, Symbol* name, const char* message); - public: - // this enum is defined to indicate whether it is safe to - // ignore the encoding scheme of the original message string. -@@ -112,38 +111,36 @@ - static void _throw_oop(Thread* thread, const char* file, int line, oop exception); - static void _throw(Thread* thread, const char* file, int line, Handle exception, const char* msg = NULL); - static void _throw_msg(Thread* thread, const char* file, int line, -- symbolHandle name, const char* message, Handle loader, -+ Symbol* name, const char* message, Handle loader, - Handle protection_domain); - static void _throw_msg(Thread* thread, const char* file, int line, -- symbolOop name, const char* message); -- static void _throw_msg(Thread* thread, const char* file, int line, -- symbolHandle name, const char* message); -+ Symbol* name, const char* message); - static void _throw_args(Thread* thread, const char* file, int line, -- symbolHandle name, symbolHandle signature, -+ Symbol* name, Symbol* signature, - JavaCallArguments* args); - static void _throw_msg_cause(Thread* thread, const char* file, -- int line, symbolHandle h_name, const char* message, -+ int line, Symbol* h_name, const char* message, - Handle h_cause, Handle h_loader, Handle h_protection_domain); - static void _throw_msg_cause(Thread* thread, const char* file, int line, -- symbolHandle name, const char* message, Handle cause); -+ Symbol* name, const char* message, Handle cause); - - // There is no THROW... macro for this method. Caller should remember - // to do a return after calling it. -- static void fthrow(Thread* thread, const char* file, int line, symbolHandle name, -+ static void fthrow(Thread* thread, const char* file, int line, Symbol* name, - const char* format, ...); - - // Create and initialize a new exception -- static Handle new_exception(Thread* thread, symbolHandle name, -- symbolHandle signature, JavaCallArguments* args, -+ static Handle new_exception(Thread* thread, Symbol* name, -+ Symbol* signature, JavaCallArguments* args, - Handle cause, Handle loader, - Handle protection_domain); - -- static Handle new_exception(Thread* thread, symbolHandle name, -+ static Handle new_exception(Thread* thread, Symbol* name, - const char* message, Handle cause, Handle loader, - Handle protection_domain, - ExceptionMsgToUtf8Mode to_utf8_safe = safe_to_utf8); - -- static Handle new_exception(Thread* thread, symbolOop name, -+ static Handle new_exception(Thread* thread, Symbol* name, - const char* message, - ExceptionMsgToUtf8Mode to_utf8_safe = safe_to_utf8); - -diff --git a/src/share/vm/utilities/hashtable.cpp b/src/share/vm/utilities/hashtable.cpp ---- openjdk/hotspot/src/share/vm/utilities/hashtable.cpp -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.cpp -@@ -33,8 +33,9 @@ - #include "utilities/hashtable.hpp" - #include "utilities/hashtable.inline.hpp" - -+ - HS_DTRACE_PROBE_DECL4(hs_private, hashtable__new_entry, -- void*, unsigned int, oop, void*); -+ void*, unsigned int, void*, void*); - - // This is a generic hashtable, designed to be used for the symbol - // and string tables. -@@ -69,67 +70,16 @@ - } - - --HashtableEntry* Hashtable::new_entry(unsigned int hashValue, oop obj) { -- HashtableEntry* entry; -- entry = (HashtableEntry*)BasicHashtable::new_entry(hashValue); -- entry->set_literal(obj); // clears literal string field -+template <class T> HashtableEntry<T>* Hashtable<T>::new_entry(unsigned int hashValue, T obj) { -+ HashtableEntry<T>* entry; -+ -+ entry = (HashtableEntry<T>*)BasicHashtable::new_entry(hashValue); -+ entry->set_literal(obj); - HS_DTRACE_PROBE4(hs_private, hashtable__new_entry, - this, hashValue, obj, entry); - return entry; - } - -- --// GC support -- --void Hashtable::unlink(BoolObjectClosure* is_alive) { -- // Readers of the table are unlocked, so we should only be removing -- // entries at a safepoint. -- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); -- for (int i = 0; i < table_size(); ++i) { -- HashtableEntry** p = bucket_addr(i); -- HashtableEntry* entry = bucket(i); -- while (entry != NULL) { -- // Shared entries are normally at the end of the bucket and if we run into -- // a shared entry, then there is nothing more to remove. However, if we -- // have rehashed the table, then the shared entries are no longer at the -- // end of the bucket. -- if (entry->is_shared() && !use_alternate_hashcode()) { -- break; -- } -- assert(entry->literal() != NULL, "just checking"); -- if (entry->is_shared() || is_alive->do_object_b(entry->literal())) { -- p = entry->next_addr(); -- } else { -- *p = entry->next(); -- free_entry(entry); -- } -- entry = (HashtableEntry*)HashtableEntry::make_ptr(*p); -- } -- } --} -- -- --void Hashtable::oops_do(OopClosure* f) { -- for (int i = 0; i < table_size(); ++i) { -- HashtableEntry** p = bucket_addr(i); -- HashtableEntry* entry = bucket(i); -- while (entry != NULL) { -- f->do_oop(entry->literal_addr()); -- -- // Did the closure remove the literal from the table? -- if (entry->literal() == NULL) { -- assert(!entry->is_shared(), "immutable hashtable entry?"); -- *p = entry->next(); -- free_entry(entry); -- } else { -- p = entry->next_addr(); -- } -- entry = (HashtableEntry*)HashtableEntry::make_ptr(*p); -- } -- } --} -- -- - // Check to see if the hashtable is unbalanced. The caller set a flag to - // rehash at the next safepoint. If this bucket is 60 times greater than the - // expected average bucket length, it's an unbalanced hashtable. -@@ -253,11 +203,7 @@ - *p != NULL; - p = (*p)->next_addr()) { - if (*top + entry_size() > end) { -- warning("\nThe shared miscellaneous data space is not large " -- "enough to \npreload requested classes. Use " -- "-XX:SharedMiscDataSize= to increase \nthe initial " -- "size of the miscellaneous data space.\n"); -- exit(2); -+ report_out_of_shared_space(SharedMiscData); - } - *p = (BasicHashtableEntry*)memcpy(*top, *p, entry_size()); - *top += entry_size(); -@@ -278,15 +224,15 @@ - - // Reverse the order of elements in the hash buckets. - --void Hashtable::reverse(void* boundary) { -+template <class T> void Hashtable<T>::reverse(void* boundary) { - - for (int i = 0; i < table_size(); ++i) { -- HashtableEntry* high_list = NULL; -- HashtableEntry* low_list = NULL; -- HashtableEntry* last_low_entry = NULL; -- HashtableEntry* p = bucket(i); -+ HashtableEntry<T>* high_list = NULL; -+ HashtableEntry<T>* low_list = NULL; -+ HashtableEntry<T>* last_low_entry = NULL; -+ HashtableEntry<T>* p = bucket(i); - while (p != NULL) { -- HashtableEntry* next = p->next(); -+ HashtableEntry<T>* next = p->next(); - if ((void*)p->literal() >= boundary) { - p->set_next(high_list); - high_list = p; -@@ -320,11 +266,7 @@ - *top += sizeof(intptr_t); - - if (*top + len > end) { -- warning("\nThe shared miscellaneous data space is not large " -- "enough to \npreload requested classes. Use " -- "-XX:SharedMiscDataSize= to increase \nthe initial " -- "size of the miscellaneous data space.\n"); -- exit(2); -+ report_out_of_shared_space(SharedMiscData); - } - _buckets = (HashtableBucket*)memcpy(*top, _buckets, len); - *top += len; -@@ -333,11 +275,11 @@ - - #ifndef PRODUCT - --void Hashtable::print() { -+template <class T> void Hashtable<T>::print() { - ResourceMark rm; - - for (int i = 0; i < table_size(); i++) { -- HashtableEntry* entry = bucket(i); -+ HashtableEntry<T>* entry = bucket(i); - while(entry != NULL) { - tty->print("%d : ", i); - entry->literal()->print(); -@@ -374,3 +316,10 @@ - } - - #endif -+ -+// Explicitly instantiate these types -+template class Hashtable<constantPoolOop>; -+template class Hashtable<Symbol*>; -+template class Hashtable<klassOop>; -+template class Hashtable<oop>; -+ -diff --git a/src/share/vm/utilities/hashtable.hpp b/src/share/vm/utilities/hashtable.hpp ---- openjdk/hotspot/src/share/vm/utilities/hashtable.hpp -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.hpp -@@ -27,7 +27,7 @@ - - #include "memory/allocation.hpp" - #include "oops/oop.hpp" --#include "oops/symbolOop.hpp" -+#include "oops/symbol.hpp" - #include "runtime/handles.hpp" - - // This is a generic hashtable, designed to be used for the symbol -@@ -96,16 +96,16 @@ - - - --class HashtableEntry : public BasicHashtableEntry { -+template <class T> class HashtableEntry : public BasicHashtableEntry { - friend class VMStructs; - private: -- oop _literal; // ref to item in table. -+ T _literal; // ref to item in table. - - public: - // Literal -- oop literal() const { return _literal; } -- oop* literal_addr() { return &_literal; } -- void set_literal(oop s) { _literal = s; } -+ T literal() const { return _literal; } -+ T* literal_addr() { return &_literal; } -+ void set_literal(T s) { _literal = s; } - - HashtableEntry* next() const { - return (HashtableEntry*)BasicHashtableEntry::next(); -@@ -159,6 +159,8 @@ - // Reverse the order of elements in each of the buckets. - void reverse(); - -+ static unsigned int hash_symbol(const char* s, int len); -+ - private: - // Instance variables - int _table_size; -@@ -233,7 +235,7 @@ - }; - - --class Hashtable : public BasicHashtable { -+template <class T> class Hashtable : public BasicHashtable { - friend class VMStructs; - - public: -@@ -244,16 +246,9 @@ - HashtableBucket* buckets, int number_of_entries) - : BasicHashtable(table_size, entry_size, buckets, number_of_entries), _seed(0) { } - -- // Invoke "f->do_oop" on the locations of all oops in the table. -- void oops_do(OopClosure* f); -- - // Debugging - void print() PRODUCT_RETURN; - -- // GC support -- // Delete pointers to otherwise-unreachable objects. -- void unlink(BoolObjectClosure* cl); -- - // Reverse the order of elements in each of the buckets. Hashtable - // entries which refer to objects at a lower address than 'boundary' - // are separated from those which refer to objects at higher -@@ -262,25 +257,25 @@ - - protected: - -- unsigned int compute_hash(symbolHandle name) { -+ unsigned int compute_hash(Symbol* name) { - return (unsigned int) name->identity_hash(); - } - -- int index_for(symbolHandle name) { -+ int index_for(Symbol* name) { - return hash_to_index(compute_hash(name)); - } - - // Table entry management -- HashtableEntry* new_entry(unsigned int hashValue, oop obj); -+ HashtableEntry<T>* new_entry(unsigned int hashValue, T obj); - - // The following method is MT-safe and may be used with caution. -- HashtableEntry* bucket(int i) { -- return (HashtableEntry*)BasicHashtable::bucket(i); -+ HashtableEntry<T>* bucket(int i) { -+ return (HashtableEntry<T>*)BasicHashtable::bucket(i); - } - - // The following method is not MT-safe and must be done under lock. -- HashtableEntry** bucket_addr(int i) { -- return (HashtableEntry**)BasicHashtable::bucket_addr(i); -+ HashtableEntry<T>** bucket_addr(int i) { -+ return (HashtableEntry<T>**)BasicHashtable::bucket_addr(i); - } - - // Function to move these elements into the new table. -@@ -298,18 +293,18 @@ - - // Verions of hashtable where two handles are used to compute the index. - --class TwoOopHashtable : public Hashtable { -+template <class T> class TwoOopHashtable : public Hashtable<T> { - friend class VMStructs; - protected: - TwoOopHashtable(int table_size, int entry_size) -- : Hashtable(table_size, entry_size) {} -+ : Hashtable<T>(table_size, entry_size) {} - - TwoOopHashtable(int table_size, int entry_size, HashtableBucket* t, - int number_of_entries) -- : Hashtable(table_size, entry_size, t, number_of_entries) {} -+ : Hashtable<T>(table_size, entry_size, t, number_of_entries) {} - - public: -- unsigned int compute_hash(symbolHandle name, Handle loader) { -+ unsigned int compute_hash(Symbol* name, Handle loader) { - // Be careful with identity_hash(), it can safepoint and if this - // were one expression, the compiler could choose to unhandle each - // oop before calling identity_hash() for either of them. If the first -@@ -319,7 +314,7 @@ - return name_hash ^ loader_hash; - } - -- int index_for(symbolHandle name, Handle loader) { -+ int index_for(Symbol* name, Handle loader) { - return hash_to_index(compute_hash(name, loader)); - } - }; -diff --git a/src/share/vm/utilities/utf8.cpp b/src/share/vm/utilities/utf8.cpp ---- openjdk/hotspot/src/share/vm/utilities/utf8.cpp -+++ openjdk/hotspot/src/share/vm/utilities/utf8.cpp -@@ -164,7 +164,7 @@ - - // Returns NULL if 'c' it not found. This only works as long - // as 'c' is an ASCII character --jbyte* UTF8::strrchr(jbyte* base, int length, jbyte c) { -+const jbyte* UTF8::strrchr(const jbyte* base, int length, jbyte c) { - assert(length >= 0, "sanity check"); - assert(c >= 0, "does not work for non-ASCII characters"); - // Skip backwards in string until 'c' is found or end is reached -@@ -172,7 +172,7 @@ - return (length < 0) ? NULL : &base[length]; - } - --bool UTF8::equal(jbyte* base1, int length1, jbyte* base2, int length2) { -+bool UTF8::equal(const jbyte* base1, int length1, const jbyte* base2, int length2) { - // Length must be the same - if (length1 != length2) return false; - for (int i = 0; i < length1; i++) { -diff --git a/src/share/vm/utilities/utf8.hpp b/src/share/vm/utilities/utf8.hpp ---- openjdk/hotspot/src/share/vm/utilities/utf8.hpp -+++ openjdk/hotspot/src/share/vm/utilities/utf8.hpp -@@ -51,8 +51,8 @@ - static char* next_character(const char* str, jint* value); - - // Utility methods -- static jbyte* strrchr(jbyte* base, int length, jbyte c); -- static bool equal(jbyte* base1, int length1, jbyte* base2, int length2); -+ static const jbyte* strrchr(const jbyte* base, int length, jbyte c); -+ static bool equal(const jbyte* base1, int length1, const jbyte* base2,int length2); - static bool is_supplementary_character(const unsigned char* str); - static jint get_supplementary_character(const unsigned char* str); - }; -diff --git a/src/share/vm/utilities/xmlstream.cpp b/src/share/vm/utilities/xmlstream.cpp ---- openjdk/hotspot/src/share/vm/utilities/xmlstream.cpp -+++ openjdk/hotspot/src/share/vm/utilities/xmlstream.cpp -@@ -422,17 +422,17 @@ - klass->name()->print_symbol_on(out()); - } - --void xmlStream::name(symbolHandle name) { -+void xmlStream::name(const Symbol* name) { - assert_if_no_error(inside_attrs(), "printing attributes"); -- if (name.is_null()) return; -+ if (name == NULL) return; - print_raw(" name='"); - name_text(name); - print_raw("'"); - } - --void xmlStream::name_text(symbolHandle name) { -+void xmlStream::name_text(const Symbol* name) { - assert_if_no_error(inside_attrs(), "printing attributes"); -- if (name.is_null()) return; -+ if (name == NULL) return; - //name->print_short_name(text()); - name->print_symbol_on(text()); - } -@@ -455,8 +455,6 @@ - method_text(methodOop(x())); - else if (x->is_klass()) - klass_text(klassOop(x())); -- else if (x->is_symbol()) -- name_text(symbolOop(x())); - else - x->print_value_on(text()); - } -diff --git a/src/share/vm/utilities/xmlstream.hpp b/src/share/vm/utilities/xmlstream.hpp ---- openjdk/hotspot/src/share/vm/utilities/xmlstream.hpp -+++ openjdk/hotspot/src/share/vm/utilities/xmlstream.hpp -@@ -139,13 +139,13 @@ - void stamp(); // stamp='1.234' - void method(methodHandle m); // method='k n s' ... - void klass(KlassHandle k); // klass='name' -- void name(symbolHandle s); // name='name' -+ void name(const Symbol* s); // name='name' - void object(const char* attr, Handle val); - - // print the text alone (sans ''): - void method_text(methodHandle m); - void klass_text(KlassHandle k); // klass='name' -- void name_text(symbolHandle s); // name='name' -+ void name_text(const Symbol* s); // name='name' - void object_text(Handle x); - - /* Example uses:
--- a/patches/openjdk/7008809-report_class_in_arraystoreexception.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,189 +0,0 @@ -# HG changeset patch -# User never -# Date 1295904858 28800 -# Node ID f44f27f80f2caf315f0f56cd63b5beb46908051e -# Parent afb96a923f7f2da64e711455257a024c100e8e2e -7008809: should report the class in ArrayStoreExceptions from compiled code -Reviewed-by: iveresov, twisti - -diff --git a/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp ---- openjdk/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp -+++ openjdk/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -129,27 +129,6 @@ - } - - --// Implementation of ArrayStoreExceptionStub -- --ArrayStoreExceptionStub::ArrayStoreExceptionStub(CodeEmitInfo* info): -- _info(info) { --} -- -- --void ArrayStoreExceptionStub::emit_code(LIR_Assembler* ce) { -- __ bind(_entry); -- __ call(Runtime1::entry_for(Runtime1::throw_array_store_exception_id), relocInfo::runtime_call_type); -- __ delayed()->nop(); -- ce->add_call_info_here(_info); -- ce->verify_oop_map(_info); --#ifdef ASSERT -- __ should_not_reach_here(); --#endif --} -- -- -- -- - // Implementation of NewInstanceStub - - NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, Runtime1::StubID stub_id) { -diff --git a/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp ---- openjdk/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp -+++ openjdk/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp -@@ -710,7 +710,7 @@ - case throw_array_store_exception_id: - { - __ set_info("throw_array_store_exception", dont_gc_arguments); -- oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_array_store_exception), false); -+ oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_array_store_exception), true); - } - break; - -diff --git a/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/src/cpu/x86/vm/c1_CodeStubs_x86.cpp ---- openjdk/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp -+++ openjdk/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -414,20 +414,6 @@ - } - - --ArrayStoreExceptionStub::ArrayStoreExceptionStub(CodeEmitInfo* info): -- _info(info) { --} -- -- --void ArrayStoreExceptionStub::emit_code(LIR_Assembler* ce) { -- assert(__ rsp_offset() == 0, "frame size should be fixed"); -- __ bind(_entry); -- __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::throw_array_store_exception_id))); -- ce->add_call_info_here(_info); -- debug_only(__ should_not_reach_here()); --} -- -- - void ArrayCopyStub::emit_code(LIR_Assembler* ce) { - //---------------slow case: call to native----------------- - __ bind(_entry); -diff --git a/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/src/cpu/x86/vm/c1_Runtime1_x86.cpp ---- openjdk/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp -+++ openjdk/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp -@@ -1337,7 +1337,7 @@ - { StubFrame f(sasm, "throw_array_store_exception", dont_gc_arguments); - // tos + 0: link - // + 1: return address -- oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_array_store_exception), false); -+ oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_array_store_exception), true); - } - break; - -diff --git a/src/share/vm/c1/c1_CodeStubs.hpp b/src/share/vm/c1/c1_CodeStubs.hpp ---- openjdk/hotspot/src/share/vm/c1/c1_CodeStubs.hpp -+++ openjdk/hotspot/src/share/vm/c1/c1_CodeStubs.hpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -476,18 +476,12 @@ - - - --class ArrayStoreExceptionStub: public CodeStub { -+class ArrayStoreExceptionStub: public SimpleExceptionStub { - private: - CodeEmitInfo* _info; - - public: -- ArrayStoreExceptionStub(CodeEmitInfo* info); -- virtual void emit_code(LIR_Assembler* emit); -- virtual CodeEmitInfo* info() const { return _info; } -- virtual bool is_exception_throw_stub() const { return true; } -- virtual void visit(LIR_OpVisitState* visitor) { -- visitor->do_slow_case(_info); -- } -+ ArrayStoreExceptionStub(LIR_Opr obj, CodeEmitInfo* info): SimpleExceptionStub(Runtime1::throw_array_store_exception_id, obj, info) {} - #ifndef PRODUCT - virtual void print_name(outputStream* out) const { out->print("ArrayStoreExceptionStub"); } - #endif // PRODUCT -diff --git a/src/share/vm/c1/c1_LIR.cpp b/src/share/vm/c1/c1_LIR.cpp ---- openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp -+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -396,7 +396,7 @@ - , _should_profile(false) - { - if (code == lir_store_check) { -- _stub = new ArrayStoreExceptionStub(info_for_exception); -+ _stub = new ArrayStoreExceptionStub(object, info_for_exception); - assert(info_for_exception != NULL, "store_check throws exceptions"); - } else { - ShouldNotReachHere(); -diff --git a/src/share/vm/c1/c1_Runtime1.cpp b/src/share/vm/c1/c1_Runtime1.cpp ---- openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp -+++ openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp -@@ -339,8 +339,10 @@ - JRT_END - - --JRT_ENTRY(void, Runtime1::throw_array_store_exception(JavaThread* thread)) -- THROW(vmSymbolHandles::java_lang_ArrayStoreException()); -+JRT_ENTRY(void, Runtime1::throw_array_store_exception(JavaThread* thread, oopDesc* obj)) -+ ResourceMark rm(thread); -+ const char* klass_name = Klass::cast(obj->klass())->external_name(); -+ SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_ArrayStoreException(), klass_name); - JRT_END - - -diff --git a/src/share/vm/c1/c1_Runtime1.hpp b/src/share/vm/c1/c1_Runtime1.hpp ---- openjdk/hotspot/src/share/vm/c1/c1_Runtime1.hpp -+++ openjdk/hotspot/src/share/vm/c1/c1_Runtime1.hpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -143,9 +143,9 @@ - static void throw_index_exception(JavaThread* thread, int index); - static void throw_div0_exception(JavaThread* thread); - static void throw_null_pointer_exception(JavaThread* thread); -- static void throw_class_cast_exception(JavaThread* thread, oopDesc* obect); -+ static void throw_class_cast_exception(JavaThread* thread, oopDesc* object); - static void throw_incompatible_class_change_error(JavaThread* thread); -- static void throw_array_store_exception(JavaThread* thread); -+ static void throw_array_store_exception(JavaThread* thread, oopDesc* object); - - static void monitorenter(JavaThread* thread, oopDesc* obj, BasicObjectLock* lock); - static void monitorexit (JavaThread* thread, BasicObjectLock* lock);
--- a/patches/openjdk/7014851-unused_parallel_compaction_code.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,810 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371822953 18000 -# Node ID 81575d3cbd95714395c022a7f7ca622bab432b2b -# Parent cdce92891bfbc17372d8e5d5d2cccf319cf73589 -7014851: Remove unused parallel compaction code -Summary: Removed. -Reviewed-by: jcoomes, brutisso - -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp -@@ -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 -@@ -1196,11 +1196,6 @@ - static inline void adjust_pointer(oop* p) { adjust_pointer(p, false); } - static inline void adjust_pointer(narrowOop* p) { adjust_pointer(p, false); } - -- template <class T> -- static inline void adjust_pointer(T* p, -- HeapWord* beg_addr, -- HeapWord* end_addr); -- - // Reference Processing - static ReferenceProcessor* const ref_processor() { return _ref_processor; } - -@@ -1408,15 +1403,6 @@ - return ((HeapWord*) k) >= dense_prefix(perm_space_id); - } - --template <class T> --inline void PSParallelCompact::adjust_pointer(T* p, -- HeapWord* beg_addr, -- HeapWord* end_addr) { -- if (is_in((HeapWord*)p, beg_addr, end_addr)) { -- adjust_pointer(p); -- } --} -- - #ifdef ASSERT - inline void - PSParallelCompact::check_new_location(HeapWord* old_addr, HeapWord* new_addr) -diff --git a/src/share/vm/oops/arrayKlassKlass.cpp b/src/share/vm/oops/arrayKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp -@@ -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 -@@ -144,27 +144,6 @@ - } - return klassKlass::oop_update_pointers(cm, obj); - } -- --int --arrayKlassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- assert(obj->is_klass(), "must be klass"); -- arrayKlass* ak = arrayKlass::cast(klassOop(obj)); -- -- oop* p; -- p = ak->adr_component_mirror(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = ak->adr_lower_dimension(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = ak->adr_higher_dimension(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- -- { -- HandleMark hm; -- ak->vtable()->oop_update_pointers(cm, beg_addr, end_addr); -- } -- return klassKlass::oop_update_pointers(cm, obj, beg_addr, end_addr); --} - #endif // SERIALGC - - // Printing -diff --git a/src/share/vm/oops/compiledICHolderKlass.cpp b/src/share/vm/oops/compiledICHolderKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp -@@ -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 -@@ -145,21 +145,6 @@ - PSParallelCompact::adjust_pointer(c->adr_holder_klass()); - return c->object_size(); - } -- --int compiledICHolderKlass::oop_update_pointers(ParCompactionManager* cm, -- oop obj, -- HeapWord* beg_addr, -- HeapWord* end_addr) { -- assert(obj->is_compiledICHolder(), "must be compiledICHolder"); -- compiledICHolderOop c = compiledICHolderOop(obj); -- -- oop* p; -- p = c->adr_holder_method(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = c->adr_holder_klass(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- return c->object_size(); --} - #endif // SERIALGC - - // Printing -diff --git a/src/share/vm/oops/constMethodKlass.cpp b/src/share/vm/oops/constMethodKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/constMethodKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/constMethodKlass.cpp -@@ -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 -@@ -184,21 +184,6 @@ - } - return cm_oop->object_size(); - } -- --int constMethodKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, -- HeapWord* end_addr) { -- assert(obj->is_constMethod(), "should be constMethod"); -- constMethodOop cm_oop = constMethodOop(obj); -- -- oop* const beg_oop = MAX2((oop*)beg_addr, cm_oop->oop_block_beg()); -- oop* const end_oop = MIN2((oop*)end_addr, cm_oop->oop_block_end()); -- for (oop* cur_oop = beg_oop; cur_oop < end_oop; ++cur_oop) { -- PSParallelCompact::adjust_pointer(cur_oop); -- } -- -- return cm_oop->object_size(); --} - #endif // SERIALGC - - // Printing -diff --git a/src/share/vm/oops/constantPoolKlass.cpp b/src/share/vm/oops/constantPoolKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp -@@ -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 -@@ -271,40 +271,6 @@ - return cp->object_size(); - } - --int --constantPoolKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- assert (obj->is_constantPool(), "obj must be constant pool"); -- constantPoolOop cp = (constantPoolOop) obj; -- -- // If the tags array is null we are in the middle of allocating this constant -- // pool. -- if (cp->tags() != NULL) { -- oop* base = (oop*)cp->base(); -- oop* const beg_oop = MAX2((oop*)beg_addr, base); -- oop* const end_oop = MIN2((oop*)end_addr, base + cp->length()); -- const size_t beg_idx = pointer_delta(beg_oop, base, sizeof(oop*)); -- const size_t end_idx = pointer_delta(end_oop, base, sizeof(oop*)); -- for (size_t cur_idx = beg_idx; cur_idx < end_idx; ++cur_idx, ++base) { -- if (cp->is_pointer_entry(int(cur_idx))) { -- PSParallelCompact::adjust_pointer(base); -- } -- } -- } -- -- oop* p; -- p = cp->tags_addr(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = cp->cache_addr(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = cp->operands_addr(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = cp->pool_holder_addr(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- -- return cp->object_size(); --} -- - void constantPoolKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { - assert(obj->is_constantPool(), "should be constant pool"); - constantPoolOop cp = (constantPoolOop) obj; -diff --git a/src/share/vm/oops/cpCacheKlass.cpp b/src/share/vm/oops/cpCacheKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp -@@ -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 -@@ -216,25 +216,6 @@ - - return cache->object_size(); - } -- --int --constantPoolCacheKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, -- HeapWord* end_addr) { -- assert(obj->is_constantPoolCache(), "obj must be constant pool cache"); -- constantPoolCacheOop cache = (constantPoolCacheOop)obj; -- -- // Iteration over constant pool cache instance variables -- oop* p; -- p = (oop*)cache->constant_pool_addr(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- -- // Iteration over constant pool cache entries -- for (int i = 0; i < cache->length(); ++i) { -- cache->entry_at(i)->update_pointers(beg_addr, end_addr); -- } -- return cache->object_size(); --} - #endif // SERIALGC - - void constantPoolCacheKlass::oop_print_on(oop obj, outputStream* st) { -diff --git a/src/share/vm/oops/cpCacheOop.cpp b/src/share/vm/oops/cpCacheOop.cpp ---- openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp -@@ -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 -@@ -364,16 +364,6 @@ - PSParallelCompact::adjust_pointer((oop*)&_f2); - } - } -- --void ConstantPoolCacheEntry::update_pointers(HeapWord* beg_addr, -- HeapWord* end_addr) { -- assert(in_words(size()) == 4, "check code below - may need adjustment"); -- // field[1] is always oop or NULL -- PSParallelCompact::adjust_pointer((oop*)&_f1, beg_addr, end_addr); -- if (is_vfinal()) { -- PSParallelCompact::adjust_pointer((oop*)&_f2, beg_addr, end_addr); -- } --} - #endif // SERIALGC - - // RedefineClasses() API support: -diff --git a/src/share/vm/oops/cpCacheOop.hpp b/src/share/vm/oops/cpCacheOop.hpp ---- openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp -+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp -@@ -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 -@@ -287,7 +287,6 @@ - #endif // SERIALGC - - void update_pointers(); -- void update_pointers(HeapWord* beg_addr, HeapWord* end_addr); - - // RedefineClasses() API support: - // If this constantPoolCacheEntry refers to old_method then update it -diff --git a/src/share/vm/oops/instanceKlass.cpp b/src/share/vm/oops/instanceKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -@@ -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 -@@ -1792,15 +1792,6 @@ - return size_helper(); - } - --int instanceKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- InstanceKlass_BOUNDED_OOP_MAP_ITERATE( \ -- obj, beg_addr, end_addr, \ -- PSParallelCompact::adjust_pointer(p), \ -- assert_nothing) -- return size_helper(); --} -- - #endif // SERIALGC - - // This klass is alive but the implementor link is not followed/updated. -diff --git a/src/share/vm/oops/instanceKlass.hpp b/src/share/vm/oops/instanceKlass.hpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -@@ -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 -diff --git a/src/share/vm/oops/instanceKlassKlass.cpp b/src/share/vm/oops/instanceKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -@@ -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 -diff --git a/src/share/vm/oops/instanceRefKlass.cpp b/src/share/vm/oops/instanceRefKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceRefKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceRefKlass.cpp -@@ -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 -@@ -344,33 +344,6 @@ - } - return size_helper(); - } -- -- --template <class T> void --specialized_oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- T* p; -- T* referent_addr = p = (T*)java_lang_ref_Reference::referent_addr(obj); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- T* next_addr = p = (T*)java_lang_ref_Reference::next_addr(obj); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- T* discovered_addr = p = (T*)java_lang_ref_Reference::discovered_addr(obj); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- debug_only(trace_reference_gc("instanceRefKlass::oop_update_ptrs", obj, -- referent_addr, next_addr, discovered_addr);) --} -- --int --instanceRefKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- instanceKlass::oop_update_pointers(cm, obj, beg_addr, end_addr); -- if (UseCompressedOops) { -- specialized_oop_update_pointers<narrowOop>(cm, obj, beg_addr, end_addr); -- } else { -- specialized_oop_update_pointers<oop>(cm, obj, beg_addr, end_addr); -- } -- return size_helper(); --} - #endif // SERIALGC - - void instanceRefKlass::update_nonstatic_oop_maps(klassOop k) { -diff --git a/src/share/vm/oops/klassKlass.cpp b/src/share/vm/oops/klassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/klassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/klassKlass.cpp -@@ -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,19 +198,6 @@ - - return oop_size(obj); - } -- --int klassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- Klass* k = Klass::cast(klassOop(obj)); -- -- oop* const beg_oop = MAX2((oop*)beg_addr, k->oop_block_beg()); -- oop* const end_oop = MIN2((oop*)end_addr, k->oop_block_end()); -- for (oop* cur_oop = beg_oop; cur_oop < end_oop; ++cur_oop) { -- PSParallelCompact::adjust_pointer(cur_oop); -- } -- -- return oop_size(obj); --} - #endif // SERIALGC - - -diff --git a/src/share/vm/oops/klassPS.hpp b/src/share/vm/oops/klassPS.hpp ---- openjdk/hotspot/src/share/vm/oops/klassPS.hpp -+++ openjdk/hotspot/src/share/vm/oops/klassPS.hpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2007, 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 -@@ -37,17 +37,13 @@ - objects that do (or may) cross chunk boundaries; it updates only those \ - oops that are in the region [beg_addr, end_addr). */ \ - virtual void oop_follow_contents(ParCompactionManager* cm, oop obj); \ -- virtual int oop_update_pointers(ParCompactionManager* cm, oop obj); \ -- virtual int oop_update_pointers(ParCompactionManager* cm, oop obj, \ -- HeapWord* beg_addr, HeapWord* end_addr); -+ virtual int oop_update_pointers(ParCompactionManager* cm, oop obj); - - // Pure virtual version for klass.hpp - #define PARALLEL_GC_DECLS_PV \ - virtual void oop_push_contents(PSPromotionManager* pm, oop obj) = 0; \ - virtual void oop_follow_contents(ParCompactionManager* cm, oop obj) = 0; \ -- virtual int oop_update_pointers(ParCompactionManager* cm, oop obj) = 0; \ -- virtual int oop_update_pointers(ParCompactionManager* cm, oop obj, \ -- HeapWord* beg_addr, HeapWord* end_addr) = 0; -+ virtual int oop_update_pointers(ParCompactionManager* cm, oop obj) = 0; - #else // SERIALGC - #define PARALLEL_GC_DECLS - #define PARALLEL_GC_DECLS_PV -diff --git a/src/share/vm/oops/klassVtable.cpp b/src/share/vm/oops/klassVtable.cpp ---- openjdk/hotspot/src/share/vm/oops/klassVtable.cpp -+++ openjdk/hotspot/src/share/vm/oops/klassVtable.cpp -@@ -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 -@@ -677,25 +677,6 @@ - PSParallelCompact::adjust_pointer(adr_method_at(i)); - } - } -- --void klassVtable::oop_update_pointers(ParCompactionManager* cm, -- HeapWord* beg_addr, HeapWord* end_addr) { -- const int n = length(); -- const int entry_size = vtableEntry::size(); -- -- int beg_idx = 0; -- HeapWord* const method_0 = (HeapWord*)adr_method_at(0); -- if (beg_addr > method_0) { -- // it's safe to use cast, as we have guarantees on vtable size to be sane -- beg_idx = int((pointer_delta(beg_addr, method_0) + entry_size - 1) / entry_size); -- } -- -- oop* const beg_oop = adr_method_at(beg_idx); -- oop* const end_oop = MIN2((oop*)end_addr, adr_method_at(n)); -- for (oop* cur_oop = beg_oop; cur_oop < end_oop; cur_oop += entry_size) { -- PSParallelCompact::adjust_pointer(cur_oop); -- } --} - #endif // SERIALGC - - // Iterators -@@ -820,25 +801,6 @@ - ime++; - } - } -- --void klassItable::oop_update_pointers(ParCompactionManager* cm, -- HeapWord* beg_addr, HeapWord* end_addr) { -- // offset table -- itableOffsetEntry* ioe = offset_entry(0); -- for(int i = 0; i < _size_offset_table; i++) { -- oop* p = (oop*)&ioe->_interface; -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- ioe++; -- } -- -- // method table -- itableMethodEntry* ime = method_entry(0); -- for(int j = 0; j < _size_method_table; j++) { -- oop* p = (oop*)&ime->_method; -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- ime++; -- } --} - #endif // SERIALGC - - // Iterators -diff --git a/src/share/vm/oops/klassVtable.hpp b/src/share/vm/oops/klassVtable.hpp ---- openjdk/hotspot/src/share/vm/oops/klassVtable.hpp -+++ openjdk/hotspot/src/share/vm/oops/klassVtable.hpp -@@ -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 -@@ -99,8 +99,6 @@ - // Parallel Old - void oop_follow_contents(ParCompactionManager* cm); - void oop_update_pointers(ParCompactionManager* cm); -- void oop_update_pointers(ParCompactionManager* cm, -- HeapWord* beg_addr, HeapWord* end_addr); - #endif // SERIALGC - - // Iterators -@@ -295,8 +293,6 @@ - // Parallel Old - void oop_follow_contents(ParCompactionManager* cm); - void oop_update_pointers(ParCompactionManager* cm); -- void oop_update_pointers(ParCompactionManager* cm, -- HeapWord* beg_addr, HeapWord* end_addr); - #endif // SERIALGC - - // Iterators -diff --git a/src/share/vm/oops/methodDataKlass.cpp b/src/share/vm/oops/methodDataKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/methodDataKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/methodDataKlass.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -188,25 +188,6 @@ - } - return m->object_size(); - } -- --int --methodDataKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- assert(obj->is_methodData(), "should be method data"); -- -- oop* p; -- methodDataOop m = methodDataOop(obj); -- -- p = m->adr_method(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- -- ResourceMark rm; -- ProfileData* data; -- for (data = m->first_data(); m->is_valid(data); data = m->next_data(data)) { -- data->update_pointers(beg_addr, end_addr); -- } -- return m->object_size(); --} - #endif // SERIALGC - - #ifndef PRODUCT -diff --git a/src/share/vm/oops/methodDataOop.cpp b/src/share/vm/oops/methodDataOop.cpp ---- openjdk/hotspot/src/share/vm/oops/methodDataOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/methodDataOop.cpp -@@ -271,17 +271,6 @@ - } - } - } -- --void ReceiverTypeData::update_pointers(HeapWord* beg_addr, HeapWord* end_addr) { -- // The loop bounds could be computed based on beg_addr/end_addr and the -- // boundary test hoisted outside the loop (see klassVTable for an example); -- // however, row_limit() is small enough (2) to make that less efficient. -- for (uint row = 0; row < row_limit(); row++) { -- if (receiver_unchecked(row) != NULL) { -- PSParallelCompact::adjust_pointer(adr_receiver(row), beg_addr, end_addr); -- } -- } --} - #endif // SERIALGC - - #ifndef PRODUCT -diff --git a/src/share/vm/oops/methodDataOop.hpp b/src/share/vm/oops/methodDataOop.hpp ---- openjdk/hotspot/src/share/vm/oops/methodDataOop.hpp -+++ openjdk/hotspot/src/share/vm/oops/methodDataOop.hpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -452,7 +452,6 @@ - // Parallel old support - virtual void follow_contents(ParCompactionManager* cm) {} - virtual void update_pointers() {} -- virtual void update_pointers(HeapWord* beg_addr, HeapWord* end_addr) {} - #endif // SERIALGC - - // CI translation: ProfileData can represent both MethodDataOop data -@@ -748,7 +747,6 @@ - // Parallel old support - virtual void follow_contents(ParCompactionManager* cm); - virtual void update_pointers(); -- virtual void update_pointers(HeapWord* beg_addr, HeapWord* end_addr); - #endif // SERIALGC - - oop* adr_receiver(uint row) { -diff --git a/src/share/vm/oops/methodKlass.cpp b/src/share/vm/oops/methodKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/methodKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/methodKlass.cpp -@@ -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 -@@ -214,27 +214,6 @@ - #endif // COMPILER2 - return m->object_size(); - } -- --int methodKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- assert(obj->is_method(), "should be method"); -- -- oop* p; -- methodOop m = methodOop(obj); -- -- p = m->adr_constMethod(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = m->adr_constants(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- --#ifdef COMPILER2 -- if (m->method_data() != NULL) { -- p = m->adr_method_data(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- } --#endif // COMPILER2 -- return m->object_size(); --} - #endif // SERIALGC - - #ifndef PRODUCT -diff --git a/src/share/vm/oops/objArrayKlass.cpp b/src/share/vm/oops/objArrayKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp -@@ -470,16 +470,6 @@ - ObjArrayKlass_OOP_ITERATE(a, p, PSParallelCompact::adjust_pointer(p)) - return a->object_size(); - } -- --int objArrayKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- assert (obj->is_objArray(), "obj must be obj array"); -- objArrayOop a = objArrayOop(obj); -- ObjArrayKlass_BOUNDED_OOP_ITERATE( \ -- a, p, beg_addr, end_addr, \ -- PSParallelCompact::adjust_pointer(p)) -- return a->object_size(); --} - #endif // SERIALGC - - // JVM support -diff --git a/src/share/vm/oops/objArrayKlassKlass.cpp b/src/share/vm/oops/objArrayKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp -@@ -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 -@@ -272,22 +272,6 @@ - - return arrayKlassKlass::oop_update_pointers(cm, obj); - } -- --int objArrayKlassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, -- HeapWord* end_addr) { -- assert(obj->is_klass(), "must be klass"); -- assert(klassOop(obj)->klass_part()->oop_is_objArray_slow(), "must be obj array"); -- -- oop* p; -- objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); -- p = oak->element_klass_addr(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- p = oak->bottom_klass_addr(); -- PSParallelCompact::adjust_pointer(p, beg_addr, end_addr); -- -- return arrayKlassKlass::oop_update_pointers(cm, obj, beg_addr, end_addr); --} - #endif // SERIALGC - - #ifndef PRODUCT -diff --git a/src/share/vm/oops/oop.hpp b/src/share/vm/oops/oop.hpp ---- openjdk/hotspot/src/share/vm/oops/oop.hpp -+++ openjdk/hotspot/src/share/vm/oops/oop.hpp -@@ -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 -@@ -318,13 +318,6 @@ - - // Parallel Old - void update_contents(ParCompactionManager* cm); -- void update_contents(ParCompactionManager* cm, -- HeapWord* begin_limit, -- HeapWord* end_limit); -- void update_contents(ParCompactionManager* cm, -- klassOop old_klass, -- HeapWord* begin_limit, -- HeapWord* end_limit); - - void follow_contents(ParCompactionManager* cm); - void follow_header(ParCompactionManager* cm); -@@ -365,7 +358,6 @@ - #ifndef SERIALGC - // Parallel old - void update_header(); -- void update_header(HeapWord* beg_addr, HeapWord* end_addr); - #endif // SERIALGC - - // mark-sweep support -diff --git a/src/share/vm/oops/oop.pcgc.inline.hpp b/src/share/vm/oops/oop.pcgc.inline.hpp ---- openjdk/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp -+++ openjdk/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp -@@ -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 -@@ -57,41 +57,6 @@ - // Else skip it. The typeArrayKlass in the header never needs scavenging. - } - --inline void oopDesc::update_contents(ParCompactionManager* cm, -- HeapWord* begin_limit, -- HeapWord* end_limit) { -- // The klass field must be updated before anything else -- // can be done. -- debug_only(klassOopDesc* original_klass = klass()); -- -- update_contents(cm, klass(), begin_limit, end_limit); --} -- --inline void oopDesc::update_contents(ParCompactionManager* cm, -- klassOop old_klass, -- HeapWord* begin_limit, -- HeapWord* end_limit) { -- -- klassOop updated_klass = -- PSParallelCompact::summary_data().calc_new_klass(old_klass); -- -- // Needs to be boundary aware for the 64 bit case -- // update_header(); -- // The klass has moved. Is the location of the klass -- // within the limits? -- if ((((HeapWord*)&_metadata._klass) >= begin_limit) && -- (((HeapWord*)&_metadata._klass) < end_limit)) { -- set_klass(updated_klass); -- } -- -- Klass* klass = updated_klass->klass_part(); -- if (!klass->oop_is_typeArray()) { -- // It might contain oops beyond the header, so take the virtual call. -- klass->oop_update_pointers(cm, this, begin_limit, end_limit); -- } -- // Else skip it. The typeArrayKlass in the header never needs scavenging. --} -- - inline void oopDesc::follow_contents(ParCompactionManager* cm) { - assert (PSParallelCompact::mark_bitmap()->is_marked(this), - "should be marked"); -@@ -140,13 +105,4 @@ - } - } - --inline void oopDesc::update_header(HeapWord* beg_addr, HeapWord* end_addr) { -- if (UseCompressedOops) { -- PSParallelCompact::adjust_pointer(compressed_klass_addr(), -- beg_addr, end_addr); -- } else { -- PSParallelCompact::adjust_pointer(klass_addr(), beg_addr, end_addr); -- } --} -- - #endif // SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP -diff --git a/src/share/vm/oops/typeArrayKlass.cpp b/src/share/vm/oops/typeArrayKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp -@@ -250,13 +250,6 @@ - assert(obj->is_typeArray(),"must be a type array"); - return typeArrayOop(obj)->object_size(); - } -- --int --typeArrayKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, HeapWord* end_addr) { -- assert(obj->is_typeArray(),"must be a type array"); -- return typeArrayOop(obj)->object_size(); --} - #endif // SERIALGC - - void typeArrayKlass::initialize(TRAPS) {
--- a/patches/openjdk/7017732-move_static_fields_to_class.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3079 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371742382 18000 -# Node ID af33d9cd440e2851eaffb819d67f86b42c6a8030 -# Parent fee3c2ed387b0a925f81448c93265b4c30e0a8d6 -7017732: move static fields into Class to prepare for perm gen removal -Reviewed-by: kvn, coleenp, twisti, stefank - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java -@@ -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 -@@ -62,7 +62,7 @@ - - // get the value of static field - ValueImpl getValue() { -- return getValue(saField.getFieldHolder()); -+ return getValue(saField.getFieldHolder().getJavaMirror()); - } - - // get the value of this Field from a specific Oop -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -87,7 +87,7 @@ - innerClasses = new OopField(type.getOopField("_inner_classes"), Oop.getHeaderSize()); - nonstaticFieldSize = new CIntField(type.getCIntegerField("_nonstatic_field_size"), Oop.getHeaderSize()); - staticFieldSize = new CIntField(type.getCIntegerField("_static_field_size"), Oop.getHeaderSize()); -- staticOopFieldSize = new CIntField(type.getCIntegerField("_static_oop_field_size"), Oop.getHeaderSize()); -+ staticOopFieldCount = new CIntField(type.getCIntegerField("_static_oop_field_count"), Oop.getHeaderSize()); - nonstaticOopMapSize = new CIntField(type.getCIntegerField("_nonstatic_oop_map_size"), Oop.getHeaderSize()); - isMarkedDependent = new CIntField(type.getCIntegerField("_is_marked_dependent"), Oop.getHeaderSize()); - initState = new CIntField(type.getCIntegerField("_init_state"), Oop.getHeaderSize()); -@@ -140,7 +140,7 @@ - private static OopField innerClasses; - private static CIntField nonstaticFieldSize; - private static CIntField staticFieldSize; -- private static CIntField staticOopFieldSize; -+ private static CIntField staticOopFieldCount; - private static CIntField nonstaticOopMapSize; - private static CIntField isMarkedDependent; - private static CIntField initState; -@@ -261,8 +261,7 @@ - public Symbol getSourceDebugExtension(){ return (Symbol) sourceDebugExtension.getValue(this); } - public TypeArray getInnerClasses() { return (TypeArray) innerClasses.getValue(this); } - public long getNonstaticFieldSize() { return nonstaticFieldSize.getValue(this); } -- public long getStaticFieldSize() { return staticFieldSize.getValue(this); } -- public long getStaticOopFieldSize() { return staticOopFieldSize.getValue(this); } -+ public long getStaticOopFieldCount() { return staticOopFieldCount.getValue(this); } - public long getNonstaticOopMapSize() { return nonstaticOopMapSize.getValue(this); } - public boolean getIsMarkedDependent() { return isMarkedDependent.getValue(this) != 0; } - public long getVtableLen() { return vtableLen.getValue(this); } -@@ -454,7 +453,7 @@ - visitor.doOop(innerClasses, true); - visitor.doCInt(nonstaticFieldSize, true); - visitor.doCInt(staticFieldSize, true); -- visitor.doCInt(staticOopFieldSize, true); -+ visitor.doCInt(staticOopFieldCount, true); - visitor.doCInt(nonstaticOopMapSize, true); - visitor.doCInt(isMarkedDependent, true); - visitor.doCInt(initState, true); -@@ -693,7 +692,7 @@ - public long getObjectSize() { - long bodySize = alignObjectOffset(getVtableLen() * getHeap().getOopSize()) - + alignObjectOffset(getItableLen() * getHeap().getOopSize()) -- + (getStaticFieldSize() + getNonstaticOopMapSize()) * getHeap().getOopSize(); -+ + (getNonstaticOopMapSize()) * getHeap().getOopSize(); - return alignObjectSize(headerSize + bodySize); - } - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java b/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -40,7 +40,12 @@ - super(holder, fieldArrayIndex); - } - -- public int getValue(Oop obj) { return obj.getHandle().getJIntAt(getOffset()); } -+ public int getValue(Oop obj) { -+ if (!isVMField() && !obj.isInstance() && !obj.isArray()) { -+ throw new InternalError(obj.toString()); -+ } -+ return obj.getHandle().getJIntAt(getOffset()); -+ } - public void setValue(Oop obj, int value) throws MutationException { - // Fix this: setJIntAt is missing in Address - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/OopField.java b/agent/src/share/classes/sun/jvm/hotspot/oops/OopField.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopField.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopField.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -41,11 +41,17 @@ - } - - public Oop getValue(Oop obj) { -+ if (!isVMField() && !obj.isInstance() && !obj.isArray()) { -+ throw new InternalError(); -+ } - return obj.getHeap().newOop(getValueAsOopHandle(obj)); - } - - /** Debugging support */ - public OopHandle getValueAsOopHandle(Oop obj) { -+ if (!isVMField() && !obj.isInstance() && !obj.isArray()) { -+ throw new InternalError(obj.toString()); -+ } - return obj.getHandle().getOopHandleAt(getOffset()); - } - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java b/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -274,13 +274,7 @@ - // hc_klass is a HotSpot magic field and hence we can't - // find it from InstanceKlass for java.lang.Class. - TypeDataBase db = VM.getVM().getTypeDataBase(); -- int hcKlassOffset = (int) Instance.getHeaderSize(); -- try { -- hcKlassOffset += (db.lookupIntConstant("java_lang_Class::hc_klass_offset").intValue() * -- VM.getVM().getHeapOopSize()); -- } catch (RuntimeException re) { -- // ignore, currently java_lang_Class::hc_klass_offset is zero -- } -+ int hcKlassOffset = (int) db.lookupType("java_lang_Class").getCIntegerField("klass_offset").getValue(); - if (VM.getVM().isCompressedOopsEnabled()) { - hcKlassField = new NarrowOopField(new NamedFieldIdentifier("hc_klass"), hcKlassOffset, true); - } else { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java b/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 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 -@@ -839,13 +839,13 @@ - } - - private void readSystemProperties() { -- InstanceKlass systemKls = getSystemDictionary().getSystemKlass(); -+ final InstanceKlass systemKls = getSystemDictionary().getSystemKlass(); - systemKls.iterate(new DefaultOopVisitor() { - ObjectReader objReader = new ObjectReader(); - public void doOop(sun.jvm.hotspot.oops.OopField field, boolean isVMField) { - if (field.getID().getName().equals("props")) { - try { -- sysProps = (Properties) objReader.readObject(field.getValue(getObj())); -+ sysProps = (Properties) objReader.readObject(field.getValue(systemKls.getJavaMirror())); - } catch (Exception e) { - if (Assert.ASSERTS_ENABLED) { - e.printStackTrace(); -diff --git a/agent/test/jdi/sasanity.sh b/agent/test/jdi/sasanity.sh ---- openjdk/hotspot/agent/test/jdi/sasanity.sh -+++ openjdk/hotspot/agent/test/jdi/sasanity.sh -@@ -43,6 +43,7 @@ - fi - - jdk=$1 -+shift - OS=`uname` - - if [ "$OS" != "Linux" ]; then -@@ -68,7 +69,7 @@ - - tmp=/tmp/sagsetup - rm -f $tmp --$jdk/bin/java sagtarg > $tmp & -+$jdk/bin/java $* sagtarg > $tmp & - pid=$! - while [ ! -s $tmp ] ; do - # Kludge alert! -diff --git a/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp ---- openjdk/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp -+++ openjdk/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp -@@ -322,7 +322,8 @@ - // thread. - assert(_obj != noreg, "must be a valid register"); - assert(_oop_index >= 0, "must have oop index"); -- __ ld_ptr(_obj, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3); -+ __ ld_ptr(_obj, java_lang_Class::klass_offset_in_bytes(), G3); -+ __ ld_ptr(G3, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3); - __ cmp(G2_thread, G3); - __ br(Assembler::notEqual, false, Assembler::pn, call_patch); - __ delayed()->nop(); -diff --git a/src/cpu/sparc/vm/dump_sparc.cpp b/src/cpu/sparc/vm/dump_sparc.cpp ---- openjdk/hotspot/src/cpu/sparc/vm/dump_sparc.cpp -+++ openjdk/hotspot/src/cpu/sparc/vm/dump_sparc.cpp -@@ -80,13 +80,19 @@ - for (int j = 0; j < num_virtuals; ++j) { - dummy_vtable[num_virtuals * i + j] = (void*)masm->pc(); - __ save(SP, -256, SP); -+ int offset = (i << 8) + j; -+ Register src = G0; -+ if (!Assembler::is_simm13(offset)) { -+ __ sethi(offset, L0); -+ src = L0; -+ offset = offset & ((1 << 10) - 1); -+ } - __ brx(Assembler::always, false, Assembler::pt, common_code); - - // Load L0 with a value indicating vtable/offset pair. - // -- bits[ 7..0] (8 bits) which virtual method in table? -- // -- bits[12..8] (5 bits) which virtual method table? -- // -- must fit in 13-bit instruction immediate field. -- __ delayed()->set((i << 8) + j, L0); -+ // -- bits[13..8] (6 bits) which virtual method table? -+ __ delayed()->or3(src, offset, L0); - } - } - -diff --git a/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/src/cpu/x86/vm/c1_CodeStubs_x86.cpp ---- openjdk/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp -+++ openjdk/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp -@@ -313,10 +313,13 @@ - } - assert(_obj != noreg, "must be a valid register"); - Register tmp = rax; -- if (_obj == tmp) tmp = rbx; -+ Register tmp2 = rbx; - __ push(tmp); -+ __ push(tmp2); -+ __ movptr(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes())); - __ get_thread(tmp); -- __ cmpptr(tmp, Address(_obj, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc))); -+ __ cmpptr(tmp, Address(tmp2, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc))); -+ __ pop(tmp2); - __ pop(tmp); - __ jcc(Assembler::notEqual, call_patch); - -diff --git a/src/cpu/zero/vm/cppInterpreter_zero.cpp b/src/cpu/zero/vm/cppInterpreter_zero.cpp ---- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -@@ -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. - * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * -@@ -281,7 +281,7 @@ - - if (method->is_static()) { - istate->set_oop_temp( -- method->constants()->pool_holder()->klass_part()->java_mirror()); -+ method->constants()->pool_holder()->java_mirror()); - mirror = istate->oop_temp_addr(); - *(dst++) = &mirror; - } -@@ -667,7 +667,7 @@ - (BasicObjectLock *) stack->alloc(monitor_words * wordSize); - oop object; - if (method->is_static()) -- object = method->constants()->pool_holder()->klass_part()->java_mirror(); -+ object = method->constants()->pool_holder()->java_mirror(); - else - object = (oop) locals[0]; - monitor->set_obj(object); -diff --git a/src/share/vm/c1/c1_GraphBuilder.cpp b/src/share/vm/c1/c1_GraphBuilder.cpp ---- openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp -+++ openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp -@@ -1468,9 +1468,9 @@ - // so, the is_initialized flag should be suffiect. - if (state_before != NULL) { - // build a patching constant -- obj = new Constant(new ClassConstant(holder), state_before); -+ obj = new Constant(new InstanceConstant(holder->java_mirror()), state_before); - } else { -- obj = new Constant(new ClassConstant(holder)); -+ obj = new Constant(new InstanceConstant(holder->java_mirror())); - } - } - -diff --git a/src/share/vm/c1/c1_Runtime1.cpp b/src/share/vm/c1/c1_Runtime1.cpp ---- openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp -+++ openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp -@@ -807,7 +807,7 @@ - { klassOop klass = resolve_field_return_klass(caller_method, bci, CHECK); - // Save a reference to the class that has to be checked for initialization - init_klass = KlassHandle(THREAD, klass); -- k = klass; -+ k = klass->java_mirror(); - } - break; - case Bytecodes::_new: -diff --git a/src/share/vm/ci/ciCPCache.cpp b/src/share/vm/ci/ciCPCache.cpp ---- openjdk/hotspot/src/share/vm/ci/ciCPCache.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciCPCache.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2009, 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,8 +46,7 @@ - // ciCPCache::is_f1_null_at - bool ciCPCache::is_f1_null_at(int index) { - VM_ENTRY_MARK; -- oop f1 = entry_at(index)->f1(); -- return (f1 == NULL); -+ return entry_at(index)->is_f1_null(); - } - - -diff --git a/src/share/vm/ci/ciField.cpp b/src/share/vm/ci/ciField.cpp ---- openjdk/hotspot/src/share/vm/ci/ciField.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciField.cpp -@@ -224,36 +224,38 @@ - } - } - -+ Handle mirror = k->java_mirror(); -+ - _is_constant = true; - switch(type()->basic_type()) { - case T_BYTE: -- _constant_value = ciConstant(type()->basic_type(), k->byte_field(_offset)); -+ _constant_value = ciConstant(type()->basic_type(), mirror->byte_field(_offset)); - break; - case T_CHAR: -- _constant_value = ciConstant(type()->basic_type(), k->char_field(_offset)); -+ _constant_value = ciConstant(type()->basic_type(), mirror->char_field(_offset)); - break; - case T_SHORT: -- _constant_value = ciConstant(type()->basic_type(), k->short_field(_offset)); -+ _constant_value = ciConstant(type()->basic_type(), mirror->short_field(_offset)); - break; - case T_BOOLEAN: -- _constant_value = ciConstant(type()->basic_type(), k->bool_field(_offset)); -+ _constant_value = ciConstant(type()->basic_type(), mirror->bool_field(_offset)); - break; - case T_INT: -- _constant_value = ciConstant(type()->basic_type(), k->int_field(_offset)); -+ _constant_value = ciConstant(type()->basic_type(), mirror->int_field(_offset)); - break; - case T_FLOAT: -- _constant_value = ciConstant(k->float_field(_offset)); -+ _constant_value = ciConstant(mirror->float_field(_offset)); - break; - case T_DOUBLE: -- _constant_value = ciConstant(k->double_field(_offset)); -+ _constant_value = ciConstant(mirror->double_field(_offset)); - break; - case T_LONG: -- _constant_value = ciConstant(k->long_field(_offset)); -+ _constant_value = ciConstant(mirror->long_field(_offset)); - break; - case T_OBJECT: - case T_ARRAY: - { -- oop o = k->obj_field(_offset); -+ oop o = mirror->obj_field(_offset); - - // A field will be "constant" if it is known always to be - // a non-null reference to an instance of a particular class, -diff --git a/src/share/vm/ci/ciInstance.cpp b/src/share/vm/ci/ciInstance.cpp ---- openjdk/hotspot/src/share/vm/ci/ciInstance.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciInstance.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -138,3 +138,9 @@ - st->print(" type="); - klass()->print(st); - } -+ -+ -+ciKlass* ciInstance::java_lang_Class_klass() { -+ VM_ENTRY_MARK; -+ return CURRENT_ENV->get_object(java_lang_Class::as_klassOop(get_oop()))->as_klass(); -+} -diff --git a/src/share/vm/ci/ciInstance.hpp b/src/share/vm/ci/ciInstance.hpp ---- openjdk/hotspot/src/share/vm/ci/ciInstance.hpp -+++ openjdk/hotspot/src/share/vm/ci/ciInstance.hpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -64,6 +64,8 @@ - - // Constant value of a field at the specified offset. - ciConstant field_value_by_offset(int field_offset); -+ -+ ciKlass* java_lang_Class_klass(); - }; - - #endif // SHARE_VM_CI_CIINSTANCE_HPP -diff --git a/src/share/vm/ci/ciInstanceKlass.cpp b/src/share/vm/ci/ciInstanceKlass.cpp ---- openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -84,7 +84,6 @@ - if (h_k() != SystemDictionary::Object_klass()) { - super(); - } -- java_mirror(); - //compute_nonstatic_fields(); // done outside of constructor - } - -@@ -319,6 +318,9 @@ - // Get the instance of java.lang.Class corresponding to this klass. - // Cache it on this->_java_mirror. - ciInstance* ciInstanceKlass::java_mirror() { -+ if (is_shared()) { -+ return ciKlass::java_mirror(); -+ } - if (_java_mirror == NULL) { - _java_mirror = ciKlass::java_mirror(); - } -diff --git a/src/share/vm/ci/ciObjectFactory.cpp b/src/share/vm/ci/ciObjectFactory.cpp ---- openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp -@@ -653,7 +653,7 @@ - if (key->is_perm() && _non_perm_count == 0) { - return emptyBucket; - } else if (key->is_instance()) { -- if (key->klass() == SystemDictionary::Class_klass()) { -+ if (key->klass() == SystemDictionary::Class_klass() && JavaObjectsInPerm) { - // class mirror instances are always perm - return emptyBucket; - } -diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp ---- openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -@@ -37,6 +37,7 @@ - #include "memory/universe.inline.hpp" - #include "oops/constantPoolOop.hpp" - #include "oops/instanceKlass.hpp" -+#include "oops/instanceMirrorKlass.hpp" - #include "oops/klass.inline.hpp" - #include "oops/klassOop.hpp" - #include "oops/klassVtable.hpp" -@@ -2737,8 +2738,8 @@ - } - - --void ClassFileParser::java_lang_Class_fix_pre(objArrayHandle* methods_ptr, -- FieldAllocationCount *fac_ptr, TRAPS) { -+void ClassFileParser::java_lang_Class_fix_pre(int* nonstatic_field_size, -+ FieldAllocationCount *fac_ptr) { - // Add fake fields for java.lang.Class instances - // - // This is not particularly nice. We should consider adding a -@@ -2755,10 +2756,13 @@ - // versions because when the offsets are computed at bootstrap - // time we don't know yet which version of the JDK we're running in. - -- // The values below are fake but will force two non-static oop fields and -+ // The values below are fake but will force three non-static oop fields and - // a corresponding non-static oop map block to be allocated. - const int extra = java_lang_Class::number_of_fake_oop_fields; - fac_ptr->nonstatic_oop_count += extra; -+ -+ // Reserve some leading space for fake ints -+ *nonstatic_field_size += align_size_up(java_lang_Class::hc_number_of_fake_int_fields * BytesPerInt, heapOopSize) / heapOopSize; - } - - -@@ -3167,9 +3171,7 @@ - int next_nonstatic_field_offset; - - // Calculate the starting byte offsets -- next_static_oop_offset = (instanceKlass::header_size() + -- align_object_offset(vtable_size) + -- align_object_offset(itable_size)) * wordSize; -+ next_static_oop_offset = instanceMirrorKlass::offset_of_static_fields(); - next_static_double_offset = next_static_oop_offset + - (fac.static_oop_count * heapOopSize); - if ( fac.static_double_count && -@@ -3519,7 +3521,7 @@ - } - - // We can now create the basic klassOop for this klass -- klassOop ik = oopFactory::new_instanceKlass(vtable_size, itable_size, -+ klassOop ik = oopFactory::new_instanceKlass(name, vtable_size, itable_size, - static_field_size, - total_oop_map_count, - rt, CHECK_(nullHandle)); -@@ -3541,7 +3543,7 @@ - this_klass->set_class_loader(class_loader()); - this_klass->set_nonstatic_field_size(nonstatic_field_size); - this_klass->set_has_nonstatic_fields(has_nonstatic_fields); -- this_klass->set_static_oop_field_size(fac.static_oop_count); -+ this_klass->set_static_oop_field_count(fac.static_oop_count); - cp->set_pool_holder(this_klass()); - this_klass->set_constants(cp()); - this_klass->set_local_interfaces(local_interfaces()); -@@ -3601,9 +3603,6 @@ - // Make sure this is the end of class file stream - guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle)); - -- // Initialize static fields -- this_klass->do_local_static_fields(&initialize_static_field, CHECK_(nullHandle)); -- - // VerifyOops believes that once this has been set, the object is completely loaded. - // Compute transitive closure of interfaces this class implements - this_klass->set_transitive_interfaces(transitive_interfaces()); -@@ -3637,6 +3636,9 @@ - check_illegal_static_method(this_klass, CHECK_(nullHandle)); - } - -+ // Allocate mirror and initialize static fields -+ java_lang_Class::create_mirror(this_klass, CHECK_(nullHandle)); -+ - ClassLoadingService::notify_class_loaded(instanceKlass::cast(this_klass()), - false /* not shared class */); - -diff --git a/src/share/vm/classfile/classFileParser.hpp b/src/share/vm/classfile/classFileParser.hpp ---- openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp -@@ -153,11 +153,12 @@ - // Add the "discovered" field to java.lang.ref.Reference if - // it does not exist. - void java_lang_ref_Reference_fix_pre(typeArrayHandle* fields_ptr, -- constantPoolHandle cp, FieldAllocationCount *fac_ptr, TRAPS); -+ constantPoolHandle cp, -+ FieldAllocationCount *fac_ptr, TRAPS); - // Adjust the field allocation counts for java.lang.Class to add - // fake fields. -- void java_lang_Class_fix_pre(objArrayHandle* methods_ptr, -- FieldAllocationCount *fac_ptr, TRAPS); -+ void java_lang_Class_fix_pre(int* nonstatic_field_size, -+ FieldAllocationCount *fac_ptr); - // Adjust the next_nonstatic_oop_offset to place the fake fields - // before any Java fields. - void java_lang_Class_fix_post(int* next_nonstatic_oop_offset); -diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -@@ -33,6 +33,7 @@ - #include "memory/resourceArea.hpp" - #include "memory/universe.inline.hpp" - #include "oops/instanceKlass.hpp" -+#include "oops/instanceMirrorKlass.hpp" - #include "oops/klass.hpp" - #include "oops/klassOop.hpp" - #include "oops/methodOop.hpp" -@@ -391,6 +392,75 @@ - } - } - -+static void initialize_static_field(fieldDescriptor* fd, TRAPS) { -+ Handle mirror (THREAD, fd->field_holder()->java_mirror()); -+ assert(mirror.not_null() && fd->is_static(), "just checking"); -+ if (fd->has_initial_value()) { -+ BasicType t = fd->field_type(); -+ switch (t) { -+ case T_BYTE: -+ mirror()->byte_field_put(fd->offset(), fd->int_initial_value()); -+ break; -+ case T_BOOLEAN: -+ mirror()->bool_field_put(fd->offset(), fd->int_initial_value()); -+ break; -+ case T_CHAR: -+ mirror()->char_field_put(fd->offset(), fd->int_initial_value()); -+ break; -+ case T_SHORT: -+ mirror()->short_field_put(fd->offset(), fd->int_initial_value()); -+ break; -+ case T_INT: -+ mirror()->int_field_put(fd->offset(), fd->int_initial_value()); -+ break; -+ case T_FLOAT: -+ mirror()->float_field_put(fd->offset(), fd->float_initial_value()); -+ break; -+ case T_DOUBLE: -+ mirror()->double_field_put(fd->offset(), fd->double_initial_value()); -+ break; -+ case T_LONG: -+ mirror()->long_field_put(fd->offset(), fd->long_initial_value()); -+ break; -+ case T_OBJECT: -+ { -+ #ifdef ASSERT -+ TempNewSymbol sym = SymbolTable::new_symbol("Ljava/lang/String;", CHECK); -+ assert(fd->signature() == sym, "just checking"); -+ #endif -+ oop string = fd->string_initial_value(CHECK); -+ mirror()->obj_field_put(fd->offset(), string); -+ } -+ break; -+ default: -+ THROW_MSG(vmSymbols::java_lang_ClassFormatError(), -+ "Illegal ConstantValue attribute in class file"); -+ } -+ } -+} -+ -+ -+// During bootstrap, java.lang.Class wasn't loaded so static field -+// offsets were computed without the size added it. Go back and -+// update all the static field offsets to included the size. -+static void fixup_static_field(fieldDescriptor* fd, TRAPS) { -+ if (fd->is_static()) { -+ int real_offset = fd->offset() + instanceMirrorKlass::offset_of_static_fields(); -+ typeArrayOop fields = instanceKlass::cast(fd->field_holder())->fields(); -+ fields->short_at_put(fd->index() + instanceKlass::low_offset, extract_low_short_from_int(real_offset)); -+ fields->short_at_put(fd->index() + instanceKlass::high_offset, extract_high_short_from_int(real_offset)); -+ } -+} -+ -+void java_lang_Class::fixup_mirror(KlassHandle k, TRAPS) { -+ assert(instanceMirrorKlass::offset_of_static_fields() != 0, "must have been computed already"); -+ -+ if (k->oop_is_instance()) { -+ // Fixup the offsets -+ instanceKlass::cast(k())->do_local_static_fields(&fixup_static_field, CHECK); -+ } -+ create_mirror(k, CHECK); -+} - - oop java_lang_Class::create_mirror(KlassHandle k, TRAPS) { - assert(k->java_mirror() == NULL, "should only assign mirror once"); -@@ -400,12 +470,17 @@ - // class is put into the system dictionary. - int computed_modifiers = k->compute_modifier_flags(CHECK_0); - k->set_modifier_flags(computed_modifiers); -- if (SystemDictionary::Class_klass_loaded()) { -+ if (SystemDictionary::Class_klass_loaded() && (k->oop_is_instance() || k->oop_is_javaArray())) { - // Allocate mirror (java.lang.Class instance) -- Handle mirror = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0); -+ Handle mirror = instanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(k, CHECK_0); - // Setup indirections - mirror->obj_field_put(klass_offset, k()); - k->set_java_mirror(mirror()); -+ -+ instanceMirrorKlass* mk = instanceMirrorKlass::cast(mirror->klass()); -+ java_lang_Class::set_oop_size(mirror(), mk->instance_size(k)); -+ java_lang_Class::set_static_oop_field_count(mirror(), mk->compute_static_oop_field_count(mirror())); -+ - // It might also have a component mirror. This mirror must already exist. - if (k->oop_is_javaArray()) { - Handle comp_mirror; -@@ -428,6 +503,9 @@ - arrayKlass::cast(k->as_klassOop())->set_component_mirror(comp_mirror()); - set_array_klass(comp_mirror(), k->as_klassOop()); - } -+ } else if (k->oop_is_instance()) { -+ // Initialize static fields -+ instanceKlass::cast(k())->do_local_static_fields(&initialize_static_field, CHECK_NULL); - } - return mirror(); - } else { -@@ -436,21 +514,46 @@ - } - - -+ -+int java_lang_Class::oop_size(oop java_class) { -+ assert(oop_size_offset != 0, "must be set"); -+ return java_class->int_field(oop_size_offset); -+} -+void java_lang_Class::set_oop_size(oop java_class, int size) { -+ assert(oop_size_offset != 0, "must be set"); -+ java_class->int_field_put(oop_size_offset, size); -+} -+int java_lang_Class::static_oop_field_count(oop java_class) { -+ assert(static_oop_field_count_offset != 0, "must be set"); -+ return java_class->int_field(static_oop_field_count_offset); -+} -+void java_lang_Class::set_static_oop_field_count(oop java_class, int size) { -+ assert(static_oop_field_count_offset != 0, "must be set"); -+ java_class->int_field_put(static_oop_field_count_offset, size); -+} -+ -+ -+ -+ - oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) { - // This should be improved by adding a field at the Java level or by - // introducing a new VM klass (see comment in ClassFileParser) -- oop java_class = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0); -+ oop java_class = instanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance((oop)NULL, CHECK_0); - if (type != T_VOID) { - klassOop aklass = Universe::typeArrayKlassObj(type); - assert(aklass != NULL, "correct bootstrap"); - set_array_klass(java_class, aklass); - } -+ instanceMirrorKlass* mk = instanceMirrorKlass::cast(SystemDictionary::Class_klass()); -+ java_lang_Class::set_oop_size(java_class, mk->instance_size(oop(NULL))); -+ java_lang_Class::set_static_oop_field_count(java_class, 0); - return java_class; - } - - - klassOop java_lang_Class::as_klassOop(oop java_class) { - //%note memory_2 -+ assert(java_lang_Class::is_instance(java_class), "must be a Class object"); - klassOop k = klassOop(java_class->obj_field(klass_offset)); - assert(k == NULL || k->is_klass(), "type check"); - return k; -@@ -2145,7 +2248,7 @@ - // Support for java_lang_ref_Reference - oop java_lang_ref_Reference::pending_list_lock() { - instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass()); -- char *addr = (((char *)ik->start_of_static_fields()) + static_lock_offset); -+ address addr = ik->static_field_addr(static_lock_offset); - if (UseCompressedOops) { - return oopDesc::load_decode_heap_oop((narrowOop *)addr); - } else { -@@ -2155,7 +2258,7 @@ - - HeapWord *java_lang_ref_Reference::pending_list_addr() { - instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass()); -- char *addr = (((char *)ik->start_of_static_fields()) + static_pending_offset); -+ address addr = ik->static_field_addr(static_pending_offset); - // XXX This might not be HeapWord aligned, almost rather be char *. - return (HeapWord*)addr; - } -@@ -2178,16 +2281,14 @@ - - jlong java_lang_ref_SoftReference::clock() { - instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass()); -- int offset = ik->offset_of_static_fields() + static_clock_offset; -- -- return SystemDictionary::SoftReference_klass()->long_field(offset); -+ jlong* offset = (jlong*)ik->static_field_addr(static_clock_offset); -+ return *offset; - } - - void java_lang_ref_SoftReference::set_clock(jlong value) { - instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass()); -- int offset = ik->offset_of_static_fields() + static_clock_offset; -- -- SystemDictionary::SoftReference_klass()->long_field_put(offset, value); -+ jlong* offset = (jlong*)ik->static_field_addr(static_clock_offset); -+ *offset = value; - } - - -@@ -2647,26 +2748,18 @@ - - - // Support for java_lang_System -- --void java_lang_System::compute_offsets() { -- assert(offset_of_static_fields == 0, "offsets should be initialized only once"); -- -- instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass()); -- offset_of_static_fields = ik->offset_of_static_fields(); -+int java_lang_System::in_offset_in_bytes() { -+ return (instanceMirrorKlass::offset_of_static_fields() + static_in_offset); - } - --int java_lang_System::in_offset_in_bytes() { -- return (offset_of_static_fields + static_in_offset); -+ -+int java_lang_System::out_offset_in_bytes() { -+ return (instanceMirrorKlass::offset_of_static_fields() + static_out_offset); - } - - --int java_lang_System::out_offset_in_bytes() { -- return (offset_of_static_fields + static_out_offset); --} -- -- - int java_lang_System::err_offset_in_bytes() { -- return (offset_of_static_fields + static_err_offset); -+ return (instanceMirrorKlass::offset_of_static_fields() + static_err_offset); - } - - -@@ -2688,6 +2781,8 @@ - int java_lang_Class::array_klass_offset; - int java_lang_Class::resolved_constructor_offset; - int java_lang_Class::number_of_fake_oop_fields; -+int java_lang_Class::oop_size_offset; -+int java_lang_Class::static_oop_field_count_offset; - int java_lang_Throwable::backtrace_offset; - int java_lang_Throwable::detailMessage_offset; - int java_lang_Throwable::cause_offset; -@@ -2731,7 +2826,6 @@ - int java_lang_ref_SoftReference::timestamp_offset; - int java_lang_ref_SoftReference::static_clock_offset; - int java_lang_ClassLoader::parent_offset; --int java_lang_System::offset_of_static_fields; - int java_lang_System::static_in_offset; - int java_lang_System::static_out_offset; - int java_lang_System::static_err_offset; -@@ -2849,10 +2943,19 @@ - java_lang_String::count_offset = java_lang_String::offset_offset + sizeof (jint); - java_lang_String::hash_offset = java_lang_String::count_offset + sizeof (jint); - -- // Do the Class Class -- java_lang_Class::klass_offset = java_lang_Class::hc_klass_offset * x + header; -- java_lang_Class::array_klass_offset = java_lang_Class::hc_array_klass_offset * x + header; -- java_lang_Class::resolved_constructor_offset = java_lang_Class::hc_resolved_constructor_offset * x + header; -+ { -+ // Do the Class Class -+ int offset = header; -+ java_lang_Class::oop_size_offset = header; -+ offset += BytesPerInt; -+ java_lang_Class::static_oop_field_count_offset = offset; -+ offset = align_size_up(offset + BytesPerInt, x); -+ java_lang_Class::klass_offset = offset; -+ offset += x; -+ java_lang_Class::array_klass_offset = offset; -+ offset += x; -+ java_lang_Class::resolved_constructor_offset = offset; -+ } - - // This is NOT an offset - java_lang_Class::number_of_fake_oop_fields = java_lang_Class::hc_number_of_fake_oop_fields; -@@ -2910,7 +3013,6 @@ - void JavaClasses::compute_offsets() { - - java_lang_Class::compute_offsets(); -- java_lang_System::compute_offsets(); - java_lang_Thread::compute_offsets(); - java_lang_ThreadGroup::compute_offsets(); - if (EnableMethodHandles) { -@@ -2995,10 +3097,10 @@ - tty->print_cr("Static field %s.%s appears to be nonstatic", klass_name, field_name); - return false; - } -- if (fd.offset() == hardcoded_offset + h_klass->offset_of_static_fields()) { -+ if (fd.offset() == hardcoded_offset + instanceMirrorKlass::offset_of_static_fields()) { - return true; - } else { -- tty->print_cr("Offset of static field %s.%s is hardcoded as %d but should really be %d.", klass_name, field_name, hardcoded_offset, fd.offset() - h_klass->offset_of_static_fields()); -+ tty->print_cr("Offset of static field %s.%s is hardcoded as %d but should really be %d.", klass_name, field_name, hardcoded_offset, fd.offset() - instanceMirrorKlass::offset_of_static_fields()); - return false; - } - } -diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -@@ -162,10 +162,8 @@ - // The fake offsets are added by the class loader when java.lang.Class is loaded - - enum { -- hc_klass_offset = 0, -- hc_array_klass_offset = 1, -- hc_resolved_constructor_offset = 2, -- hc_number_of_fake_oop_fields = 3 -+ hc_number_of_fake_oop_fields = 3, -+ hc_number_of_fake_int_fields = 2 - }; - - static int klass_offset; -@@ -173,6 +171,9 @@ - static int array_klass_offset; - static int number_of_fake_oop_fields; - -+ static int oop_size_offset; -+ static int static_oop_field_count_offset; -+ - static void compute_offsets(); - static bool offsets_computed; - static int classRedefinedCount_offset; -@@ -181,6 +182,7 @@ - public: - // Instance creation - static oop create_mirror(KlassHandle k, TRAPS); -+ static void fixup_mirror(KlassHandle k, TRAPS); - static oop create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS); - // Conversion - static klassOop as_klassOop(oop java_class); -@@ -215,6 +217,12 @@ - static void set_classRedefinedCount(oop the_class_mirror, int value); - // Support for parallelCapable field - static bool parallelCapable(oop the_class_mirror); -+ -+ static int oop_size(oop java_class); -+ static void set_oop_size(oop java_class, int size); -+ static int static_oop_field_count(oop java_class); -+ static void set_static_oop_field_count(oop java_class, int size); -+ - // Debugging - friend class JavaClasses; - friend class instanceKlass; // verification code accesses offsets -diff --git a/src/share/vm/code/codeCache.cpp b/src/share/vm/code/codeCache.cpp ---- openjdk/hotspot/src/share/vm/code/codeCache.cpp -+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp -@@ -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 -diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp ---- openjdk/hotspot/src/share/vm/code/nmethod.cpp -+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp -@@ -654,6 +654,9 @@ - _pc_desc_cache.reset_to(NULL); - - code_buffer->copy_oops_to(this); -+ if (ScavengeRootsInCode && detect_scavenge_root_oops()) { -+ CodeCache::add_scavenge_root_nmethod(this); -+ } - debug_only(verify_scavenge_root_oops()); - CodeCache::commit(this); - } -diff --git a/src/share/vm/interpreter/bytecodeInterpreter.cpp b/src/share/vm/interpreter/bytecodeInterpreter.cpp ---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp -@@ -650,7 +650,7 @@ - // oop rcvr = locals[0].j.r; - oop rcvr; - if (METHOD->is_static()) { -- rcvr = METHOD->constants()->pool_holder()->klass_part()->java_mirror(); -+ rcvr = METHOD->constants()->pool_holder()->java_mirror(); - } else { - rcvr = LOCALS_OBJECT(0); - VERIFY_OOP(rcvr); -@@ -2105,8 +2105,8 @@ - break; - - case JVM_CONSTANT_Class: -- VERIFY_OOP(constants->resolved_klass_at(index)->klass_part()->java_mirror()); -- SET_STACK_OBJECT(constants->resolved_klass_at(index)->klass_part()->java_mirror(), 0); -+ VERIFY_OOP(constants->resolved_klass_at(index)->java_mirror()); -+ SET_STACK_OBJECT(constants->resolved_klass_at(index)->java_mirror(), 0); - break; - - case JVM_CONSTANT_UnresolvedString: -diff --git a/src/share/vm/interpreter/interpreterRuntime.cpp b/src/share/vm/interpreter/interpreterRuntime.cpp ---- openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp -@@ -112,7 +112,7 @@ - - if (tag.is_unresolved_klass() || tag.is_klass()) { - klassOop klass = pool->klass_at(index, CHECK); -- oop java_class = klass->klass_part()->java_mirror(); -+ oop java_class = klass->java_mirror(); - thread->set_vm_result(java_class); - } else { - #ifdef ASSERT -@@ -974,7 +974,8 @@ - ConstantPoolCacheEntry *cp_entry)) - - // check the access_flags for the field in the klass -- instanceKlass* ik = instanceKlass::cast((klassOop)cp_entry->f1()); -+ -+ instanceKlass* ik = instanceKlass::cast(java_lang_Class::as_klassOop(cp_entry->f1())); - typeArrayOop fields = ik->fields(); - int index = cp_entry->field_index(); - assert(index < fields->length(), "holders field index is out of range"); -@@ -1000,7 +1001,7 @@ - // non-static field accessors have an object, but we need a handle - h_obj = Handle(thread, obj); - } -- instanceKlassHandle h_cp_entry_f1(thread, (klassOop)cp_entry->f1()); -+ instanceKlassHandle h_cp_entry_f1(thread, java_lang_Class::as_klassOop(cp_entry->f1())); - jfieldID fid = jfieldIDWorkaround::to_jfieldID(h_cp_entry_f1, cp_entry->f2(), is_static); - JvmtiExport::post_field_access(thread, method(thread), bcp(thread), h_cp_entry_f1, h_obj, fid); - IRT_END -@@ -1008,7 +1009,7 @@ - IRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread, - oopDesc* obj, ConstantPoolCacheEntry *cp_entry, jvalue *value)) - -- klassOop k = (klassOop)cp_entry->f1(); -+ klassOop k = java_lang_Class::as_klassOop(cp_entry->f1()); - - // check the access_flags for the field in the klass - instanceKlass* ik = instanceKlass::cast(k); -diff --git a/src/share/vm/memory/compactingPermGenGen.hpp b/src/share/vm/memory/compactingPermGenGen.hpp ---- openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp -+++ openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp -@@ -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 -@@ -108,7 +108,7 @@ - public: - - enum { -- vtbl_list_size = 16, // number of entries in the shared space vtable list. -+ vtbl_list_size = 17, // number of entries in the shared space vtable list. - num_virtuals = 200 // number of virtual methods in Klass (or - // subclass) objects, or greater. - }; -diff --git a/src/share/vm/memory/oopFactory.cpp b/src/share/vm/memory/oopFactory.cpp ---- openjdk/hotspot/src/share/vm/memory/oopFactory.cpp -+++ openjdk/hotspot/src/share/vm/memory/oopFactory.cpp -@@ -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 -@@ -118,12 +118,12 @@ - } - - --klassOop oopFactory::new_instanceKlass(int vtable_len, int itable_len, -+klassOop oopFactory::new_instanceKlass(Symbol* name, int vtable_len, int itable_len, - int static_field_size, - unsigned int nonstatic_oop_map_count, - ReferenceType rt, TRAPS) { - instanceKlassKlass* ikk = instanceKlassKlass::cast(Universe::instanceKlassKlassObj()); -- return ikk->allocate_instance_klass(vtable_len, itable_len, static_field_size, nonstatic_oop_map_count, rt, CHECK_NULL); -+ return ikk->allocate_instance_klass(name, vtable_len, itable_len, static_field_size, nonstatic_oop_map_count, rt, CHECK_NULL); - } - - -diff --git a/src/share/vm/memory/oopFactory.hpp b/src/share/vm/memory/oopFactory.hpp ---- openjdk/hotspot/src/share/vm/memory/oopFactory.hpp -+++ openjdk/hotspot/src/share/vm/memory/oopFactory.hpp -@@ -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 -@@ -101,7 +101,8 @@ - TRAPS); - - // Instance classes -- static klassOop new_instanceKlass(int vtable_len, int itable_len, -+ static klassOop new_instanceKlass(Symbol* name, -+ int vtable_len, int itable_len, - int static_field_size, - unsigned int nonstatic_oop_map_count, - ReferenceType rt, TRAPS); -diff --git a/src/share/vm/memory/universe.cpp b/src/share/vm/memory/universe.cpp ---- openjdk/hotspot/src/share/vm/memory/universe.cpp -+++ openjdk/hotspot/src/share/vm/memory/universe.cpp -@@ -51,6 +51,7 @@ - #include "oops/cpCacheKlass.hpp" - #include "oops/cpCacheOop.hpp" - #include "oops/instanceKlass.hpp" -+#include "oops/instanceMirrorKlass.hpp" - #include "oops/instanceKlassKlass.hpp" - #include "oops/instanceRefKlass.hpp" - #include "oops/klassKlass.hpp" -@@ -535,6 +536,7 @@ - { objArrayKlassKlass o; add_vtable(list, &n, &o, count); } - { instanceKlassKlass o; add_vtable(list, &n, &o, count); } - { instanceKlass o; add_vtable(list, &n, &o, count); } -+ { instanceMirrorKlass o; add_vtable(list, &n, &o, count); } - { instanceRefKlass o; add_vtable(list, &n, &o, count); } - { typeArrayKlassKlass o; add_vtable(list, &n, &o, count); } - { symbolKlass o; add_vtable(list, &n, &o, count); } -@@ -557,7 +559,7 @@ - KlassHandle k(THREAD, klassOop(obj)); - // We will never reach the CATCH below since Exceptions::_throw will cause - // the VM to exit if an exception is thrown during initialization -- java_lang_Class::create_mirror(k, CATCH); -+ java_lang_Class::fixup_mirror(k, CATCH); - // This call unconditionally creates a new mirror for k, - // and links in k's component_mirror field if k is an array. - // If k is an objArray, k's element type must already have -@@ -615,6 +617,10 @@ - // walk over permanent objects created so far (mostly classes) and fixup their mirrors. Note - // that the number of objects allocated at this point is very small. - assert(SystemDictionary::Class_klass_loaded(), "java.lang.Class should be loaded"); -+ -+ // Cache the start of the static fields -+ instanceMirrorKlass::init_offset_of_static_fields(); -+ - FixupMirrorClosure blk; - Universe::heap()->permanent_object_iterate(&blk); - } -diff --git a/src/share/vm/oops/arrayKlassKlass.cpp b/src/share/vm/oops/arrayKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp -@@ -28,6 +28,13 @@ - #include "oops/arrayKlassKlass.hpp" - #include "oops/oop.inline.hpp" - #include "runtime/handles.inline.hpp" -+#ifndef SERIALGC -+#include "gc_implementation/parNew/parOopClosures.inline.hpp" -+#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" -+#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" -+#include "memory/cardTableRS.hpp" -+#include "oops/oop.pcgc.inline.hpp" -+#endif - - - klassOop arrayKlassKlass::create_klass(TRAPS) { -@@ -104,9 +111,12 @@ - int arrayKlassKlass::oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) { - assert(obj->is_klass(), "must be klass"); - arrayKlass* ak = arrayKlass::cast(klassOop(obj)); -- blk->do_oop(ak->adr_component_mirror()); -- blk->do_oop(ak->adr_lower_dimension()); -- blk->do_oop(ak->adr_higher_dimension()); -+ oop* addr = ak->adr_component_mirror(); -+ if (mr.contains(addr)) blk->do_oop(addr); -+ addr = ak->adr_lower_dimension(); -+ if (mr.contains(addr)) blk->do_oop(addr); -+ addr = ak->adr_higher_dimension(); -+ if (mr.contains(addr)) blk->do_oop(addr); - ak->vtable()->oop_oop_iterate_m(blk, mr); - return klassKlass::oop_oop_iterate_m(obj, blk, mr); - } -@@ -114,6 +124,12 @@ - #ifndef SERIALGC - void arrayKlassKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { - assert(obj->blueprint()->oop_is_arrayKlass(),"must be an array klass"); -+ arrayKlass* ak = arrayKlass::cast(klassOop(obj)); -+ oop* p = ak->adr_component_mirror(); -+ if (PSScavenge::should_scavenge(p)) { -+ pm->claim_or_forward_depth(p); -+ } -+ klassKlass::oop_push_contents(pm, obj); - } - - int arrayKlassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { -diff --git a/src/share/vm/oops/constantPoolOop.cpp b/src/share/vm/oops/constantPoolOop.cpp ---- openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp -@@ -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 -@@ -477,7 +477,7 @@ - { - klassOop resolved = klass_at_impl(this_oop, index, CHECK_NULL); - // ldc wants the java mirror. -- result_oop = resolved->klass_part()->java_mirror(); -+ result_oop = resolved->java_mirror(); - break; - } - -diff --git a/src/share/vm/oops/cpCacheKlass.cpp b/src/share/vm/oops/cpCacheKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp -@@ -185,22 +185,18 @@ - void constantPoolCacheKlass::oop_push_contents(PSPromotionManager* pm, - oop obj) { - assert(obj->is_constantPoolCache(), "should be constant pool"); -- if (EnableInvokeDynamic) { -+ if (ScavengeRootsInCode) { - constantPoolCacheOop cache = (constantPoolCacheOop)obj; - // during a scavenge, it is safe to inspect my pool, since it is perm - constantPoolOop pool = cache->constant_pool(); - assert(pool->is_constantPool(), "should be constant pool"); -- if (pool->has_invokedynamic()) { -- for (int i = 0; i < cache->length(); i++) { -- ConstantPoolCacheEntry* e = cache->entry_at(i); -- oop* p = (oop*)&e->_f1; -- if (e->is_secondary_entry()) { -- if (PSScavenge::should_scavenge(p)) -- pm->claim_or_forward_depth(p); -- assert(!(e->is_vfinal() && PSScavenge::should_scavenge((oop*)&e->_f2)), -- "no live oops here"); -- } -- } -+ for (int i = 0; i < cache->length(); i++) { -+ ConstantPoolCacheEntry* e = cache->entry_at(i); -+ oop* p = (oop*)&e->_f1; -+ if (PSScavenge::should_scavenge(p)) -+ pm->claim_or_forward_depth(p); -+ assert(!(e->is_vfinal() && PSScavenge::should_scavenge((oop*)&e->_f2)), -+ "no live oops here"); - } - } - } -diff --git a/src/share/vm/oops/cpCacheOop.cpp b/src/share/vm/oops/cpCacheOop.cpp ---- openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp -@@ -133,7 +133,7 @@ - TosState field_type, - bool is_final, - bool is_volatile) { -- set_f1(field_holder()); -+ set_f1(field_holder()->java_mirror()); - set_f2(field_offset); - // The field index is used by jvm/ti and is the index into fields() array - // in holder instanceKlass. This is scaled by instanceKlass::next_offset. -diff --git a/src/share/vm/oops/instanceKlass.cpp b/src/share/vm/oops/instanceKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -@@ -37,6 +37,7 @@ - #include "memory/oopFactory.hpp" - #include "memory/permGen.hpp" - #include "oops/instanceKlass.hpp" -+#include "oops/instanceMirrorKlass.hpp" - #include "oops/instanceOop.hpp" - #include "oops/methodOop.hpp" - #include "oops/objArrayKlassKlass.hpp" -@@ -649,6 +650,7 @@ - } - - instanceOop instanceKlass::allocate_instance(TRAPS) { -+ assert(!oop_is_instanceMirror(), "wrong allocation path"); - bool has_finalizer_flag = has_finalizer(); // Query before possible GC - int size = size_helper(); // Query before forming handle. - -@@ -669,6 +671,7 @@ - // instances so simply disallow finalizable perm objects. This can - // be relaxed if a need for it is found. - assert(!has_finalizer(), "perm objects not allowed to have finalizers"); -+ assert(!oop_is_instanceMirror(), "wrong allocation path"); - int size = size_helper(); // Query before forming handle. - KlassHandle h_k(THREAD, as_klassOop()); - instanceOop i = (instanceOop) -@@ -891,6 +894,7 @@ - } - } - -+ - void instanceKlass::do_local_static_fields(FieldClosure* cl) { - fieldDescriptor fd; - int length = fields()->length(); -@@ -1602,36 +1606,6 @@ - // The following macros call specialized macros, passing either oop or - // narrowOop as the specialization type. These test the UseCompressedOops - // flag. --#define InstanceKlass_OOP_ITERATE(start_p, count, \ -- do_oop, assert_fn) \ --{ \ -- if (UseCompressedOops) { \ -- InstanceKlass_SPECIALIZED_OOP_ITERATE(narrowOop, \ -- start_p, count, \ -- do_oop, assert_fn) \ -- } else { \ -- InstanceKlass_SPECIALIZED_OOP_ITERATE(oop, \ -- start_p, count, \ -- do_oop, assert_fn) \ -- } \ --} -- --#define InstanceKlass_BOUNDED_OOP_ITERATE(start_p, count, low, high, \ -- do_oop, assert_fn) \ --{ \ -- if (UseCompressedOops) { \ -- InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(narrowOop, \ -- start_p, count, \ -- low, high, \ -- do_oop, assert_fn) \ -- } else { \ -- InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(oop, \ -- start_p, count, \ -- low, high, \ -- do_oop, assert_fn) \ -- } \ --} -- - #define InstanceKlass_OOP_MAP_ITERATE(obj, do_oop, assert_fn) \ - { \ - /* Compute oopmap block range. The common case \ -@@ -1704,46 +1678,6 @@ - } \ - } - --void instanceKlass::follow_static_fields() { -- InstanceKlass_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- MarkSweep::mark_and_push(p), \ -- assert_is_in_closed_subset) --} -- --#ifndef SERIALGC --void instanceKlass::follow_static_fields(ParCompactionManager* cm) { -- InstanceKlass_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- PSParallelCompact::mark_and_push(cm, p), \ -- assert_is_in) --} --#endif // SERIALGC -- --void instanceKlass::adjust_static_fields() { -- InstanceKlass_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- MarkSweep::adjust_pointer(p), \ -- assert_nothing) --} -- --#ifndef SERIALGC --void instanceKlass::update_static_fields() { -- InstanceKlass_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- PSParallelCompact::adjust_pointer(p), \ -- assert_nothing) --} -- --void instanceKlass::update_static_fields(HeapWord* beg_addr, HeapWord* end_addr) { -- InstanceKlass_BOUNDED_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- beg_addr, end_addr, \ -- PSParallelCompact::adjust_pointer(p), \ -- assert_nothing ) --} --#endif // SERIALGC -- - void instanceKlass::oop_follow_contents(oop obj) { - assert(obj != NULL, "can't follow the content of NULL object"); - obj->follow_header(); -@@ -1830,22 +1764,6 @@ - ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN) - #endif // !SERIALGC - --void instanceKlass::iterate_static_fields(OopClosure* closure) { -- InstanceKlass_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- closure->do_oop(p), \ -- assert_is_in_reserved) --} -- --void instanceKlass::iterate_static_fields(OopClosure* closure, -- MemRegion mr) { -- InstanceKlass_BOUNDED_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- mr.start(), mr.end(), \ -- (closure)->do_oop_v(p), \ -- assert_is_in_closed_subset) --} -- - int instanceKlass::oop_adjust_pointers(oop obj) { - int size = size_helper(); - InstanceKlass_OOP_MAP_ITERATE( \ -@@ -1883,21 +1801,6 @@ - return size_helper(); - } - --void instanceKlass::push_static_fields(PSPromotionManager* pm) { -- InstanceKlass_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- if (PSScavenge::should_scavenge(p)) { \ -- pm->claim_or_forward_depth(p); \ -- }, \ -- assert_nothing ) --} -- --void instanceKlass::copy_static_fields(ParCompactionManager* cm) { -- InstanceKlass_OOP_ITERATE( \ -- start_of_static_fields(), static_oop_field_size(), \ -- PSParallelCompact::adjust_pointer(p), \ -- assert_is_in) --} - #endif // SERIALGC - - // This klass is alive but the implementor link is not followed/updated. -@@ -1992,6 +1895,11 @@ - } - } - -+address instanceKlass::static_field_addr(int offset) { -+ return (address)(offset + instanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror()); -+} -+ -+ - const char* instanceKlass::signature_name() const { - const char* src = (const char*) (name()->as_C_string()); - const int src_length = (int)strlen(src); -@@ -2359,7 +2267,7 @@ - - void FieldPrinter::do_field(fieldDescriptor* fd) { - _st->print(BULLET); -- if (fd->is_static() || (_obj == NULL)) { -+ if (_obj == NULL) { - fd->print_on(_st); - _st->cr(); - } else { -@@ -2389,8 +2297,8 @@ - } - - st->print_cr(BULLET"---- fields (total size %d words):", oop_size(obj)); -- FieldPrinter print_nonstatic_field(st, obj); -- do_nonstatic_fields(&print_nonstatic_field); -+ FieldPrinter print_field(st, obj); -+ do_nonstatic_fields(&print_field); - - if (as_klassOop() == SystemDictionary::Class_klass()) { - st->print(BULLET"signature: "); -@@ -2408,6 +2316,12 @@ - st->print(BULLET"fake entry for array: "); - array_klass->print_value_on(st); - st->cr(); -+ st->print_cr(BULLET"fake entry for oop_size: %d", java_lang_Class::oop_size(obj)); -+ st->print_cr(BULLET"fake entry for static_oop_field_count: %d", java_lang_Class::static_oop_field_count(obj)); -+ klassOop real_klass = java_lang_Class::as_klassOop(obj); -+ if (real_klass && real_klass->klass_part()->oop_is_instance()) { -+ instanceKlass::cast(real_klass)->do_local_static_fields(&print_field); -+ } - } else if (as_klassOop() == SystemDictionary::MethodType_klass()) { - st->print(BULLET"signature: "); - java_dyn_MethodType::print_signature(obj, st); -@@ -2550,7 +2464,7 @@ - - - void JNIid::verify(klassOop holder) { -- int first_field_offset = instanceKlass::cast(holder)->offset_of_static_fields(); -+ int first_field_offset = instanceMirrorKlass::offset_of_static_fields(); - int end_field_offset; - end_field_offset = first_field_offset + (instanceKlass::cast(holder)->static_field_size() * wordSize); - -diff --git a/src/share/vm/oops/instanceKlass.hpp b/src/share/vm/oops/instanceKlass.hpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -@@ -75,8 +75,6 @@ - // [Java vtable length ] - // [oop map cache (stack maps) ] - // [EMBEDDED Java vtable ] size in words = vtable_len --// [EMBEDDED static oop fields ] size in words = static_oop_fields_size --// [ static non-oop fields ] size in words = static_field_size - static_oop_fields_size - // [EMBEDDED nonstatic oop-map blocks] size in words = nonstatic_oop_map_size - // - // The embedded nonstatic oop-map blocks are short pairs (offset, length) indicating -@@ -226,7 +224,7 @@ - // (including inherited fields but after header_size()). - int _nonstatic_field_size; - int _static_field_size; // number words used by static fields (oop and non-oop) in this klass -- int _static_oop_field_size;// number of static oop fields in this klass -+ int _static_oop_field_count;// number of static oop fields in this klass - int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks - bool _is_marked_dependent; // used for marking during flushing and deoptimization - bool _rewritten; // methods rewritten. -@@ -277,8 +275,8 @@ - int static_field_size() const { return _static_field_size; } - void set_static_field_size(int size) { _static_field_size = size; } - -- int static_oop_field_size() const { return _static_oop_field_size; } -- void set_static_oop_field_size(int size) { _static_oop_field_size = size; } -+ int static_oop_field_count() const { return _static_oop_field_count; } -+ void set_static_oop_field_count(int size) { _static_oop_field_count = size; } - - // Java vtable - int vtable_length() const { return _vtable_len; } -@@ -651,6 +649,7 @@ - - // Casting from klassOop - static instanceKlass* cast(klassOop k) { -+ assert(k->is_klass(), "must be"); - Klass* kp = k->klass_part(); - assert(kp->null_vtbl() || kp->oop_is_instance_slow(), "cast to instanceKlass"); - return (instanceKlass*) kp; -@@ -658,7 +657,7 @@ - - // Sizing (in words) - static int header_size() { return align_object_offset(oopDesc::header_size() + sizeof(instanceKlass)/HeapWordSize); } -- int object_size() const { return object_size(align_object_offset(vtable_length()) + align_object_offset(itable_length()) + static_field_size() + nonstatic_oop_map_size()); } -+ int object_size() const { return object_size(align_object_offset(vtable_length()) + align_object_offset(itable_length()) + nonstatic_oop_map_size()); } - static int vtable_start_offset() { return header_size(); } - static int vtable_length_offset() { return oopDesc::header_size() + offset_of(instanceKlass, _vtable_len) / HeapWordSize; } - static int object_size(int extra) { return align_object_size(header_size() + extra); } -@@ -667,20 +666,12 @@ - intptr_t* start_of_itable() const { return start_of_vtable() + align_object_offset(vtable_length()); } - int itable_offset_in_words() const { return start_of_itable() - (intptr_t*)as_klassOop(); } - -- // Static field offset is an offset into the Heap, should be converted by -- // based on UseCompressedOop for traversal -- HeapWord* start_of_static_fields() const { -- return (HeapWord*)(start_of_itable() + align_object_offset(itable_length())); -- } -- - intptr_t* end_of_itable() const { return start_of_itable() + itable_length(); } - -- int offset_of_static_fields() const { -- return (intptr_t)start_of_static_fields() - (intptr_t)as_klassOop(); -- } -+ address static_field_addr(int offset); - - OopMapBlock* start_of_nonstatic_oop_maps() const { -- return (OopMapBlock*) (start_of_static_fields() + static_field_size()); -+ return (OopMapBlock*)(start_of_itable() + align_object_offset(itable_length())); - } - - // Allocation profiling support -@@ -710,8 +701,6 @@ - - // Garbage collection - void oop_follow_contents(oop obj); -- void follow_static_fields(); -- void adjust_static_fields(); - int oop_adjust_pointers(oop obj); - bool object_is_parsable() const { return _init_state != unparsable_by_gc; } - // Value of _init_state must be zero (unparsable_by_gc) when klass field is set. -@@ -723,17 +712,6 @@ - // Parallel Scavenge and Parallel Old - PARALLEL_GC_DECLS - --#ifndef SERIALGC -- // Parallel Scavenge -- void push_static_fields(PSPromotionManager* pm); -- -- // Parallel Old -- void follow_static_fields(ParCompactionManager* cm); -- void copy_static_fields(ParCompactionManager* cm); -- void update_static_fields(); -- void update_static_fields(HeapWord* beg_addr, HeapWord* end_addr); --#endif // SERIALGC -- - // Naming - const char* signature_name() const; - -@@ -762,9 +740,6 @@ - ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DECL) - #endif // !SERIALGC - -- void iterate_static_fields(OopClosure* closure); -- void iterate_static_fields(OopClosure* closure, MemRegion mr); -- - private: - // initialization state - #ifdef ASSERT -@@ -921,6 +896,10 @@ - // Identifier lookup - JNIid* find(int offset); - -+ bool find_local_field(fieldDescriptor* fd) { -+ return instanceKlass::cast(holder())->find_local_field_from_offset(offset(), true, fd); -+ } -+ - // Garbage collection support - oop* holder_addr() { return (oop*)&_holder; } - void oops_do(OopClosure* f); -diff --git a/src/share/vm/oops/instanceKlassKlass.cpp b/src/share/vm/oops/instanceKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -@@ -31,6 +31,7 @@ - #include "memory/gcLocker.hpp" - #include "oops/constantPoolOop.hpp" - #include "oops/instanceKlass.hpp" -+#include "oops/instanceMirrorKlass.hpp" - #include "oops/instanceKlassKlass.hpp" - #include "oops/instanceRefKlass.hpp" - #include "oops/objArrayKlassKlass.hpp" -@@ -86,7 +87,6 @@ - assert(klassOop(obj)->klass_part()->oop_is_instance_slow(), "must be instance klass"); - - instanceKlass* ik = instanceKlass::cast(klassOop(obj)); -- ik->follow_static_fields(); - { - HandleMark hm; - ik->vtable()->oop_follow_contents(); -@@ -130,7 +130,6 @@ - assert(klassOop(obj)->klass_part()->oop_is_instance_slow(), "must be instance klass"); - - instanceKlass* ik = instanceKlass::cast(klassOop(obj)); -- ik->follow_static_fields(cm); - ik->vtable()->oop_follow_contents(cm); - ik->itable()->oop_follow_contents(cm); - -@@ -174,7 +173,6 @@ - // Don't call size() or oop_size() since that is a virtual call. - int size = ik->object_size(); - -- ik->iterate_static_fields(blk); - ik->vtable()->oop_oop_iterate(blk); - ik->itable()->oop_oop_iterate(blk); - -@@ -218,7 +216,6 @@ - // Don't call size() or oop_size() since that is a virtual call. - int size = ik->object_size(); - -- ik->iterate_static_fields(blk, mr); - ik->vtable()->oop_oop_iterate_m(blk, mr); - ik->itable()->oop_oop_iterate_m(blk, mr); - -@@ -281,7 +278,6 @@ - assert(klassOop(obj)->klass_part()->oop_is_instance_slow(), "must be instance klass"); - - instanceKlass* ik = instanceKlass::cast(klassOop(obj)); -- ik->adjust_static_fields(); - ik->vtable()->oop_adjust_pointers(); - ik->itable()->oop_adjust_pointers(); - -@@ -318,7 +314,6 @@ - #ifndef SERIALGC - void instanceKlassKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { - instanceKlass* ik = instanceKlass::cast(klassOop(obj)); -- ik->push_static_fields(pm); - - oop* loader_addr = ik->adr_class_loader(); - if (PSScavenge::should_scavenge(loader_addr)) { -@@ -354,7 +349,6 @@ - "must be instance klass"); - - instanceKlass* ik = instanceKlass::cast(klassOop(obj)); -- ik->update_static_fields(); - ik->vtable()->oop_update_pointers(cm); - ik->itable()->oop_update_pointers(cm); - -@@ -403,22 +397,28 @@ - #endif // SERIALGC - - klassOop --instanceKlassKlass::allocate_instance_klass(int vtable_len, int itable_len, -+instanceKlassKlass::allocate_instance_klass(Symbol* name, int vtable_len, int itable_len, - int static_field_size, - unsigned nonstatic_oop_map_count, - ReferenceType rt, TRAPS) { - - const int nonstatic_oop_map_size = - instanceKlass::nonstatic_oop_map_size(nonstatic_oop_map_count); -- int size = instanceKlass::object_size(align_object_offset(vtable_len) + align_object_offset(itable_len) + static_field_size + nonstatic_oop_map_size); -+ int size = instanceKlass::object_size(align_object_offset(vtable_len) + align_object_offset(itable_len) + nonstatic_oop_map_size); - - // Allocation - KlassHandle h_this_klass(THREAD, as_klassOop()); - KlassHandle k; - if (rt == REF_NONE) { -- // regular klass -- instanceKlass o; -- k = base_create_klass(h_this_klass, size, o.vtbl_value(), CHECK_NULL); -+ if (name != vmSymbols::java_lang_Class()) { -+ // regular klass -+ instanceKlass o; -+ k = base_create_klass(h_this_klass, size, o.vtbl_value(), CHECK_NULL); -+ } else { -+ // Class -+ instanceMirrorKlass o; -+ k = base_create_klass(h_this_klass, size, o.vtbl_value(), CHECK_NULL); -+ } - } else { - // reference klass - instanceRefKlass o; -@@ -453,7 +453,7 @@ - ik->set_source_file_name(NULL); - ik->set_source_debug_extension(NULL); - ik->set_inner_classes(NULL); -- ik->set_static_oop_field_size(0); -+ ik->set_static_oop_field_count(0); - ik->set_nonstatic_field_size(0); - ik->set_is_marked_dependent(false); - ik->set_init_state(instanceKlass::allocated); -@@ -487,9 +487,6 @@ - // To get verify to work - must be set to partial loaded before first GC point. - k()->set_partially_loaded(); - } -- -- // GC can happen here -- java_lang_Class::create_mirror(k, CHECK_NULL); // Allocate mirror - return k(); - } - -@@ -611,13 +608,6 @@ - FieldPrinter print_nonstatic_field(st); - ik->do_nonstatic_fields(&print_nonstatic_field); - -- st->print(BULLET"static oop maps: "); -- if (ik->static_oop_field_size() > 0) { -- int first_offset = ik->offset_of_static_fields(); -- st->print("%d-%d", first_offset, first_offset + ik->static_oop_field_size() - 1); -- } -- st->cr(); -- - st->print(BULLET"non-static oop maps: "); - OopMapBlock* map = ik->start_of_nonstatic_oop_maps(); - OopMapBlock* end_map = map + ik->nonstatic_oop_map_count(); -@@ -675,7 +665,6 @@ - - // Verify static fields - VerifyFieldClosure blk; -- ik->iterate_static_fields(&blk); - - // Verify vtables - if (ik->is_linked()) { -diff --git a/src/share/vm/oops/instanceKlassKlass.hpp b/src/share/vm/oops/instanceKlassKlass.hpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.hpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.hpp -@@ -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 -@@ -41,7 +41,8 @@ - // Allocation - DEFINE_ALLOCATE_PERMANENT(instanceKlassKlass); - static klassOop create_klass(TRAPS); -- klassOop allocate_instance_klass(int vtable_len, -+ klassOop allocate_instance_klass(Symbol* name, -+ int vtable_len, - int itable_len, - int static_field_size, - unsigned int nonstatic_oop_map_count, -diff --git a/src/share/vm/oops/instanceMirrorKlass.cpp b/src/share/vm/oops/instanceMirrorKlass.cpp -new file mode 100644 ---- /dev/null -+++ openjdk/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp -@@ -0,0 +1,313 @@ -+/* -+ * 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. -+ * -+ */ -+ -+#include "precompiled.hpp" -+#include "classfile/javaClasses.hpp" -+#include "classfile/systemDictionary.hpp" -+#include "gc_implementation/shared/markSweep.inline.hpp" -+#include "gc_interface/collectedHeap.inline.hpp" -+#include "memory/genOopClosures.inline.hpp" -+#include "memory/oopFactory.hpp" -+#include "memory/permGen.hpp" -+#include "oops/instanceKlass.hpp" -+#include "oops/instanceMirrorKlass.hpp" -+#include "oops/instanceOop.hpp" -+#include "oops/oop.inline.hpp" -+#include "oops/symbol.hpp" -+#include "runtime/handles.inline.hpp" -+#ifndef SERIALGC -+#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -+#include "gc_implementation/g1/g1OopClosures.inline.hpp" -+#include "gc_implementation/g1/g1RemSet.inline.hpp" -+#include "gc_implementation/g1/heapRegionSeq.inline.hpp" -+#include "gc_implementation/parNew/parOopClosures.inline.hpp" -+#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" -+#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" -+#include "oops/oop.pcgc.inline.hpp" -+#endif -+ -+int instanceMirrorKlass::_offset_of_static_fields = 0; -+ -+#ifdef ASSERT -+template <class T> void assert_is_in(T *p) { -+ T heap_oop = oopDesc::load_heap_oop(p); -+ if (!oopDesc::is_null(heap_oop)) { -+ oop o = oopDesc::decode_heap_oop_not_null(heap_oop); -+ assert(Universe::heap()->is_in(o), "should be in heap"); -+ } -+} -+template <class T> void assert_is_in_closed_subset(T *p) { -+ T heap_oop = oopDesc::load_heap_oop(p); -+ if (!oopDesc::is_null(heap_oop)) { -+ oop o = oopDesc::decode_heap_oop_not_null(heap_oop); -+ assert(Universe::heap()->is_in_closed_subset(o), "should be in closed"); -+ } -+} -+template <class T> void assert_is_in_reserved(T *p) { -+ T heap_oop = oopDesc::load_heap_oop(p); -+ if (!oopDesc::is_null(heap_oop)) { -+ oop o = oopDesc::decode_heap_oop_not_null(heap_oop); -+ assert(Universe::heap()->is_in_reserved(o), "should be in reserved"); -+ } -+} -+template <class T> void assert_nothing(T *p) {} -+ -+#else -+template <class T> void assert_is_in(T *p) {} -+template <class T> void assert_is_in_closed_subset(T *p) {} -+template <class T> void assert_is_in_reserved(T *p) {} -+template <class T> void assert_nothing(T *p) {} -+#endif // ASSERT -+ -+#define InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE( \ -+ T, start_p, count, do_oop, \ -+ assert_fn) \ -+{ \ -+ T* p = (T*)(start_p); \ -+ T* const end = p + (count); \ -+ while (p < end) { \ -+ (assert_fn)(p); \ -+ do_oop; \ -+ ++p; \ -+ } \ -+} -+ -+#define InstanceMirrorKlass_SPECIALIZED_BOUNDED_OOP_ITERATE( \ -+ T, start_p, count, low, high, \ -+ do_oop, assert_fn) \ -+{ \ -+ T* const l = (T*)(low); \ -+ T* const h = (T*)(high); \ -+ assert(mask_bits((intptr_t)l, sizeof(T)-1) == 0 && \ -+ mask_bits((intptr_t)h, sizeof(T)-1) == 0, \ -+ "bounded region must be properly aligned"); \ -+ T* p = (T*)(start_p); \ -+ T* end = p + (count); \ -+ if (p < l) p = l; \ -+ if (end > h) end = h; \ -+ while (p < end) { \ -+ (assert_fn)(p); \ -+ do_oop; \ -+ ++p; \ -+ } \ -+} -+ -+ -+#define InstanceMirrorKlass_OOP_ITERATE(start_p, count, \ -+ do_oop, assert_fn) \ -+{ \ -+ if (UseCompressedOops) { \ -+ InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE(narrowOop, \ -+ start_p, count, \ -+ do_oop, assert_fn) \ -+ } else { \ -+ InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE(oop, \ -+ start_p, count, \ -+ do_oop, assert_fn) \ -+ } \ -+} -+ -+// The following macros call specialized macros, passing either oop or -+// narrowOop as the specialization type. These test the UseCompressedOops -+// flag. -+#define InstanceMirrorKlass_BOUNDED_OOP_ITERATE(start_p, count, low, high, \ -+ do_oop, assert_fn) \ -+{ \ -+ if (UseCompressedOops) { \ -+ InstanceMirrorKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(narrowOop, \ -+ start_p, count, \ -+ low, high, \ -+ do_oop, assert_fn) \ -+ } else { \ -+ InstanceMirrorKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(oop, \ -+ start_p, count, \ -+ low, high, \ -+ do_oop, assert_fn) \ -+ } \ -+} -+ -+ -+void instanceMirrorKlass::oop_follow_contents(oop obj) { -+ instanceKlass::oop_follow_contents(obj); -+ InstanceMirrorKlass_OOP_ITERATE( \ -+ start_of_static_fields(obj), java_lang_Class::static_oop_field_count(obj), \ -+ MarkSweep::mark_and_push(p), \ -+ assert_is_in_closed_subset) -+} -+ -+#ifndef SERIALGC -+void instanceMirrorKlass::oop_follow_contents(ParCompactionManager* cm, -+ oop obj) { -+ instanceKlass::oop_follow_contents(cm, obj); -+ InstanceMirrorKlass_OOP_ITERATE( \ -+ start_of_static_fields(obj), java_lang_Class::static_oop_field_count(obj), \ -+ PSParallelCompact::mark_and_push(cm, p), \ -+ assert_is_in) -+} -+#endif // SERIALGC -+ -+int instanceMirrorKlass::oop_adjust_pointers(oop obj) { -+ int size = oop_size(obj); -+ instanceKlass::oop_adjust_pointers(obj); -+ InstanceMirrorKlass_OOP_ITERATE( \ -+ start_of_static_fields(obj), java_lang_Class::static_oop_field_count(obj), \ -+ MarkSweep::adjust_pointer(p), \ -+ assert_nothing) -+ return size; -+} -+ -+#define InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE_DEFN(T, nv_suffix) \ -+ InstanceMirrorKlass_OOP_ITERATE( \ -+ start_of_static_fields(obj), java_lang_Class::static_oop_field_count(obj), \ -+ (closure)->do_oop##nv_suffix(p), \ -+ assert_is_in_closed_subset) \ -+ return oop_size(obj); \ -+ -+#define InstanceMirrorKlass_BOUNDED_SPECIALIZED_OOP_ITERATE(T, nv_suffix, mr) \ -+ InstanceMirrorKlass_BOUNDED_OOP_ITERATE( \ -+ start_of_static_fields(obj), java_lang_Class::static_oop_field_count(obj), \ -+ mr.start(), mr.end(), \ -+ (closure)->do_oop##nv_suffix(p), \ -+ assert_is_in_closed_subset) \ -+ return oop_size(obj); \ -+ -+ -+// Macro to define instanceMirrorKlass::oop_oop_iterate for virtual/nonvirtual for -+// all closures. Macros calling macros above for each oop size. -+ -+#define InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \ -+ \ -+int instanceMirrorKlass:: \ -+oop_oop_iterate##nv_suffix(oop obj, OopClosureType* closure) { \ -+ /* Get size before changing pointers */ \ -+ SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk); \ -+ \ -+ instanceKlass::oop_oop_iterate##nv_suffix(obj, closure); \ -+ \ -+ if (UseCompressedOops) { \ -+ InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE_DEFN(narrowOop, nv_suffix); \ -+ } else { \ -+ InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE_DEFN(oop, nv_suffix); \ -+ } \ -+} -+ -+#ifndef SERIALGC -+#define InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \ -+ \ -+int instanceMirrorKlass:: \ -+oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* closure) { \ -+ /* Get size before changing pointers */ \ -+ SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk); \ -+ \ -+ instanceKlass::oop_oop_iterate_backwards##nv_suffix(obj, closure); \ -+ \ -+ if (UseCompressedOops) { \ -+ InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE_DEFN(narrowOop, nv_suffix); \ -+ } else { \ -+ InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE_DEFN(oop, nv_suffix); \ -+ } \ -+} -+#endif // !SERIALGC -+ -+ -+#define InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \ -+ \ -+int instanceMirrorKlass:: \ -+oop_oop_iterate##nv_suffix##_m(oop obj, \ -+ OopClosureType* closure, \ -+ MemRegion mr) { \ -+ SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk); \ -+ \ -+ instanceKlass::oop_oop_iterate##nv_suffix##_m(obj, closure, mr); \ -+ if (UseCompressedOops) { \ -+ InstanceMirrorKlass_BOUNDED_SPECIALIZED_OOP_ITERATE(narrowOop, nv_suffix, mr); \ -+ } else { \ -+ InstanceMirrorKlass_BOUNDED_SPECIALIZED_OOP_ITERATE(oop, nv_suffix, mr); \ -+ } \ -+} -+ -+ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN) -+ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN) -+#ifndef SERIALGC -+ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN) -+ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN) -+#endif // SERIALGC -+ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m) -+ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m) -+ -+#ifndef SERIALGC -+void instanceMirrorKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { -+ instanceKlass::oop_push_contents(pm, obj); -+ InstanceMirrorKlass_OOP_ITERATE( \ -+ start_of_static_fields(obj), java_lang_Class::static_oop_field_count(obj),\ -+ if (PSScavenge::should_scavenge(p)) { \ -+ pm->claim_or_forward_depth(p); \ -+ }, \ -+ assert_nothing ) -+} -+ -+int instanceMirrorKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { -+ instanceKlass::oop_update_pointers(cm, obj); -+ InstanceMirrorKlass_OOP_ITERATE( \ -+ start_of_static_fields(obj), java_lang_Class::static_oop_field_count(obj),\ -+ PSParallelCompact::adjust_pointer(p), \ -+ assert_nothing) -+ return oop_size(obj); -+} -+#endif // SERIALGC -+ -+int instanceMirrorKlass::instance_size(KlassHandle k) { -+ if (k() != NULL && k->oop_is_instance()) { -+ return align_object_size(size_helper() + instanceKlass::cast(k())->static_field_size()); -+ } -+ return size_helper(); -+} -+ -+instanceOop instanceMirrorKlass::allocate_instance(KlassHandle k, TRAPS) { -+ // Query before forming handle. -+ int size = instance_size(k); -+ KlassHandle h_k(THREAD, as_klassOop()); -+ instanceOop i; -+ -+ if (JavaObjectsInPerm) { -+ i = (instanceOop) CollectedHeap::permanent_obj_allocate(h_k, size, CHECK_NULL); -+ } else { -+ assert(ScavengeRootsInCode > 0, "must be"); -+ i = (instanceOop) CollectedHeap::obj_allocate(h_k, size, CHECK_NULL); -+ } -+ -+ return i; -+} -+ -+int instanceMirrorKlass::oop_size(oop obj) const { -+ return java_lang_Class::oop_size(obj); -+} -+ -+int instanceMirrorKlass::compute_static_oop_field_count(oop obj) { -+ klassOop k = java_lang_Class::as_klassOop(obj); -+ if (k != NULL && k->klass_part()->oop_is_instance()) { -+ return instanceKlass::cast(k)->static_oop_field_count(); -+ } -+ return 0; -+} -diff --git a/src/share/vm/oops/instanceMirrorKlass.hpp b/src/share/vm/oops/instanceMirrorKlass.hpp -new file mode 100644 ---- /dev/null -+++ openjdk/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp -@@ -0,0 +1,110 @@ -+/* -+ * 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. -+ * -+ */ -+ -+#ifndef SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP -+#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP -+ -+#include "oops/instanceKlass.hpp" -+ -+// An instanceMirrorKlass is a specialized instanceKlass for -+// java.lang.Class instances. These instances are special because -+// they contain the static fields of the class in addition to the -+// normal fields of Class. This means they are variable sized -+// instances and need special logic for computing their size and for -+// iteration of their oops. -+ -+ -+class instanceMirrorKlass: public instanceKlass { -+ private: -+ static int _offset_of_static_fields; -+ -+ public: -+ // Type testing -+ bool oop_is_instanceMirror() const { return true; } -+ -+ // Casting from klassOop -+ static instanceMirrorKlass* cast(klassOop k) { -+ assert(k->klass_part()->oop_is_instanceMirror(), "cast to instanceMirrorKlass"); -+ return (instanceMirrorKlass*) k->klass_part(); -+ } -+ -+ // Returns the size of the instance including the extra static fields. -+ virtual int oop_size(oop obj) const; -+ -+ // Static field offset is an offset into the Heap, should be converted by -+ // based on UseCompressedOop for traversal -+ static HeapWord* start_of_static_fields(oop obj) { -+ return (HeapWord*)((intptr_t)obj + offset_of_static_fields()); -+ } -+ -+ static void init_offset_of_static_fields() { -+ // Cache the offset of the static fields in the Class instance -+ assert(_offset_of_static_fields == 0, "once"); -+ _offset_of_static_fields = instanceMirrorKlass::cast(SystemDictionary::Class_klass())->size_helper() << LogHeapWordSize; -+ } -+ -+ static int offset_of_static_fields() { -+ return _offset_of_static_fields; -+ } -+ -+ int compute_static_oop_field_count(oop obj); -+ -+ // Given a Klass return the size of the instance -+ int instance_size(KlassHandle k); -+ -+ // allocation -+ DEFINE_ALLOCATE_PERMANENT(instanceMirrorKlass); -+ instanceOop allocate_instance(KlassHandle k, TRAPS); -+ -+ // Garbage collection -+ int oop_adjust_pointers(oop obj); -+ void oop_follow_contents(oop obj); -+ -+ // Parallel Scavenge and Parallel Old -+ PARALLEL_GC_DECLS -+ -+ int oop_oop_iterate(oop obj, OopClosure* blk) { -+ return oop_oop_iterate_v(obj, blk); -+ } -+ int oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) { -+ return oop_oop_iterate_v_m(obj, blk, mr); -+ } -+ -+#define InstanceMirrorKlass_OOP_OOP_ITERATE_DECL(OopClosureType, nv_suffix) \ -+ int oop_oop_iterate##nv_suffix(oop obj, OopClosureType* blk); \ -+ int oop_oop_iterate##nv_suffix##_m(oop obj, OopClosureType* blk, MemRegion mr); -+ -+ ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DECL) -+ ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DECL) -+ -+#ifndef SERIALGC -+#define InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \ -+ int oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* blk); -+ -+ ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DECL) -+ ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DECL) -+#endif // !SERIALGC -+}; -+ -+#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP -diff --git a/src/share/vm/oops/klass.hpp b/src/share/vm/oops/klass.hpp ---- openjdk/hotspot/src/share/vm/oops/klass.hpp -+++ openjdk/hotspot/src/share/vm/oops/klass.hpp -@@ -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 -@@ -576,6 +576,7 @@ - public: - // type testing operations - virtual bool oop_is_instance_slow() const { return false; } -+ virtual bool oop_is_instanceMirror() const { return false; } - virtual bool oop_is_instanceRef() const { return false; } - virtual bool oop_is_array() const { return false; } - virtual bool oop_is_objArray_slow() const { return false; } -@@ -811,4 +812,8 @@ - #endif - }; - -+ -+inline oop klassOopDesc::java_mirror() const { return klass_part()->java_mirror(); } -+ -+ - #endif // SHARE_VM_OOPS_KLASS_HPP -diff --git a/src/share/vm/oops/klassKlass.cpp b/src/share/vm/oops/klassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/klassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/klassKlass.cpp -@@ -42,6 +42,10 @@ - #include "oops/typeArrayKlass.hpp" - #include "runtime/handles.inline.hpp" - #ifndef SERIALGC -+#include "gc_implementation/parNew/parOopClosures.inline.hpp" -+#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" -+#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" -+#include "memory/cardTableRS.hpp" - #include "oops/oop.pcgc.inline.hpp" - #endif - -@@ -182,6 +186,12 @@ - - #ifndef SERIALGC - void klassKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { -+ Klass* k = Klass::cast(klassOop(obj)); -+ -+ oop* p = k->adr_java_mirror(); -+ if (PSScavenge::should_scavenge(p)) { -+ pm->claim_or_forward_depth(p); -+ } - } - - int klassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { -@@ -253,7 +263,7 @@ - - if (k->java_mirror() != NULL || (k->oop_is_instance() && instanceKlass::cast(klassOop(obj))->is_loaded())) { - guarantee(k->java_mirror() != NULL, "should be allocated"); -- guarantee(k->java_mirror()->is_perm(), "should be in permspace"); -+ guarantee(k->java_mirror()->is_perm() || !JavaObjectsInPerm, "should be in permspace"); - guarantee(k->java_mirror()->is_instance(), "should be instance"); - } - if (k->name() != NULL) { -diff --git a/src/share/vm/oops/klassOop.hpp b/src/share/vm/oops/klassOop.hpp ---- openjdk/hotspot/src/share/vm/oops/klassOop.hpp -+++ openjdk/hotspot/src/share/vm/oops/klassOop.hpp -@@ -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 -@@ -45,7 +45,73 @@ - static int klass_part_offset_in_bytes() { return sizeof(klassOopDesc); } - - // returns the Klass part containing dispatching behavior -- Klass* klass_part() { return (Klass*)((address)this + klass_part_offset_in_bytes()); } -+ Klass* klass_part() const { return (Klass*)((address)this + klass_part_offset_in_bytes()); } -+ -+ // Convenience wrapper -+ inline oop java_mirror() const; -+ -+ private: -+ // These have no implementation since klassOop should never be accessed in this fashion -+ oop obj_field(int offset) const; -+ void obj_field_put(int offset, oop value); -+ void obj_field_raw_put(int offset, oop value); -+ -+ jbyte byte_field(int offset) const; -+ void byte_field_put(int offset, jbyte contents); -+ -+ jchar char_field(int offset) const; -+ void char_field_put(int offset, jchar contents); -+ -+ jboolean bool_field(int offset) const; -+ void bool_field_put(int offset, jboolean contents); -+ -+ jint int_field(int offset) const; -+ void int_field_put(int offset, jint contents); -+ -+ jshort short_field(int offset) const; -+ void short_field_put(int offset, jshort contents); -+ -+ jlong long_field(int offset) const; -+ void long_field_put(int offset, jlong contents); -+ -+ jfloat float_field(int offset) const; -+ void float_field_put(int offset, jfloat contents); -+ -+ jdouble double_field(int offset) const; -+ void double_field_put(int offset, jdouble contents); -+ -+ address address_field(int offset) const; -+ void address_field_put(int offset, address contents); -+ -+ oop obj_field_acquire(int offset) const; -+ void release_obj_field_put(int offset, oop value); -+ -+ jbyte byte_field_acquire(int offset) const; -+ void release_byte_field_put(int offset, jbyte contents); -+ -+ jchar char_field_acquire(int offset) const; -+ void release_char_field_put(int offset, jchar contents); -+ -+ jboolean bool_field_acquire(int offset) const; -+ void release_bool_field_put(int offset, jboolean contents); -+ -+ jint int_field_acquire(int offset) const; -+ void release_int_field_put(int offset, jint contents); -+ -+ jshort short_field_acquire(int offset) const; -+ void release_short_field_put(int offset, jshort contents); -+ -+ jlong long_field_acquire(int offset) const; -+ void release_long_field_put(int offset, jlong contents); -+ -+ jfloat float_field_acquire(int offset) const; -+ void release_float_field_put(int offset, jfloat contents); -+ -+ jdouble double_field_acquire(int offset) const; -+ void release_double_field_put(int offset, jdouble contents); -+ -+ address address_field_acquire(int offset) const; -+ void release_address_field_put(int offset, address contents); - }; - - #endif // SHARE_VM_OOPS_KLASSOOP_HPP -diff --git a/src/share/vm/oops/klassVtable.cpp b/src/share/vm/oops/klassVtable.cpp ---- openjdk/hotspot/src/share/vm/oops/klassVtable.cpp -+++ openjdk/hotspot/src/share/vm/oops/klassVtable.cpp -@@ -1134,7 +1134,7 @@ - itableOffsetEntry* ioe = (itableOffsetEntry*)klass->start_of_itable(); - itableMethodEntry* ime = (itableMethodEntry*)(ioe + nof_interfaces); - intptr_t* end = klass->end_of_itable(); -- assert((oop*)(ime + nof_methods) <= (oop*)klass->start_of_static_fields(), "wrong offset calculation (1)"); -+ assert((oop*)(ime + nof_methods) <= (oop*)klass->start_of_nonstatic_oop_maps(), "wrong offset calculation (1)"); - assert((oop*)(end) == (oop*)(ime + nof_methods), "wrong offset calculation (2)"); - - // Visit all interfaces and initialize itable offset table -diff --git a/src/share/vm/oops/objArrayKlassKlass.cpp b/src/share/vm/oops/objArrayKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp -@@ -31,6 +31,13 @@ - #include "oops/objArrayKlassKlass.hpp" - #include "oops/oop.inline.hpp" - #include "oops/oop.inline2.hpp" -+#ifndef SERIALGC -+#include "gc_implementation/parNew/parOopClosures.inline.hpp" -+#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" -+#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" -+#include "memory/cardTableRS.hpp" -+#include "oops/oop.pcgc.inline.hpp" -+#endif - - klassOop objArrayKlassKlass::create_klass(TRAPS) { - objArrayKlassKlass o; -@@ -232,12 +239,23 @@ - addr = oak->bottom_klass_addr(); - if (mr.contains(addr)) blk->do_oop(addr); - -- return arrayKlassKlass::oop_oop_iterate(obj, blk); -+ return arrayKlassKlass::oop_oop_iterate_m(obj, blk, mr); - } - - #ifndef SERIALGC - void objArrayKlassKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { - assert(obj->blueprint()->oop_is_objArrayKlass(),"must be an obj array klass"); -+ objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); -+ oop* p = oak->element_klass_addr(); -+ if (PSScavenge::should_scavenge(p)) { -+ pm->claim_or_forward_depth(p); -+ } -+ p = oak->bottom_klass_addr(); -+ if (PSScavenge::should_scavenge(p)) { -+ pm->claim_or_forward_depth(p); -+ } -+ -+ arrayKlassKlass::oop_push_contents(pm, obj); - } - - int objArrayKlassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { -@@ -299,7 +317,7 @@ - // Verification - - void objArrayKlassKlass::oop_verify_on(oop obj, outputStream* st) { -- klassKlass::oop_verify_on(obj, st); -+ arrayKlassKlass::oop_verify_on(obj, st); - objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); - guarantee(oak->element_klass()->is_perm(), "should be in permspace"); - guarantee(oak->element_klass()->is_klass(), "should be klass"); -diff --git a/src/share/vm/oops/oop.hpp b/src/share/vm/oops/oop.hpp ---- openjdk/hotspot/src/share/vm/oops/oop.hpp -+++ openjdk/hotspot/src/share/vm/oops/oop.hpp -@@ -124,6 +124,7 @@ - - // type test operations (inlined in oop.inline.h) - bool is_instance() const; -+ bool is_instanceMirror() const; - bool is_instanceRef() const; - bool is_array() const; - bool is_objArray() const; -diff --git a/src/share/vm/oops/oop.inline.hpp b/src/share/vm/oops/oop.inline.hpp ---- openjdk/hotspot/src/share/vm/oops/oop.inline.hpp -+++ openjdk/hotspot/src/share/vm/oops/oop.inline.hpp -@@ -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 -@@ -135,6 +135,7 @@ - inline bool oopDesc::is_a(klassOop k) const { return blueprint()->is_subtype_of(k); } - - inline bool oopDesc::is_instance() const { return blueprint()->oop_is_instance(); } -+inline bool oopDesc::is_instanceMirror() const { return blueprint()->oop_is_instanceMirror(); } - inline bool oopDesc::is_instanceRef() const { return blueprint()->oop_is_instanceRef(); } - inline bool oopDesc::is_array() const { return blueprint()->oop_is_array(); } - inline bool oopDesc::is_objArray() const { return blueprint()->oop_is_objArray(); } -@@ -394,7 +395,7 @@ - - inline int oopDesc::size_given_klass(Klass* klass) { - int lh = klass->layout_helper(); -- int s = lh >> LogHeapWordSize; // deliver size scaled by wordSize -+ int s; - - // lh is now a value computed at class initialization that may hint - // at the size. For instances, this is positive and equal to the -@@ -407,7 +408,13 @@ - // alive or dead. So the speed here is equal in importance to the - // speed of allocation. - -- if (lh <= Klass::_lh_neutral_value) { -+ if (lh > Klass::_lh_neutral_value) { -+ if (!Klass::layout_helper_needs_slow_path(lh)) { -+ s = lh >> LogHeapWordSize; // deliver size scaled by wordSize -+ } else { -+ s = klass->oop_size(this); -+ } -+ } else if (lh <= Klass::_lh_neutral_value) { - // The most common case is instances; fall through if so. - if (lh < Klass::_lh_neutral_value) { - // Second most common case is arrays. We have to fetch the -diff --git a/src/share/vm/oops/oopsHierarchy.hpp b/src/share/vm/oops/oopsHierarchy.hpp ---- openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp -+++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp -@@ -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 -@@ -176,6 +176,7 @@ - - class Klass; - class instanceKlass; -+class instanceMirrorKlass; - class instanceRefKlass; - class methodKlass; - class constMethodKlass; -diff --git a/src/share/vm/opto/compile.cpp b/src/share/vm/opto/compile.cpp ---- openjdk/hotspot/src/share/vm/opto/compile.cpp -+++ openjdk/hotspot/src/share/vm/opto/compile.cpp -@@ -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 -@@ -1196,11 +1196,15 @@ - // Oop pointers need some flattening - const TypeInstPtr *to = tj->isa_instptr(); - if( to && _AliasLevel >= 2 && to != TypeOopPtr::BOTTOM ) { -+ ciInstanceKlass *k = to->klass()->as_instance_klass(); - if( ptr == TypePtr::Constant ) { -- // No constant oop pointers (such as Strings); they alias with -- // unknown strings. -- assert(!is_known_inst, "not scalarizable allocation"); -- tj = to = TypeInstPtr::make(TypePtr::BotPTR,to->klass(),false,0,offset); -+ if (to->klass() != ciEnv::current()->Class_klass() || -+ offset < k->size_helper() * wordSize) { -+ // No constant oop pointers (such as Strings); they alias with -+ // unknown strings. -+ assert(!is_known_inst, "not scalarizable allocation"); -+ tj = to = TypeInstPtr::make(TypePtr::BotPTR,to->klass(),false,0,offset); -+ } - } else if( is_known_inst ) { - tj = to; // Keep NotNull and klass_is_exact for instance type - } else if( ptr == TypePtr::NotNull || to->klass_is_exact() ) { -@@ -1210,7 +1214,6 @@ - tj = to = TypeInstPtr::make(TypePtr::BotPTR,to->klass(),false,0,offset); - } - // Canonicalize the holder of this field -- ciInstanceKlass *k = to->klass()->as_instance_klass(); - if (offset >= 0 && offset < instanceOopDesc::base_offset_in_bytes()) { - // First handle header references such as a LoadKlassNode, even if the - // object's klass is unloaded at compile time (4965979). -@@ -1218,9 +1221,13 @@ - tj = to = TypeInstPtr::make(TypePtr::BotPTR, env()->Object_klass(), false, NULL, offset); - } - } else if (offset < 0 || offset >= k->size_helper() * wordSize) { -- to = NULL; -- tj = TypeOopPtr::BOTTOM; -- offset = tj->offset(); -+ // Static fields are in the space above the normal instance -+ // fields in the java.lang.Class instance. -+ if (to->klass() != ciEnv::current()->Class_klass()) { -+ to = NULL; -+ tj = TypeOopPtr::BOTTOM; -+ offset = tj->offset(); -+ } - } else { - ciInstanceKlass *canonical_holder = k->get_canonical_holder(offset); - if (!k->equals(canonical_holder) || tj->offset() != offset) { -@@ -1393,7 +1400,7 @@ - - - //--------------------------------find_alias_type------------------------------ --Compile::AliasType* Compile::find_alias_type(const TypePtr* adr_type, bool no_create) { -+Compile::AliasType* Compile::find_alias_type(const TypePtr* adr_type, bool no_create, ciField* original_field) { - if (_AliasLevel == 0) - return alias_type(AliasIdxBot); - -@@ -1458,22 +1465,28 @@ - // but the base pointer type is not distinctive enough to identify - // references into JavaThread.) - -- // Check for final instance fields. -+ // Check for final fields. - const TypeInstPtr* tinst = flat->isa_instptr(); - if (tinst && tinst->offset() >= instanceOopDesc::base_offset_in_bytes()) { -- ciInstanceKlass *k = tinst->klass()->as_instance_klass(); -- ciField* field = k->get_field_by_offset(tinst->offset(), false); -+ ciField* field; -+ if (tinst->const_oop() != NULL && -+ tinst->klass() == ciEnv::current()->Class_klass() && -+ tinst->offset() >= (tinst->klass()->as_instance_klass()->size_helper() * wordSize)) { -+ // static field -+ ciInstanceKlass* k = tinst->const_oop()->as_instance()->java_lang_Class_klass()->as_instance_klass(); -+ field = k->get_field_by_offset(tinst->offset(), true); -+ } else { -+ ciInstanceKlass *k = tinst->klass()->as_instance_klass(); -+ field = k->get_field_by_offset(tinst->offset(), false); -+ } -+ assert(field == NULL || -+ original_field == NULL || -+ (field->holder() == original_field->holder() && -+ field->offset() == original_field->offset() && -+ field->is_static() == original_field->is_static()), "wrong field?"); - // Set field() and is_rewritable() attributes. - if (field != NULL) alias_type(idx)->set_field(field); - } -- const TypeKlassPtr* tklass = flat->isa_klassptr(); -- // Check for final static fields. -- if (tklass && tklass->klass()->is_instance_klass()) { -- ciInstanceKlass *k = tklass->klass()->as_instance_klass(); -- ciField* field = k->get_field_by_offset(tklass->offset(), true); -- // Set field() and is_rewritable() attributes. -- if (field != NULL) alias_type(idx)->set_field(field); -- } - } - - // Fill the cache for next time. -@@ -1496,10 +1509,10 @@ - Compile::AliasType* Compile::alias_type(ciField* field) { - const TypeOopPtr* t; - if (field->is_static()) -- t = TypeKlassPtr::make(field->holder()); -+ t = TypeInstPtr::make(field->holder()->java_mirror()); - else - t = TypeOopPtr::make_from_klass_raw(field->holder()); -- AliasType* atp = alias_type(t->add_offset(field->offset_in_bytes())); -+ AliasType* atp = alias_type(t->add_offset(field->offset_in_bytes()), field); - assert(field->is_final() == !atp->is_rewritable(), "must get the rewritable bits correct"); - return atp; - } -@@ -1516,7 +1529,7 @@ - if (adr_type == NULL) return true; - if (adr_type == TypePtr::BOTTOM) return true; - -- return find_alias_type(adr_type, true) != NULL; -+ return find_alias_type(adr_type, true, NULL) != NULL; - } - - //-----------------------------must_alias-------------------------------------- -diff --git a/src/share/vm/opto/compile.hpp b/src/share/vm/opto/compile.hpp ---- openjdk/hotspot/src/share/vm/opto/compile.hpp -+++ openjdk/hotspot/src/share/vm/opto/compile.hpp -@@ -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 -@@ -596,7 +596,7 @@ - } - - AliasType* alias_type(int idx) { assert(idx < num_alias_types(), "oob"); return _alias_types[idx]; } -- AliasType* alias_type(const TypePtr* adr_type) { return find_alias_type(adr_type, false); } -+ AliasType* alias_type(const TypePtr* adr_type, ciField* field = NULL) { return find_alias_type(adr_type, false, field); } - bool have_alias_type(const TypePtr* adr_type); - AliasType* alias_type(ciField* field); - -@@ -835,7 +835,7 @@ - void grow_alias_types(); - AliasCacheEntry* probe_alias_cache(const TypePtr* adr_type); - const TypePtr *flatten_alias_type(const TypePtr* adr_type) const; -- AliasType* find_alias_type(const TypePtr* adr_type, bool no_create); -+ AliasType* find_alias_type(const TypePtr* adr_type, bool no_create, ciField* field); - - void verify_top(Node*) const PRODUCT_RETURN; - -diff --git a/src/share/vm/opto/parse.hpp b/src/share/vm/opto/parse.hpp ---- openjdk/hotspot/src/share/vm/opto/parse.hpp -+++ openjdk/hotspot/src/share/vm/opto/parse.hpp -@@ -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 -@@ -483,8 +483,8 @@ - bool static_field_ok_in_clinit(ciField *field, ciMethod *method); - - // common code for actually performing the load or store -- void do_get_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool is_field); -- void do_put_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool is_field); -+ void do_get_xxx(Node* obj, ciField* field, bool is_field); -+ void do_put_xxx(Node* obj, ciField* field, bool is_field); - - // loading from a constant field or the constant pool - // returns false if push failed (non-perm field constants only, not ldcs) -diff --git a/src/share/vm/opto/parse3.cpp b/src/share/vm/opto/parse3.cpp ---- openjdk/hotspot/src/share/vm/opto/parse3.cpp -+++ openjdk/hotspot/src/share/vm/opto/parse3.cpp -@@ -112,29 +112,31 @@ - // Compile-time detect of null-exception? - if (stopped()) return; - -+#ifdef ASSERT - const TypeInstPtr *tjp = TypeInstPtr::make(TypePtr::NotNull, iter().get_declared_field_holder()); - assert(_gvn.type(obj)->higher_equal(tjp), "cast_up is no longer needed"); -+#endif - - if (is_get) { - --_sp; // pop receiver before getting -- do_get_xxx(tjp, obj, field, is_field); -+ do_get_xxx(obj, field, is_field); - } else { -- do_put_xxx(tjp, obj, field, is_field); -+ do_put_xxx(obj, field, is_field); - --_sp; // pop receiver after putting - } - } else { -- const TypeKlassPtr* tkp = TypeKlassPtr::make(field_holder); -- obj = _gvn.makecon(tkp); -+ const TypeInstPtr* tip = TypeInstPtr::make(field_holder->java_mirror()); -+ obj = _gvn.makecon(tip); - if (is_get) { -- do_get_xxx(tkp, obj, field, is_field); -+ do_get_xxx(obj, field, is_field); - } else { -- do_put_xxx(tkp, obj, field, is_field); -+ do_put_xxx(obj, field, is_field); - } - } - } - - --void Parse::do_get_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool is_field) { -+void Parse::do_get_xxx(Node* obj, ciField* field, bool is_field) { - // Does this field have a constant value? If so, just push the value. - if (field->is_constant()) { - if (field->is_static()) { -@@ -231,7 +233,7 @@ - } - } - --void Parse::do_put_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool is_field) { -+void Parse::do_put_xxx(Node* obj, ciField* field, bool is_field) { - bool is_vol = field->is_volatile(); - // If reference is volatile, prevent following memory ops from - // floating down past the volatile write. Also prevents commoning -diff --git a/src/share/vm/opto/type.cpp b/src/share/vm/opto/type.cpp ---- openjdk/hotspot/src/share/vm/opto/type.cpp -+++ openjdk/hotspot/src/share/vm/opto/type.cpp -@@ -32,6 +32,7 @@ - #include "memory/oopFactory.hpp" - #include "memory/resourceArea.hpp" - #include "oops/instanceKlass.hpp" -+#include "oops/instanceMirrorKlass.hpp" - #include "oops/klassKlass.hpp" - #include "oops/objArrayKlass.hpp" - #include "oops/typeArrayKlass.hpp" -@@ -2241,43 +2242,49 @@ - } else if (this->isa_aryptr()) { - _is_ptr_to_narrowoop = (klass()->is_obj_array_klass() && - _offset != arrayOopDesc::length_offset_in_bytes()); -- } else if (klass() == ciEnv::current()->Class_klass() && -- (_offset == java_lang_Class::klass_offset_in_bytes() || -- _offset == java_lang_Class::array_klass_offset_in_bytes())) { -- // Special hidden fields from the Class. -- assert(this->isa_instptr(), "must be an instance ptr."); -- _is_ptr_to_narrowoop = true; - } else if (klass()->is_instance_klass()) { - ciInstanceKlass* ik = klass()->as_instance_klass(); - ciField* field = NULL; - if (this->isa_klassptr()) { -- // Perm objects don't use compressed references, except for -- // static fields which are currently compressed. -- field = ik->get_field_by_offset(_offset, true); -- if (field != NULL) { -- BasicType basic_elem_type = field->layout_type(); -- _is_ptr_to_narrowoop = (basic_elem_type == T_OBJECT || -- basic_elem_type == T_ARRAY); -- } -+ // Perm objects don't use compressed references - } else if (_offset == OffsetBot || _offset == OffsetTop) { - // unsafe access - _is_ptr_to_narrowoop = true; - } else { // exclude unsafe ops - assert(this->isa_instptr(), "must be an instance ptr."); -- // Field which contains a compressed oop references. -- field = ik->get_field_by_offset(_offset, false); -- if (field != NULL) { -+ -+ if (klass() == ciEnv::current()->Class_klass() && -+ (_offset == java_lang_Class::klass_offset_in_bytes() || -+ _offset == java_lang_Class::array_klass_offset_in_bytes())) { -+ // Special hidden fields from the Class. -+ assert(this->isa_instptr(), "must be an instance ptr."); -+ _is_ptr_to_narrowoop = true; -+ } else if (klass() == ciEnv::current()->Class_klass() && -+ _offset >= instanceMirrorKlass::offset_of_static_fields()) { -+ // Static fields -+ assert(o != NULL, "must be constant"); -+ ciInstanceKlass* k = o->as_instance()->java_lang_Class_klass()->as_instance_klass(); -+ ciField* field = k->get_field_by_offset(_offset, true); -+ assert(field != NULL, "missing field"); - BasicType basic_elem_type = field->layout_type(); - _is_ptr_to_narrowoop = (basic_elem_type == T_OBJECT || - basic_elem_type == T_ARRAY); -- } else if (klass()->equals(ciEnv::current()->Object_klass())) { -- // Compile::find_alias_type() cast exactness on all types to verify -- // that it does not affect alias type. -- _is_ptr_to_narrowoop = true; - } else { -- // Type for the copy start in LibraryCallKit::inline_native_clone(). -- assert(!klass_is_exact(), "only non-exact klass"); -- _is_ptr_to_narrowoop = true; -+ // Instance fields which contains a compressed oop references. -+ field = ik->get_field_by_offset(_offset, false); -+ if (field != NULL) { -+ BasicType basic_elem_type = field->layout_type(); -+ _is_ptr_to_narrowoop = (basic_elem_type == T_OBJECT || -+ basic_elem_type == T_ARRAY); -+ } else if (klass()->equals(ciEnv::current()->Object_klass())) { -+ // Compile::find_alias_type() cast exactness on all types to verify -+ // that it does not affect alias type. -+ _is_ptr_to_narrowoop = true; -+ } else { -+ // Type for the copy start in LibraryCallKit::inline_native_clone(). -+ assert(!klass_is_exact(), "only non-exact klass"); -+ _is_ptr_to_narrowoop = true; -+ } - } - } - } -diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp ---- openjdk/hotspot/src/share/vm/prims/jni.cpp -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp -@@ -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 -@@ -1865,7 +1865,7 @@ - // Static field. The fieldID a JNIid specifying the field holder and the offset within the klassOop. - JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); - assert(id->is_static_field_id(), "invalid static field id"); -- found = instanceKlass::cast(id->holder())->find_local_field_from_offset(id->offset(), true, &fd); -+ found = id->find_local_field(&fd); - } else { - // Non-static field. The fieldID is really the offset of the field within the instanceOop. - int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID); -@@ -1915,9 +1915,7 @@ - JNIid* id = instanceKlass::cast(fd.field_holder())->jni_id_for(fd.offset()); - debug_only(id->set_is_static_field_id();) - -- debug_only(int first_offset = instanceKlass::cast(fd.field_holder())->offset_of_static_fields();) -- debug_only(int end_offset = first_offset + (instanceKlass::cast(fd.field_holder())->static_field_size() * wordSize);) -- assert(id->offset() >= first_offset && id->offset() < end_offset, "invalid static field offset"); -+ debug_only(id->verify(fd.field_holder())); - - ret = jfieldIDWorkaround::to_static_jfieldID(id); - return ret; -@@ -1937,7 +1935,7 @@ - if (JvmtiExport::should_post_field_access()) { - JvmtiExport::jni_GetField_probe(thread, NULL, NULL, id->holder(), fieldID, true); - } -- jobject ret = JNIHandles::make_local(id->holder()->obj_field(id->offset())); -+ jobject ret = JNIHandles::make_local(id->holder()->java_mirror()->obj_field(id->offset())); - DTRACE_PROBE1(hotspot_jni, GetStaticObjectField__return, ret); - return ret; - JNI_END -@@ -1959,7 +1957,7 @@ - if (JvmtiExport::should_post_field_access()) { \ - JvmtiExport::jni_GetField_probe(thread, NULL, NULL, id->holder(), fieldID, true); \ - } \ -- ret = id->holder()-> Fieldname##_field (id->offset()); \ -+ ret = id->holder()->java_mirror()-> Fieldname##_field (id->offset()); \ - return ret;\ - JNI_END - -@@ -1985,7 +1983,7 @@ - field_value.l = value; - JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, 'L', (jvalue *)&field_value); - } -- id->holder()->obj_field_put(id->offset(), JNIHandles::resolve(value)); -+ id->holder()->java_mirror()->obj_field_put(id->offset(), JNIHandles::resolve(value)); - DTRACE_PROBE(hotspot_jni, SetStaticObjectField__return); - JNI_END - -@@ -2008,7 +2006,7 @@ - field_value.unionType = value; \ - JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \ - } \ -- id->holder()-> Fieldname##_field_put (id->offset(), value); \ -+ id->holder()->java_mirror()-> Fieldname##_field_put (id->offset(), value); \ - DTRACE_PROBE(hotspot_jni, SetStatic##Result##Field__return);\ - JNI_END - -diff --git a/src/share/vm/prims/jniCheck.cpp b/src/share/vm/prims/jniCheck.cpp ---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2001, 2010, 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 -@@ -218,8 +218,7 @@ - ReportJNIFatalError(thr, fatal_wrong_static_field); - - /* check for proper field type */ -- if (!instanceKlass::cast(f_oop)->find_local_field_from_offset( -- id->offset(), true, &fd)) -+ if (!id->find_local_field(&fd)) - ReportJNIFatalError(thr, fatal_static_field_not_found); - if ((fd.field_type() != ftype) && - !(fd.field_type() == T_ARRAY && ftype == T_OBJECT)) { -diff --git a/src/share/vm/prims/jvm.cpp b/src/share/vm/prims/jvm.cpp ---- openjdk/hotspot/src/share/vm/prims/jvm.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp -@@ -1877,7 +1877,7 @@ - THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index"); - } - klassOop k = cp->klass_at(index, CHECK_NULL); -- return (jclass) JNIHandles::make_local(k->klass_part()->java_mirror()); -+ return (jclass) JNIHandles::make_local(k->java_mirror()); - } - JVM_END - -@@ -1893,7 +1893,7 @@ - } - klassOop k = constantPoolOopDesc::klass_at_if_loaded(cp, index); - if (k == NULL) return NULL; -- return (jclass) JNIHandles::make_local(k->klass_part()->java_mirror()); -+ return (jclass) JNIHandles::make_local(k->java_mirror()); - } - JVM_END - -diff --git a/src/share/vm/prims/jvmtiEnvBase.cpp b/src/share/vm/prims/jvmtiEnvBase.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp -@@ -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 -@@ -616,9 +616,7 @@ - bool found = false; - if (jfieldIDWorkaround::is_static_jfieldID(field)) { - JNIid* id = jfieldIDWorkaround::from_static_jfieldID(field); -- int offset = id->offset(); -- klassOop holder = id->holder(); -- found = instanceKlass::cast(holder)->find_local_field_from_offset(offset, true, fd); -+ found = id->find_local_field(fd); - } else { - // Non-static field. The fieldID is really the offset of the field within the object. - int offset = jfieldIDWorkaround::from_instance_jfieldID(k, field); -diff --git a/src/share/vm/prims/jvmtiTagMap.cpp b/src/share/vm/prims/jvmtiTagMap.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.cpp -@@ -27,6 +27,7 @@ - #include "classfile/systemDictionary.hpp" - #include "classfile/vmSymbols.hpp" - #include "jvmtifiles/jvmtiEnv.hpp" -+#include "oops/instanceMirrorKlass.hpp" - #include "oops/objArrayKlass.hpp" - #include "oops/oop.inline2.hpp" - #include "prims/jvmtiEventController.hpp" -@@ -2594,6 +2595,11 @@ - if (o->is_klass()) { - klassOop k = (klassOop)o; - o = Klass::cast(k)->java_mirror(); -+ if (o == NULL) { -+ // Classes without mirrors don't correspond to real Java -+ // classes so just ignore them. -+ return; -+ } - } else { - - // SystemDictionary::always_strong_oops_do reports the application -@@ -2834,10 +2840,10 @@ - - // verify that a static oop field is in range - static inline bool verify_static_oop(instanceKlass* ik, -- klassOop k, int offset) { -- address obj_p = (address)k + offset; -- address start = (address)ik->start_of_static_fields(); -- address end = start + (ik->static_oop_field_size() * heapOopSize); -+ oop mirror, int offset) { -+ address obj_p = (address)mirror + offset; -+ address start = (address)instanceMirrorKlass::start_of_static_fields(mirror); -+ address end = start + (java_lang_Class::static_oop_field_count(mirror) * heapOopSize); - assert(end >= start, "sanity check"); - - if (obj_p >= start && obj_p < end) { -@@ -2938,8 +2944,8 @@ - ClassFieldDescriptor* field = field_map->field_at(i); - char type = field->field_type(); - if (!is_primitive_field_type(type)) { -- oop fld_o = k->obj_field(field->field_offset()); -- assert(verify_static_oop(ik, k, field->field_offset()), "sanity check"); -+ oop fld_o = mirror->obj_field(field->field_offset()); -+ assert(verify_static_oop(ik, mirror, field->field_offset()), "sanity check"); - if (fld_o != NULL) { - int slot = field->field_index(); - if (!CallbackInvoker::report_static_field_reference(mirror, fld_o, slot)) { -diff --git a/src/share/vm/prims/unsafe.cpp b/src/share/vm/prims/unsafe.cpp ---- openjdk/hotspot/src/share/vm/prims/unsafe.cpp -+++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp -@@ -686,7 +686,7 @@ - THROW_0(vmSymbols::java_lang_IllegalArgumentException()); - } - -- return JNIHandles::make_local(env, java_lang_Class::as_klassOop(mirror)); -+ return JNIHandles::make_local(env, mirror); - UNSAFE_END - - //@deprecated -@@ -704,7 +704,7 @@ - if (clazz == NULL) { - THROW_0(vmSymbols::java_lang_NullPointerException()); - } -- return JNIHandles::make_local(env, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(clazz))); -+ return JNIHandles::make_local(env, JNIHandles::resolve_non_null(clazz)); - UNSAFE_END - - UNSAFE_ENTRY(void, Unsafe_EnsureClassInitialized(JNIEnv *env, jobject unsafe, jobject clazz)) -diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp ---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp -@@ -2973,6 +2973,12 @@ - } - } - } -+ if (!JavaObjectsInPerm && ScavengeRootsInCode == 0) { -+ if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) { -+ warning("forcing ScavengeRootsInCode non-zero because JavaObjectsInPerm is false"); -+ } -+ ScavengeRootsInCode = 1; -+ } - - // Parse JavaVMInitArgs structure passed in, as well as JAVA_TOOL_OPTIONS and _JAVA_OPTIONS - jint result = parse_vm_init_args(args); -diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp ---- openjdk/hotspot/src/share/vm/runtime/globals.hpp -+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp -@@ -1184,6 +1184,11 @@ - "Decay time (in milliseconds) to re-enable bulk rebiasing of a " \ - "type after previous bulk rebias") \ - \ -+ develop(bool, JavaObjectsInPerm, false, \ -+ "controls whether Classes and interned Strings are allocated" \ -+ "in perm. This purely intended to allow debugging issues" \ -+ "in production.") \ -+ \ - /* tracing */ \ - \ - notproduct(bool, TraceRuntimeCalls, false, \ -diff --git a/src/share/vm/runtime/reflection.cpp b/src/share/vm/runtime/reflection.cpp ---- openjdk/hotspot/src/share/vm/runtime/reflection.cpp -+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp -@@ -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 -@@ -649,7 +649,7 @@ - if (TraceClassResolution) { - trace_class_resolution(k); - } -- return k->klass_part()->java_mirror(); -+ return k->java_mirror(); - }; - } - -diff --git a/src/share/vm/runtime/thread.cpp b/src/share/vm/runtime/thread.cpp ---- openjdk/hotspot/src/share/vm/runtime/thread.cpp -+++ openjdk/hotspot/src/share/vm/runtime/thread.cpp -@@ -3182,7 +3182,7 @@ - fieldDescriptor fd; - // Possible we might not find this field; if so, don't break - if (ik->find_local_field(vmSymbols::frontCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) { -- k()->bool_field_put(fd.offset(), true); -+ k()->java_mirror()->bool_field_put(fd.offset(), true); - } - } - -@@ -3198,7 +3198,7 @@ - fieldDescriptor fd; - // Possible we might not find this field: if so, silently don't break - if (ik->find_local_field(vmSymbols::stringCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) { -- k()->bool_field_put(fd.offset(), true); -+ k()->java_mirror()->bool_field_put(fd.offset(), true); - } - } - } -diff --git a/src/share/vm/runtime/vmStructs.cpp b/src/share/vm/runtime/vmStructs.cpp ---- openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp -@@ -251,7 +251,7 @@ - nonstatic_field(instanceKlass, _inner_classes, typeArrayOop) \ - nonstatic_field(instanceKlass, _nonstatic_field_size, int) \ - nonstatic_field(instanceKlass, _static_field_size, int) \ -- nonstatic_field(instanceKlass, _static_oop_field_size, int) \ -+ nonstatic_field(instanceKlass, _static_oop_field_count, int) \ - nonstatic_field(instanceKlass, _nonstatic_oop_map_size, int) \ - nonstatic_field(instanceKlass, _is_marked_dependent, bool) \ - nonstatic_field(instanceKlass, _minor_version, u2) \ -@@ -928,6 +928,15 @@ - static_field(Arguments, _num_jvm_args, int) \ - static_field(Arguments, _java_command, char*) \ - \ -+ /*********************************/ \ -+ /* java_lang_Class fields */ \ -+ /*********************************/ \ -+ \ -+ static_field(java_lang_Class, klass_offset, int) \ -+ static_field(java_lang_Class, resolved_constructor_offset, int) \ -+ static_field(java_lang_Class, array_klass_offset, int) \ -+ static_field(java_lang_Class, oop_size_offset, int) \ -+ static_field(java_lang_Class, static_oop_field_count_offset, int) \ - \ - /************************/ \ - /* Miscellaneous fields */ \ -@@ -1410,6 +1419,7 @@ - declare_toplevel_type(intptr_t*) \ - declare_unsigned_integer_type(InvocationCounter) /* FIXME: wrong type (not integer) */ \ - declare_toplevel_type(JavaThread*) \ -+ declare_toplevel_type(java_lang_Class) \ - declare_toplevel_type(jbyte*) \ - declare_toplevel_type(jbyte**) \ - declare_toplevel_type(jint*) \ -@@ -1696,15 +1706,6 @@ - \ - declare_constant(ConstantPoolCacheEntry::tosBits) \ - \ -- /*********************************/ \ -- /* java_lang_Class field offsets */ \ -- /*********************************/ \ -- \ -- declare_constant(java_lang_Class::hc_klass_offset) \ -- declare_constant(java_lang_Class::hc_array_klass_offset) \ -- declare_constant(java_lang_Class::hc_resolved_constructor_offset) \ -- declare_constant(java_lang_Class::hc_number_of_fake_oop_fields) \ -- \ - /***************************************/ \ - /* java_lang_Thread::ThreadStatus enum */ \ - /***************************************/ \ -diff --git a/src/share/vm/shark/sharkNativeWrapper.cpp b/src/share/vm/shark/sharkNativeWrapper.cpp ---- openjdk/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp -+++ openjdk/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp -@@ -101,7 +101,7 @@ - builder()->CreateStore( - builder()->CreateInlineOop( - JNIHandles::make_local( -- target()->method_holder()->klass_part()->java_mirror())), -+ target()->method_holder()->java_mirror())), - oop_tmp_slot()); - - param_types.push_back(box_type);
--- a/patches/openjdk/7036747-elfstringtable.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -# HG changeset patch -# User zgu -# Date 1303909797 14400 -# Node ID fee3c2ed387b0a925f81448c93265b4c30e0a8d6 -# Parent d521fcfccc58dce20f41178374292f2b8430686c -7036747: 7017009 reappeared, problem with ElfStringTable -Summary: Created new "new" operator for CHeapObj that allows malloc to fail without causing fatal error. Also replaced "HeapAllocate" with "os::malloc" in decoder code to allow decoder to handle low memory scenario. -Reviewed-by: coleenp, dholmes - -diff --git a/src/share/vm/memory/allocation.cpp b/src/share/vm/memory/allocation.cpp ---- openjdk/hotspot/src/share/vm/memory/allocation.cpp -+++ openjdk/hotspot/src/share/vm/memory/allocation.cpp -@@ -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); - } -diff --git a/src/share/vm/memory/allocation.hpp b/src/share/vm/memory/allocation.hpp ---- openjdk/hotspot/src/share/vm/memory/allocation.hpp -+++ openjdk/hotspot/src/share/vm/memory/allocation.hpp -@@ -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) -@@ -105,6 +107,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); - }; -diff --git a/src/share/vm/utilities/elfFile.cpp b/src/share/vm/utilities/elfFile.cpp ---- openjdk/hotspot/src/share/vm/utilities/elfFile.cpp -+++ openjdk/hotspot/src/share/vm/utilities/elfFile.cpp -@@ -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; -diff --git a/src/share/vm/utilities/elfStringTable.cpp b/src/share/vm/utilities/elfStringTable.cpp ---- openjdk/hotspot/src/share/vm/utilities/elfStringTable.cpp -+++ openjdk/hotspot/src/share/vm/utilities/elfStringTable.cpp -@@ -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) {
--- a/patches/openjdk/7086585-flexible_field_injection.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3424 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371750221 18000 -# Node ID f105c2b7da46999930ae40ac8661a56d6ce1c5cd -# Parent f44f27f80f2caf315f0f56cd63b5beb46908051e -7086585: make Java field injection more flexible -Reviewed-by: jrose, twisti, kvn, coleenp - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java b/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java -@@ -39,28 +39,20 @@ - - /** Constructor for fields that are named in an InstanceKlass's - fields array (i.e., named, non-VM fields) */ -- Field(InstanceKlass holder, int fieldArrayIndex) { -+ Field(InstanceKlass holder, int fieldIndex) { - this.holder = holder; -- this.fieldArrayIndex = fieldArrayIndex; -+ this.fieldIndex = fieldIndex; - -- ConstantPool cp = holder.getConstants(); -- TypeArray fields = holder.getFields(); -- short access = fields.getShortAt(fieldArrayIndex + InstanceKlass.ACCESS_FLAGS_OFFSET); -- short nameIndex = fields.getShortAt(fieldArrayIndex + InstanceKlass.NAME_INDEX_OFFSET); -- short signatureIndex = fields.getShortAt(fieldArrayIndex + InstanceKlass.SIGNATURE_INDEX_OFFSET); -- offset = VM.getVM().buildIntFromShorts(fields.getShortAt(fieldArrayIndex + InstanceKlass.LOW_OFFSET), -- fields.getShortAt(fieldArrayIndex + InstanceKlass.HIGH_OFFSET)); -- short genericSignatureIndex = fields.getShortAt(fieldArrayIndex + InstanceKlass.GENERIC_SIGNATURE_INDEX_OFFSET); -- Symbol name = cp.getSymbolAt(nameIndex); -+ offset = holder.getFieldOffset(fieldIndex); -+ genericSignature = holder.getFieldGenericSignature(fieldIndex); -+ -+ Symbol name = holder.getFieldName(fieldIndex); - id = new NamedFieldIdentifier(name.asString()); -- signature = cp.getSymbolAt(signatureIndex); -- if (genericSignatureIndex != 0) { -- genericSignature = cp.getSymbolAt(genericSignatureIndex); -- } else { -- genericSignature = null; -- } - -+ signature = holder.getFieldSignature(fieldIndex); - fieldType = new FieldType(signature); -+ -+ short access = holder.getFieldAccessFlags(fieldIndex); - accessFlags = new AccessFlags(access); - } - -@@ -73,7 +65,7 @@ - private Symbol signature; - private Symbol genericSignature; - private AccessFlags accessFlags; -- private int fieldArrayIndex; -+ private int fieldIndex; - - /** Returns the byte offset of the field within the object or klass */ - public long getOffset() { return offset; } -@@ -101,8 +93,8 @@ - /** (Named, non-VM fields only) Returns the index in the fields - TypeArray for this field. Equivalent to the "index" in the VM's - fieldDescriptors. */ -- public int getFieldArrayIndex() { -- return fieldArrayIndex; -+ public int getFieldIndex() { -+ return fieldIndex; - } - - /** (Named, non-VM fields only) Retrieves the access flags. */ -diff --git a/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java -@@ -51,7 +51,7 @@ - public static int LOW_OFFSET; - public static int HIGH_OFFSET; - public static int GENERIC_SIGNATURE_INDEX_OFFSET; -- public static int NEXT_OFFSET; -+ public static int FIELD_SLOTS; - public static int IMPLEMENTORS_LIMIT; - - // ClassState constants -@@ -78,6 +78,7 @@ - implementors[i] = new OopField(type.getOopField("_implementors[0]"), arrayOffset); - } - fields = new OopField(type.getOopField("_fields"), Oop.getHeaderSize()); -+ javaFieldsCount = new CIntField(type.getCIntegerField("_java_fields_count"), Oop.getHeaderSize()); - constants = new OopField(type.getOopField("_constants"), Oop.getHeaderSize()); - classLoader = new OopField(type.getOopField("_class_loader"), Oop.getHeaderSize()); - protectionDomain = new OopField(type.getOopField("_protection_domain"), Oop.getHeaderSize()); -@@ -100,14 +101,14 @@ - headerSize = alignObjectOffset(Oop.getHeaderSize() + type.getSize()); - - // read field offset constants -- ACCESS_FLAGS_OFFSET = db.lookupIntConstant("instanceKlass::access_flags_offset").intValue(); -- NAME_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::name_index_offset").intValue(); -- SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::signature_index_offset").intValue(); -- INITVAL_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::initval_index_offset").intValue(); -- LOW_OFFSET = db.lookupIntConstant("instanceKlass::low_offset").intValue(); -- HIGH_OFFSET = db.lookupIntConstant("instanceKlass::high_offset").intValue(); -- GENERIC_SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::generic_signature_offset").intValue(); -- NEXT_OFFSET = db.lookupIntConstant("instanceKlass::next_offset").intValue(); -+ ACCESS_FLAGS_OFFSET = db.lookupIntConstant("FieldInfo::access_flags_offset").intValue(); -+ NAME_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::name_index_offset").intValue(); -+ SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::signature_index_offset").intValue(); -+ INITVAL_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::initval_index_offset").intValue(); -+ LOW_OFFSET = db.lookupIntConstant("FieldInfo::low_offset").intValue(); -+ HIGH_OFFSET = db.lookupIntConstant("FieldInfo::high_offset").intValue(); -+ GENERIC_SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::generic_signature_offset").intValue(); -+ FIELD_SLOTS = db.lookupIntConstant("FieldInfo::field_slots").intValue(); - // read ClassState constants - CLASS_STATE_UNPARSABLE_BY_GC = db.lookupIntConstant("instanceKlass::unparsable_by_gc").intValue(); - CLASS_STATE_ALLOCATED = db.lookupIntConstant("instanceKlass::allocated").intValue(); -@@ -131,6 +132,7 @@ - private static CIntField nofImplementors; - private static OopField[] implementors; - private static OopField fields; -+ private static CIntField javaFieldsCount; - private static OopField constants; - private static OopField classLoader; - private static OopField protectionDomain; -@@ -243,6 +245,34 @@ - - public static long getHeaderSize() { return headerSize; } - -+ public short getFieldAccessFlags(int index) { -+ return getFields().getShortAt(index * FIELD_SLOTS + ACCESS_FLAGS_OFFSET); -+ } -+ -+ public Symbol getFieldName(int index) { -+ int nameIndex = getFields().getShortAt(index * FIELD_SLOTS + NAME_INDEX_OFFSET); -+ return getConstants().getSymbolAt(nameIndex); -+ } -+ -+ public Symbol getFieldSignature(int index) { -+ int signatureIndex = getFields().getShortAt(index * FIELD_SLOTS + SIGNATURE_INDEX_OFFSET); -+ return getConstants().getSymbolAt(signatureIndex); -+ } -+ -+ public Symbol getFieldGenericSignature(int index) { -+ short genericSignatureIndex = getFields().getShortAt(index * FIELD_SLOTS + GENERIC_SIGNATURE_INDEX_OFFSET); -+ if (genericSignatureIndex != 0) { -+ return getConstants().getSymbolAt(genericSignatureIndex); -+ } -+ return null; -+ } -+ -+ public int getFieldOffset(int index) { -+ TypeArray fields = getFields(); -+ return VM.getVM().buildIntFromShorts(fields.getShortAt(index * FIELD_SLOTS + LOW_OFFSET), -+ fields.getShortAt(index * FIELD_SLOTS + HIGH_OFFSET)); -+ } -+ - // Accessors for declared fields - public Klass getArrayKlasses() { return (Klass) arrayKlasses.getValue(this); } - public ObjArray getMethods() { return (ObjArray) methods.getValue(this); } -@@ -253,6 +283,8 @@ - public Klass getImplementor() { return (Klass) implementors[0].getValue(this); } - public Klass getImplementor(int i) { return (Klass) implementors[i].getValue(this); } - public TypeArray getFields() { return (TypeArray) fields.getValue(this); } -+ public int getJavaFieldsCount() { return (int) javaFieldsCount.getValue(this); } -+ public int getAllFieldsCount() { return (int)getFields().getLength(); } - public ConstantPool getConstants() { return (ConstantPool) constants.getValue(this); } - public Oop getClassLoader() { return classLoader.getValue(this); } - public Oop getProtectionDomain() { return protectionDomain.getValue(this); } -@@ -461,8 +493,8 @@ - } - - TypeArray fields = getFields(); -- int length = (int) fields.getLength(); -- for (int index = 0; index < length; index += NEXT_OFFSET) { -+ int length = getJavaFieldsCount(); -+ for (int index = 0; index < length; index += FIELD_SLOTS) { - short accessFlags = fields.getShortAt(index + ACCESS_FLAGS_OFFSET); - short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET); - FieldType type = new FieldType(getConstants().getSymbolAt(signatureIndex)); -@@ -483,8 +515,8 @@ - } - TypeArray fields = getFields(); - -- int length = (int) fields.getLength(); -- for (int index = 0; index < length; index += NEXT_OFFSET) { -+ int length = getJavaFieldsCount(); -+ for (int index = 0; index < length; index += FIELD_SLOTS) { - short accessFlags = fields.getShortAt(index + ACCESS_FLAGS_OFFSET); - short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET); - -@@ -499,9 +531,9 @@ - /** Field access by name. */ - public Field findLocalField(Symbol name, Symbol sig) { - TypeArray fields = getFields(); -- int n = (int) fields.getLength(); -+ int length = (int) fields.getLength(); - ConstantPool cp = getConstants(); -- for (int i = 0; i < n; i += NEXT_OFFSET) { -+ for (int i = 0; i < length; i += FIELD_SLOTS) { - int nameIndex = fields.getShortAt(i + NAME_INDEX_OFFSET); - int sigIndex = fields.getShortAt(i + SIGNATURE_INDEX_OFFSET); - Symbol f_name = cp.getSymbolAt(nameIndex); -@@ -594,9 +626,9 @@ - // not including inherited fields. - TypeArray fields = getFields(); - -- int length = (int) fields.getLength(); -- List immediateFields = new ArrayList(length / NEXT_OFFSET); -- for (int index = 0; index < length; index += NEXT_OFFSET) { -+ int length = getJavaFieldsCount(); -+ List immediateFields = new ArrayList(length); -+ for (int index = 0; index < length; index += FIELD_SLOTS) { - immediateFields.add(getFieldByIndex(index)); - } - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java -@@ -381,15 +381,15 @@ - - protected void writeFields() throws IOException { - TypeArray fields = klass.getFields(); -- final int length = (int) fields.getLength(); -+ final int length = klass.getJavaFieldsCount(); - - // write number of fields -- dos.writeShort((short) (length / InstanceKlass.NEXT_OFFSET) ); -+ dos.writeShort((short) (length / InstanceKlass.FIELD_SLOTS) ); - - if (DEBUG) debugMessage("number of fields = " -- + length/InstanceKlass.NEXT_OFFSET); -+ + length/InstanceKlass.FIELD_SLOTS); - -- for (int index = 0; index < length; index += InstanceKlass.NEXT_OFFSET) { -+ for (int index = 0; index < length; index += InstanceKlass.FIELD_SLOTS) { - short accessFlags = fields.getShortAt(index + InstanceKlass.ACCESS_FLAGS_OFFSET); - dos.writeShort(accessFlags & (short) JVM_RECOGNIZED_FIELD_MODIFIERS); - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java b/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java -@@ -150,16 +150,13 @@ - } - - // list immediate fields only -- TypeArray fields = klass.getFields(); -- int numFields = (int) fields.getLength(); -+ int numFields = klass.getJavaFieldsCount(); - ConstantPool cp = klass.getConstants(); - out.println("fields"); - if (numFields != 0) { -- for (int f = 0; f < numFields; f += InstanceKlass.NEXT_OFFSET) { -- int nameIndex = fields.getShortAt(f + InstanceKlass.NAME_INDEX_OFFSET); -- int sigIndex = fields.getShortAt(f + InstanceKlass.SIGNATURE_INDEX_OFFSET); -- Symbol f_name = cp.getSymbolAt(nameIndex); -- Symbol f_sig = cp.getSymbolAt(sigIndex); -+ for (int f = 0; f < numFields; f++){ -+ Symbol f_name = klass.getFieldName(f); -+ Symbol f_sig = klass.getFieldSignature(f); - StringBuffer sigBuf = new StringBuffer(); - new SignatureConverter(f_sig, sigBuf).dispatchField(); - out.print('\t'); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java b/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java -@@ -1117,20 +1117,15 @@ - InstanceKlass kls = (InstanceKlass) obj; - buf.append(" " + kls.getName().asString() + "={"); - int flen = ov.fieldsSize(); -- -- TypeArray klfields = kls.getFields(); -- int klen = (int) klfields.getLength(); -- -- ConstantPool cp = kls.getConstants(); -+ int klen = kls.getJavaFieldsCount(); - int findex = 0; -- for (int index = 0; index < klen; index += kls.NEXT_OFFSET) { -- int accsFlags = klfields.getShortAt(index + kls.ACCESS_FLAGS_OFFSET); -- int nameIndex = klfields.getShortAt(index + kls.NAME_INDEX_OFFSET); -+ for (int index = 0; index < klen; index++) { -+ int accsFlags = kls.getFieldAccessFlags(index); -+ Symbol f_name = kls.getFieldName(index); - AccessFlags access = new AccessFlags(accsFlags); - if (!access.isStatic()) { - ScopeValue svf = ov.getFieldAt(findex++); - String fstr = scopeValueAsString(sd, svf); -- Symbol f_name = cp.getSymbolAt(nameIndex); - buf.append(" [" + f_name.asString() + " :"+ index + "]=(#" + fstr + ")"); - } - } -@@ -1820,13 +1815,11 @@ - - protected String genHTMLListForFields(InstanceKlass klass) { - Formatter buf = new Formatter(genHTML); -- TypeArray fields = klass.getFields(); -- int numFields = (int) fields.getLength(); -- ConstantPool cp = klass.getConstants(); -+ int numFields = klass.getJavaFieldsCount(); - if (numFields != 0) { - buf.h3("Fields"); - buf.beginList(); -- for (int f = 0; f < numFields; f += InstanceKlass.NEXT_OFFSET) { -+ for (int f = 0; f < numFields; f++) { - sun.jvm.hotspot.oops.Field field = klass.getFieldByIndex(f); - String f_name = ((NamedFieldIdentifier)field.getID()).getName(); - Symbol f_sig = field.getSignature(); -diff --git a/agent/test/jdi/sasanity.sh b/agent/test/jdi/sasanity.sh ---- openjdk/hotspot/agent/test/jdi/sasanity.sh -+++ openjdk/hotspot/agent/test/jdi/sasanity.sh -@@ -76,5 +76,5 @@ - sleep 2 - done - --$jdk/bin/java -showversion ${OPTIONS} -classpath $javacp SASanityChecker $pid -+$jdk/bin/java -showversion ${OPTIONS} -classpath $javacp $* SASanityChecker $pid - kill -9 $pid -diff --git a/src/cpu/sparc/vm/assembler_sparc.cpp b/src/cpu/sparc/vm/assembler_sparc.cpp ---- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp -+++ openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp -@@ -3186,15 +3186,10 @@ - Register temp_reg) { - assert_different_registers(vmslots_reg, mh_reg, temp_reg); - // load mh.type.form.vmslots -- if (java_dyn_MethodHandle::vmslots_offset_in_bytes() != 0) { -- // hoist vmslots into every mh to avoid dependent load chain -- ld( Address(mh_reg, delayed_value(java_dyn_MethodHandle::vmslots_offset_in_bytes, temp_reg)), vmslots_reg); -- } else { -- Register temp2_reg = vmslots_reg; -- load_heap_oop(Address(mh_reg, delayed_value(java_dyn_MethodHandle::type_offset_in_bytes, temp_reg)), temp2_reg); -- load_heap_oop(Address(temp2_reg, delayed_value(java_dyn_MethodType::form_offset_in_bytes, temp_reg)), temp2_reg); -- ld( Address(temp2_reg, delayed_value(java_dyn_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)), vmslots_reg); -- } -+ Register temp2_reg = vmslots_reg; -+ load_heap_oop(Address(mh_reg, delayed_value(java_dyn_MethodHandle::type_offset_in_bytes, temp_reg)), temp2_reg); -+ load_heap_oop(Address(temp2_reg, delayed_value(java_dyn_MethodType::form_offset_in_bytes, temp_reg)), temp2_reg); -+ ld( Address(temp2_reg, delayed_value(java_dyn_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)), vmslots_reg); - } - - -@@ -4918,4 +4913,3 @@ - // Caller should set it: - // add(G0, 1, result); // equals - } -- -diff --git a/src/cpu/x86/vm/assembler_x86.cpp b/src/cpu/x86/vm/assembler_x86.cpp ---- openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp -+++ openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp -@@ -7806,15 +7806,10 @@ - Register temp_reg) { - assert_different_registers(vmslots_reg, mh_reg, temp_reg); - // load mh.type.form.vmslots -- if (java_dyn_MethodHandle::vmslots_offset_in_bytes() != 0) { -- // hoist vmslots into every mh to avoid dependent load chain -- movl(vmslots_reg, Address(mh_reg, delayed_value(java_dyn_MethodHandle::vmslots_offset_in_bytes, temp_reg))); -- } else { -- Register temp2_reg = vmslots_reg; -- load_heap_oop(temp2_reg, Address(mh_reg, delayed_value(java_dyn_MethodHandle::type_offset_in_bytes, temp_reg))); -- load_heap_oop(temp2_reg, Address(temp2_reg, delayed_value(java_dyn_MethodType::form_offset_in_bytes, temp_reg))); -- movl(vmslots_reg, Address(temp2_reg, delayed_value(java_dyn_MethodTypeForm::vmslots_offset_in_bytes, temp_reg))); -- } -+ Register temp2_reg = vmslots_reg; -+ load_heap_oop(temp2_reg, Address(mh_reg, delayed_value(java_dyn_MethodHandle::type_offset_in_bytes, temp_reg))); -+ load_heap_oop(temp2_reg, Address(temp2_reg, delayed_value(java_dyn_MethodType::form_offset_in_bytes, temp_reg))); -+ movl(vmslots_reg, Address(temp2_reg, delayed_value(java_dyn_MethodTypeForm::vmslots_offset_in_bytes, temp_reg))); - } - - -diff --git a/src/share/vm/ci/ciInstanceKlass.cpp b/src/share/vm/ci/ciInstanceKlass.cpp ---- openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp -@@ -31,6 +31,7 @@ - #include "memory/allocation.hpp" - #include "memory/allocation.inline.hpp" - #include "oops/oop.inline.hpp" -+#include "oops/fieldStreams.hpp" - #include "runtime/fieldDescriptor.hpp" - - // ciInstanceKlass -@@ -411,7 +412,7 @@ - VM_ENTRY_MARK; - ciEnv* curEnv = ciEnv::current(); - instanceKlass* ik = get_instanceKlass(); -- int max_n_fields = ik->fields()->length()/instanceKlass::next_offset; -+ int max_n_fields = ik->java_fields_count(); - - Arena* arena = curEnv->arena(); - _non_static_fields = -@@ -475,23 +476,6 @@ - // Now sort them by offset, ascending. - // (In principle, they could mix with superclass fields.) - fields->sort(sort_field_by_offset); --#ifdef ASSERT -- int last_offset = instanceOopDesc::base_offset_in_bytes(); -- for (int i = 0; i < fields->length(); i++) { -- ciField* field = fields->at(i); -- int offset = field->offset_in_bytes(); -- int size = (field->_type == NULL) ? heapOopSize : field->size_in_bytes(); -- assert(last_offset <= offset, err_msg("no field overlap: %d <= %d", last_offset, offset)); -- if (last_offset > (int)sizeof(oopDesc)) -- assert((offset - last_offset) < BytesPerLong, "no big holes"); -- // Note: Two consecutive T_BYTE fields will be separated by wordSize-1 -- // padding bytes if one of them is declared by a superclass. -- // This is a minor inefficiency classFileParser.cpp. -- last_offset = offset + size; -- } -- assert(last_offset <= (int)instanceOopDesc::base_offset_in_bytes() + fsize, "no overflow"); --#endif -- - _nonstatic_fields = fields; - return flen; - } -@@ -504,33 +488,29 @@ - int flen = 0; - GrowableArray<ciField*>* fields = NULL; - instanceKlass* k = get_instanceKlass(); -- typeArrayOop fields_array = k->fields(); -- for (int pass = 0; pass <= 1; pass++) { -- for (int i = 0, alen = fields_array->length(); i < alen; i += instanceKlass::next_offset) { -- fieldDescriptor fd; -- fd.initialize(k->as_klassOop(), i); -- if (fd.is_static()) continue; -- if (pass == 0) { -- flen += 1; -- } else { -- ciField* field = new (arena) ciField(&fd); -- fields->append(field); -- } -- } -+ for (JavaFieldStream fs(k); !fs.done(); fs.next()) { -+ if (fs.access_flags().is_static()) continue; -+ flen += 1; -+ } - -- // Between passes, allocate the array: -- if (pass == 0) { -- if (flen == 0) { -- return NULL; // return nothing if none are locally declared -- } -- if (super_fields != NULL) { -- flen += super_fields->length(); -- } -- fields = new (arena) GrowableArray<ciField*>(arena, flen, 0, NULL); -- if (super_fields != NULL) { -- fields->appendAll(super_fields); -- } -- } -+ // allocate the array: -+ if (flen == 0) { -+ return NULL; // return nothing if none are locally declared -+ } -+ if (super_fields != NULL) { -+ flen += super_fields->length(); -+ } -+ fields = new (arena) GrowableArray<ciField*>(arena, flen, 0, NULL); -+ if (super_fields != NULL) { -+ fields->appendAll(super_fields); -+ } -+ -+ for (JavaFieldStream fs(k); !fs.done(); fs.next()) { -+ if (fs.access_flags().is_static()) continue; -+ fieldDescriptor fd; -+ fd.initialize(k->as_klassOop(), fs.index()); -+ ciField* field = new (arena) ciField(&fd); -+ fields->append(field); - } - assert(fields->length() == flen, "sanity"); - return fields; -diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp ---- openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -@@ -36,6 +36,7 @@ - #include "memory/oopFactory.hpp" - #include "memory/universe.inline.hpp" - #include "oops/constantPoolOop.hpp" -+#include "oops/fieldStreams.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/instanceMirrorKlass.hpp" - #include "oops/klass.inline.hpp" -@@ -1004,42 +1005,98 @@ - STATIC_BYTE, // Boolean, Byte, char - STATIC_SHORT, // shorts - STATIC_WORD, // ints -- STATIC_DOUBLE, // long or double -- STATIC_ALIGNED_DOUBLE,// aligned long or double -+ STATIC_DOUBLE, // aligned long or double - NONSTATIC_OOP, - NONSTATIC_BYTE, - NONSTATIC_SHORT, - NONSTATIC_WORD, - NONSTATIC_DOUBLE, -- NONSTATIC_ALIGNED_DOUBLE -+ MAX_FIELD_ALLOCATION_TYPE, -+ BAD_ALLOCATION_TYPE = -1 - }; - -- --struct FieldAllocationCount { -- unsigned int static_oop_count; -- unsigned int static_byte_count; -- unsigned int static_short_count; -- unsigned int static_word_count; -- unsigned int static_double_count; -- unsigned int nonstatic_oop_count; -- unsigned int nonstatic_byte_count; -- unsigned int nonstatic_short_count; -- unsigned int nonstatic_word_count; -- unsigned int nonstatic_double_count; -+static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = { -+ BAD_ALLOCATION_TYPE, // 0 -+ BAD_ALLOCATION_TYPE, // 1 -+ BAD_ALLOCATION_TYPE, // 2 -+ BAD_ALLOCATION_TYPE, // 3 -+ NONSTATIC_BYTE , // T_BOOLEAN = 4, -+ NONSTATIC_SHORT, // T_CHAR = 5, -+ NONSTATIC_WORD, // T_FLOAT = 6, -+ NONSTATIC_DOUBLE, // T_DOUBLE = 7, -+ NONSTATIC_BYTE, // T_BYTE = 8, -+ NONSTATIC_SHORT, // T_SHORT = 9, -+ NONSTATIC_WORD, // T_INT = 10, -+ NONSTATIC_DOUBLE, // T_LONG = 11, -+ NONSTATIC_OOP, // T_OBJECT = 12, -+ NONSTATIC_OOP, // T_ARRAY = 13, -+ BAD_ALLOCATION_TYPE, // T_VOID = 14, -+ BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, -+ BAD_ALLOCATION_TYPE, // T_NARROWOOP= 16, -+ BAD_ALLOCATION_TYPE, // T_CONFLICT = 17, -+ BAD_ALLOCATION_TYPE, // 0 -+ BAD_ALLOCATION_TYPE, // 1 -+ BAD_ALLOCATION_TYPE, // 2 -+ BAD_ALLOCATION_TYPE, // 3 -+ STATIC_BYTE , // T_BOOLEAN = 4, -+ STATIC_SHORT, // T_CHAR = 5, -+ STATIC_WORD, // T_FLOAT = 6, -+ STATIC_DOUBLE, // T_DOUBLE = 7, -+ STATIC_BYTE, // T_BYTE = 8, -+ STATIC_SHORT, // T_SHORT = 9, -+ STATIC_WORD, // T_INT = 10, -+ STATIC_DOUBLE, // T_LONG = 11, -+ STATIC_OOP, // T_OBJECT = 12, -+ STATIC_OOP, // T_ARRAY = 13, -+ BAD_ALLOCATION_TYPE, // T_VOID = 14, -+ BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, -+ BAD_ALLOCATION_TYPE, // T_NARROWOOP= 16, -+ BAD_ALLOCATION_TYPE, // T_CONFLICT = 17, - }; - --typeArrayHandle ClassFileParser::parse_fields(constantPoolHandle cp, bool is_interface, -- struct FieldAllocationCount *fac, -- objArrayHandle* fields_annotations, TRAPS) { -+static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) { -+ assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values"); -+ FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)]; -+ assert(result != BAD_ALLOCATION_TYPE, "bad type"); -+ return result; -+} -+ -+class FieldAllocationCount: public ResourceObj { -+ public: -+ unsigned int count[MAX_FIELD_ALLOCATION_TYPE]; -+ -+ FieldAllocationCount() { -+ for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) { -+ count[i] = 0; -+ } -+ } -+ -+ FieldAllocationType update(bool is_static, BasicType type) { -+ FieldAllocationType atype = basic_type_to_atype(is_static, type); -+ count[atype]++; -+ return atype; -+ } -+}; -+ -+ -+typeArrayHandle ClassFileParser::parse_fields(Symbol* class_name, -+ constantPoolHandle cp, bool is_interface, -+ FieldAllocationCount *fac, -+ objArrayHandle* fields_annotations, -+ int* java_fields_count_ptr, TRAPS) { - ClassFileStream* cfs = stream(); - typeArrayHandle nullHandle; - cfs->guarantee_more(2, CHECK_(nullHandle)); // length - u2 length = cfs->get_u2_fast(); -+ *java_fields_count_ptr = length; -+ -+ int num_injected = 0; -+ InjectedField* injected = JavaClasses::get_injected(class_name, &num_injected); -+ - // Tuples of shorts [access, name index, sig index, initial value index, byte offset, generic signature index] -- typeArrayOop new_fields = oopFactory::new_permanent_shortArray(length*instanceKlass::next_offset, CHECK_(nullHandle)); -+ typeArrayOop new_fields = oopFactory::new_permanent_shortArray((length + num_injected) * FieldInfo::field_slots, CHECK_(nullHandle)); - typeArrayHandle fields(THREAD, new_fields); - -- int index = 0; - typeArrayHandle field_annotations; - for (int n = 0; n < length; n++) { - cfs->guarantee_more(8, CHECK_(nullHandle)); // access_flags, name_index, descriptor_index, attributes_count -@@ -1090,93 +1147,77 @@ - } - } - -- fields->short_at_put(index++, access_flags.as_short()); -- fields->short_at_put(index++, name_index); -- fields->short_at_put(index++, signature_index); -- fields->short_at_put(index++, constantvalue_index); -+ FieldInfo* field = FieldInfo::from_field_array(fields(), n); -+ field->initialize(access_flags.as_short(), -+ name_index, -+ signature_index, -+ constantvalue_index, -+ generic_signature_index, -+ 0); -+ -+ BasicType type = cp->basic_type_for_signature_at(signature_index); - - // Remember how many oops we encountered and compute allocation type -- BasicType type = cp->basic_type_for_signature_at(signature_index); -- FieldAllocationType atype; -- if ( is_static ) { -- switch ( type ) { -- case T_BOOLEAN: -- case T_BYTE: -- fac->static_byte_count++; -- atype = STATIC_BYTE; -- break; -- case T_LONG: -- case T_DOUBLE: -- if (Universe::field_type_should_be_aligned(type)) { -- atype = STATIC_ALIGNED_DOUBLE; -- } else { -- atype = STATIC_DOUBLE; -- } -- fac->static_double_count++; -- break; -- case T_CHAR: -- case T_SHORT: -- fac->static_short_count++; -- atype = STATIC_SHORT; -- break; -- case T_FLOAT: -- case T_INT: -- fac->static_word_count++; -- atype = STATIC_WORD; -- break; -- case T_ARRAY: -- case T_OBJECT: -- fac->static_oop_count++; -- atype = STATIC_OOP; -- break; -- case T_ADDRESS: -- case T_VOID: -- default: -- assert(0, "bad field type"); -- } -- } else { -- switch ( type ) { -- case T_BOOLEAN: -- case T_BYTE: -- fac->nonstatic_byte_count++; -- atype = NONSTATIC_BYTE; -- break; -- case T_LONG: -- case T_DOUBLE: -- if (Universe::field_type_should_be_aligned(type)) { -- atype = NONSTATIC_ALIGNED_DOUBLE; -- } else { -- atype = NONSTATIC_DOUBLE; -- } -- fac->nonstatic_double_count++; -- break; -- case T_CHAR: -- case T_SHORT: -- fac->nonstatic_short_count++; -- atype = NONSTATIC_SHORT; -- break; -- case T_FLOAT: -- case T_INT: -- fac->nonstatic_word_count++; -- atype = NONSTATIC_WORD; -- break; -- case T_ARRAY: -- case T_OBJECT: -- fac->nonstatic_oop_count++; -- atype = NONSTATIC_OOP; -- break; -- case T_ADDRESS: -- case T_VOID: -- default: -- assert(0, "bad field type"); -- } -- } -+ FieldAllocationType atype = fac->update(is_static, type); - - // The correct offset is computed later (all oop fields will be located together) - // We temporarily store the allocation type in the offset field -- fields->short_at_put(index++, atype); -- fields->short_at_put(index++, 0); // Clear out high word of byte offset -- fields->short_at_put(index++, generic_signature_index); -+ field->set_offset(atype); -+ } -+ -+ if (num_injected != 0) { -+ int index = length; -+ for (int n = 0; n < num_injected; n++) { -+ // Check for duplicates -+ if (injected[n].may_be_java) { -+ Symbol* name = injected[n].name(); -+ Symbol* signature = injected[n].signature(); -+ bool duplicate = false; -+ for (int i = 0; i < length; i++) { -+ FieldInfo* f = FieldInfo::from_field_array(fields(), i); -+ if (name == cp->symbol_at(f->name_index()) && -+ signature == cp->symbol_at(f->signature_index())) { -+ // Symbol is desclared in Java so skip this one -+ duplicate = true; -+ break; -+ } -+ } -+ if (duplicate) { -+ // These will be removed from the field array at the end -+ continue; -+ } -+ } -+ -+ // Injected field -+ FieldInfo* field = FieldInfo::from_field_array(fields(), index); -+ field->initialize(JVM_ACC_FIELD_INTERNAL, -+ injected[n].name_index, -+ injected[n].signature_index, -+ 0, -+ 0, -+ 0); -+ -+ BasicType type = FieldType::basic_type(injected[n].signature()); -+ -+ // Remember how many oops we encountered and compute allocation type -+ FieldAllocationType atype = fac->update(false, type); -+ -+ // The correct offset is computed later (all oop fields will be located together) -+ // We temporarily store the allocation type in the offset field -+ field->set_offset(atype); -+ index++; -+ } -+ -+ if (index < length + num_injected) { -+ // sometimes injected fields already exist in the Java source so -+ // the fields array could be too long. In that case trim the -+ // fields array. -+ new_fields = oopFactory::new_permanent_shortArray(index * FieldInfo::field_slots, CHECK_(nullHandle)); -+ for (int i = 0; i < index * FieldInfo::field_slots; i++) { -+ new_fields->short_at_put(i, fields->short_at(i)); -+ } -+ fields = new_fields; -+ } - } - - if (_need_verify && length > 1) { -@@ -1188,11 +1229,9 @@ - bool dup = false; - { - debug_only(No_Safepoint_Verifier nsv;) -- for (int i = 0; i < length*instanceKlass::next_offset; i += instanceKlass::next_offset) { -- int name_index = fields->ushort_at(i + instanceKlass::name_index_offset); -- Symbol* name = cp->symbol_at(name_index); -- int sig_index = fields->ushort_at(i + instanceKlass::signature_index_offset); -- Symbol* sig = cp->symbol_at(sig_index); -+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { -+ Symbol* name = fs.name(); -+ Symbol* sig = fs.signature(); - // If no duplicates, add name/signature in hashtable names_and_sigs. - if (!put_after_lookup(name, sig, names_and_sigs)) { - dup = true; -@@ -2647,227 +2686,6 @@ - } - - --void ClassFileParser::java_lang_ref_Reference_fix_pre(typeArrayHandle* fields_ptr, -- constantPoolHandle cp, FieldAllocationCount *fac_ptr, TRAPS) { -- // This code is for compatibility with earlier jdk's that do not -- // have the "discovered" field in java.lang.ref.Reference. For 1.5 -- // the check for the "discovered" field should issue a warning if -- // the field is not found. For 1.6 this code should be issue a -- // fatal error if the "discovered" field is not found. -- // -- // Increment fac.nonstatic_oop_count so that the start of the -- // next type of non-static oops leaves room for the fake oop. -- // Do not increment next_nonstatic_oop_offset so that the -- // fake oop is place after the java.lang.ref.Reference oop -- // fields. -- // -- // Check the fields in java.lang.ref.Reference for the "discovered" -- // field. If it is not present, artifically create a field for it. -- // This allows this VM to run on early JDK where the field is not -- // present. -- int reference_sig_index = 0; -- int reference_name_index = 0; -- int reference_index = 0; -- int extra = java_lang_ref_Reference::number_of_fake_oop_fields; -- const int n = (*fields_ptr)()->length(); -- for (int i = 0; i < n; i += instanceKlass::next_offset ) { -- int name_index = -- (*fields_ptr)()->ushort_at(i + instanceKlass::name_index_offset); -- int sig_index = -- (*fields_ptr)()->ushort_at(i + instanceKlass::signature_index_offset); -- Symbol* f_name = cp->symbol_at(name_index); -- Symbol* f_sig = cp->symbol_at(sig_index); -- if (f_sig == vmSymbols::reference_signature() && reference_index == 0) { -- // Save the index for reference signature for later use. -- // The fake discovered field does not entries in the -- // constant pool so the index for its signature cannot -- // be extracted from the constant pool. It will need -- // later, however. It's signature is vmSymbols::reference_signature() -- // so same an index for that signature. -- reference_sig_index = sig_index; -- reference_name_index = name_index; -- reference_index = i; -- } -- if (f_name == vmSymbols::reference_discovered_name() && -- f_sig == vmSymbols::reference_signature()) { -- // The values below are fake but will force extra -- // non-static oop fields and a corresponding non-static -- // oop map block to be allocated. -- extra = 0; -- break; -- } -- } -- if (extra != 0) { -- fac_ptr->nonstatic_oop_count += extra; -- // Add the additional entry to "fields" so that the klass -- // contains the "discoverd" field and the field will be initialized -- // in instances of the object. -- int fields_with_fix_length = (*fields_ptr)()->length() + -- instanceKlass::next_offset; -- typeArrayOop ff = oopFactory::new_permanent_shortArray( -- fields_with_fix_length, CHECK); -- typeArrayHandle fields_with_fix(THREAD, ff); -- -- // Take everything from the original but the length. -- for (int idx = 0; idx < (*fields_ptr)->length(); idx++) { -- fields_with_fix->ushort_at_put(idx, (*fields_ptr)->ushort_at(idx)); -- } -- -- // Add the fake field at the end. -- int i = (*fields_ptr)->length(); -- // There is no name index for the fake "discovered" field nor -- // signature but a signature is needed so that the field will -- // be properly initialized. Use one found for -- // one of the other reference fields. Be sure the index for the -- // name is 0. In fieldDescriptor::initialize() the index of the -- // name is checked. That check is by passed for the last nonstatic -- // oop field in a java.lang.ref.Reference which is assumed to be -- // this artificial "discovered" field. An assertion checks that -- // the name index is 0. -- assert(reference_index != 0, "Missing signature for reference"); -- -- int j; -- for (j = 0; j < instanceKlass::next_offset; j++) { -- fields_with_fix->ushort_at_put(i + j, -- (*fields_ptr)->ushort_at(reference_index +j)); -- } -- // Clear the public access flag and set the private access flag. -- short flags; -- flags = -- fields_with_fix->ushort_at(i + instanceKlass::access_flags_offset); -- assert(!(flags & JVM_RECOGNIZED_FIELD_MODIFIERS), "Unexpected access flags set"); -- flags = flags & (~JVM_ACC_PUBLIC); -- flags = flags | JVM_ACC_PRIVATE; -- AccessFlags access_flags; -- access_flags.set_flags(flags); -- assert(!access_flags.is_public(), "Failed to clear public flag"); -- assert(access_flags.is_private(), "Failed to set private flag"); -- fields_with_fix->ushort_at_put(i + instanceKlass::access_flags_offset, -- flags); -- -- assert(fields_with_fix->ushort_at(i + instanceKlass::name_index_offset) -- == reference_name_index, "The fake reference name is incorrect"); -- assert(fields_with_fix->ushort_at(i + instanceKlass::signature_index_offset) -- == reference_sig_index, "The fake reference signature is incorrect"); -- // The type of the field is stored in the low_offset entry during -- // parsing. -- assert(fields_with_fix->ushort_at(i + instanceKlass::low_offset) == -- NONSTATIC_OOP, "The fake reference type is incorrect"); -- -- // "fields" is allocated in the permanent generation. Disgard -- // it and let it be collected. -- (*fields_ptr) = fields_with_fix; -- } -- return; --} -- -- --void ClassFileParser::java_lang_Class_fix_pre(int* nonstatic_field_size, -- FieldAllocationCount *fac_ptr) { -- // Add fake fields for java.lang.Class instances -- // -- // This is not particularly nice. We should consider adding a -- // private transient object field at the Java level to -- // java.lang.Class. Alternatively we could add a subclass of -- // instanceKlass which provides an accessor and size computer for -- // this field, but that appears to be more code than this hack. -- // -- // NOTE that we wedge these in at the beginning rather than the -- // end of the object because the Class layout changed between JDK -- // 1.3 and JDK 1.4 with the new reflection implementation; some -- // nonstatic oop fields were added at the Java level. The offsets -- // of these fake fields can't change between these two JDK -- // versions because when the offsets are computed at bootstrap -- // time we don't know yet which version of the JDK we're running in. -- -- // The values below are fake but will force three non-static oop fields and -- // a corresponding non-static oop map block to be allocated. -- const int extra = java_lang_Class::number_of_fake_oop_fields; -- fac_ptr->nonstatic_oop_count += extra; -- -- // Reserve some leading space for fake ints -- *nonstatic_field_size += align_size_up(java_lang_Class::hc_number_of_fake_int_fields * BytesPerInt, heapOopSize) / heapOopSize; --} -- -- --void ClassFileParser::java_lang_Class_fix_post(int* next_nonstatic_oop_offset_ptr) { -- // Cause the extra fake fields in java.lang.Class to show up before -- // the Java fields for layout compatibility between 1.3 and 1.4 -- // Incrementing next_nonstatic_oop_offset here advances the -- // location where the real java fields are placed. -- const int extra = java_lang_Class::number_of_fake_oop_fields; -- (*next_nonstatic_oop_offset_ptr) += (extra * heapOopSize); --} -- -- --// Force MethodHandle.vmentry to be an unmanaged pointer. --// There is no way for a classfile to express this, so we must help it. --void ClassFileParser::java_dyn_MethodHandle_fix_pre(constantPoolHandle cp, -- typeArrayHandle fields, -- FieldAllocationCount *fac_ptr, -- TRAPS) { -- // Add fake fields for java.dyn.MethodHandle instances -- // -- // This is not particularly nice, but since there is no way to express -- // a native wordSize field in Java, we must do it at this level. -- -- if (!EnableMethodHandles) return; -- -- int word_sig_index = 0; -- const int cp_size = cp->length(); -- for (int index = 1; index < cp_size; index++) { -- if (cp->tag_at(index).is_utf8() && -- cp->symbol_at(index) == vmSymbols::machine_word_signature()) { -- word_sig_index = index; -- break; -- } -- } -- -- if (word_sig_index == 0) -- THROW_MSG(vmSymbols::java_lang_VirtualMachineError(), -- "missing I or J signature (for vmentry) in java.dyn.MethodHandle"); -- -- // Find vmentry field and change the signature. -- bool found_vmentry = false; -- for (int i = 0; i < fields->length(); i += instanceKlass::next_offset) { -- int name_index = fields->ushort_at(i + instanceKlass::name_index_offset); -- int sig_index = fields->ushort_at(i + instanceKlass::signature_index_offset); -- int acc_flags = fields->ushort_at(i + instanceKlass::access_flags_offset); -- Symbol* f_name = cp->symbol_at(name_index); -- Symbol* f_sig = cp->symbol_at(sig_index); -- if (f_name == vmSymbols::vmentry_name() && (acc_flags & JVM_ACC_STATIC) == 0) { -- if (f_sig == vmSymbols::machine_word_signature()) { -- // If the signature of vmentry is already changed, we're done. -- found_vmentry = true; -- break; -- } -- else if (f_sig == vmSymbols::byte_signature()) { -- // Adjust the field type from byte to an unmanaged pointer. -- assert(fac_ptr->nonstatic_byte_count > 0, ""); -- fac_ptr->nonstatic_byte_count -= 1; -- -- fields->ushort_at_put(i + instanceKlass::signature_index_offset, word_sig_index); -- assert(wordSize == longSize || wordSize == jintSize, "ILP32 or LP64"); -- if (wordSize == longSize) fac_ptr->nonstatic_double_count += 1; -- else fac_ptr->nonstatic_word_count += 1; -- -- FieldAllocationType atype = (FieldAllocationType) fields->ushort_at(i + instanceKlass::low_offset); -- assert(atype == NONSTATIC_BYTE, ""); -- FieldAllocationType new_atype = (wordSize == longSize) ? NONSTATIC_DOUBLE : NONSTATIC_WORD; -- fields->ushort_at_put(i + instanceKlass::low_offset, new_atype); -- -- found_vmentry = true; -- break; -- } -- } -- } -- -- if (!found_vmentry) -- THROW_MSG(vmSymbols::java_lang_VirtualMachineError(), -- "missing vmentry byte field in java.dyn.MethodHandle"); --} -- -- - instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, - Handle class_loader, - Handle protection_domain, -@@ -3080,10 +2898,13 @@ - local_interfaces = parse_interfaces(cp, itfs_len, class_loader, protection_domain, _class_name, CHECK_(nullHandle)); - } - -+ int java_fields_count = 0; - // Fields (offsets are filled in later) -- struct FieldAllocationCount fac = {0,0,0,0,0,0,0,0,0,0}; -+ FieldAllocationCount fac; - objArrayHandle fields_annotations; -- typeArrayHandle fields = parse_fields(cp, access_flags.is_interface(), &fac, &fields_annotations, CHECK_(nullHandle)); -+ typeArrayHandle fields = parse_fields(class_name, cp, access_flags.is_interface(), &fac, &fields_annotations, -+ &java_fields_count, -+ CHECK_(nullHandle)); - // Methods - bool has_final_method = false; - AccessFlags promoted_flags; -@@ -3201,50 +3022,33 @@ - // Calculate the starting byte offsets - next_static_oop_offset = instanceMirrorKlass::offset_of_static_fields(); - next_static_double_offset = next_static_oop_offset + -- (fac.static_oop_count * heapOopSize); -- if ( fac.static_double_count && -+ (fac.count[STATIC_OOP] * heapOopSize); -+ if ( fac.count[STATIC_DOUBLE] && - (Universe::field_type_should_be_aligned(T_DOUBLE) || - Universe::field_type_should_be_aligned(T_LONG)) ) { - next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong); - } - - next_static_word_offset = next_static_double_offset + -- (fac.static_double_count * BytesPerLong); -+ (fac.count[STATIC_DOUBLE] * BytesPerLong); - next_static_short_offset = next_static_word_offset + -- (fac.static_word_count * BytesPerInt); -+ (fac.count[STATIC_WORD] * BytesPerInt); - next_static_byte_offset = next_static_short_offset + -- (fac.static_short_count * BytesPerShort); -+ (fac.count[STATIC_SHORT] * BytesPerShort); - next_static_type_offset = align_size_up((next_static_byte_offset + -- fac.static_byte_count ), wordSize ); -+ fac.count[STATIC_BYTE] ), wordSize ); - static_field_size = (next_static_type_offset - - next_static_oop_offset) / wordSize; -+ - first_nonstatic_field_offset = instanceOopDesc::base_offset_in_bytes() + - nonstatic_field_size * heapOopSize; - next_nonstatic_field_offset = first_nonstatic_field_offset; - -- // Add fake fields for java.lang.Class instances (also see below) -- if (class_name == vmSymbols::java_lang_Class() && class_loader.is_null()) { -- java_lang_Class_fix_pre(&methods, &fac, CHECK_(nullHandle)); -- } -- -- // adjust the vmentry field declaration in java.dyn.MethodHandle -- if (EnableMethodHandles && class_name == vmSymbols::sun_dyn_MethodHandleImpl() && class_loader.is_null()) { -- java_dyn_MethodHandle_fix_pre(cp, fields, &fac, CHECK_(nullHandle)); -- } -- -- // Add a fake "discovered" field if it is not present -- // for compatibility with earlier jdk's. -- if (class_name == vmSymbols::java_lang_ref_Reference() -- && class_loader.is_null()) { -- java_lang_ref_Reference_fix_pre(&fields, cp, &fac, CHECK_(nullHandle)); -- } -- // end of "discovered" field compactibility fix -- -- unsigned int nonstatic_double_count = fac.nonstatic_double_count; -- unsigned int nonstatic_word_count = fac.nonstatic_word_count; -- unsigned int nonstatic_short_count = fac.nonstatic_short_count; -- unsigned int nonstatic_byte_count = fac.nonstatic_byte_count; -- unsigned int nonstatic_oop_count = fac.nonstatic_oop_count; -+ unsigned int nonstatic_double_count = fac.count[NONSTATIC_DOUBLE]; -+ unsigned int nonstatic_word_count = fac.count[NONSTATIC_WORD]; -+ unsigned int nonstatic_short_count = fac.count[NONSTATIC_SHORT]; -+ unsigned int nonstatic_byte_count = fac.count[NONSTATIC_BYTE]; -+ unsigned int nonstatic_oop_count = fac.count[NONSTATIC_OOP]; - - bool super_has_nonstatic_fields = - (super_klass() != NULL && super_klass->has_nonstatic_fields()); -@@ -3264,20 +3068,7 @@ - nonstatic_oop_counts = NEW_RESOURCE_ARRAY_IN_THREAD( - THREAD, unsigned int, nonstatic_oop_count + 1); - -- // Add fake fields for java.lang.Class instances (also see above). -- // FieldsAllocationStyle and CompactFields values will be reset to default. -- if(class_name == vmSymbols::java_lang_Class() && class_loader.is_null()) { -- java_lang_Class_fix_post(&next_nonstatic_field_offset); -- nonstatic_oop_offsets[0] = first_nonstatic_field_offset; -- const uint fake_oop_count = (next_nonstatic_field_offset - -- first_nonstatic_field_offset) / heapOopSize; -- nonstatic_oop_counts[0] = fake_oop_count; -- nonstatic_oop_map_count = 1; -- nonstatic_oop_count -= fake_oop_count; -- first_nonstatic_oop_offset = first_nonstatic_field_offset; -- } else { -- first_nonstatic_oop_offset = 0; // will be set for first oop field -- } -+ first_nonstatic_oop_offset = 0; // will be set for first oop field - - #ifndef PRODUCT - if( PrintCompactFieldsSavings ) { -@@ -3432,10 +3223,9 @@ - // Iterate over fields again and compute correct offsets. - // The field allocation type was temporarily stored in the offset slot. - // oop fields are located before non-oop fields (static and non-static). -- int len = fields->length(); -- for (int i = 0; i < len; i += instanceKlass::next_offset) { -+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { - int real_offset; -- FieldAllocationType atype = (FieldAllocationType) fields->ushort_at(i + instanceKlass::low_offset); -+ FieldAllocationType atype = (FieldAllocationType) fs.offset(); - switch (atype) { - case STATIC_OOP: - real_offset = next_static_oop_offset; -@@ -3453,7 +3243,6 @@ - real_offset = next_static_word_offset; - next_static_word_offset += BytesPerInt; - break; -- case STATIC_ALIGNED_DOUBLE: - case STATIC_DOUBLE: - real_offset = next_static_double_offset; - next_static_double_offset += BytesPerLong; -@@ -3515,7 +3304,6 @@ - next_nonstatic_word_offset += BytesPerInt; - } - break; -- case NONSTATIC_ALIGNED_DOUBLE: - case NONSTATIC_DOUBLE: - real_offset = next_nonstatic_double_offset; - next_nonstatic_double_offset += BytesPerLong; -@@ -3523,8 +3311,7 @@ - default: - ShouldNotReachHere(); - } -- fields->short_at_put(i + instanceKlass::low_offset, extract_low_short_from_int(real_offset)); -- fields->short_at_put(i + instanceKlass::high_offset, extract_high_short_from_int(real_offset)); -+ fs.set_offset(real_offset); - } - - // Size of instances -@@ -3571,12 +3358,12 @@ - this_klass->set_class_loader(class_loader()); - this_klass->set_nonstatic_field_size(nonstatic_field_size); - this_klass->set_has_nonstatic_fields(has_nonstatic_fields); -- this_klass->set_static_oop_field_count(fac.static_oop_count); -+ this_klass->set_static_oop_field_count(fac.count[STATIC_OOP]); - cp->set_pool_holder(this_klass()); - error_handler.set_in_error(false); // turn off error handler for cp - this_klass->set_constants(cp()); - this_klass->set_local_interfaces(local_interfaces()); -- this_klass->set_fields(fields()); -+ this_klass->set_fields(fields(), java_fields_count); - this_klass->set_methods(methods()); - if (has_final_method) { - this_klass->set_has_final_method(); -diff --git a/src/share/vm/classfile/classFileParser.hpp b/src/share/vm/classfile/classFileParser.hpp ---- openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp -@@ -33,6 +33,9 @@ - #include "utilities/accessFlags.hpp" - - class TempNewSymbol; -+class FieldAllocationCount; -+ -+ - // Parser for for .class files - // - // The bytes describing the class file structure is read from a Stream object -@@ -84,9 +87,11 @@ - bool* is_synthetic_addr, - u2* generic_signature_index_addr, - typeArrayHandle* field_annotations, TRAPS); -- typeArrayHandle parse_fields(constantPoolHandle cp, bool is_interface, -- struct FieldAllocationCount *fac, -- objArrayHandle* fields_annotations, TRAPS); -+ typeArrayHandle parse_fields(Symbol* class_name, -+ constantPoolHandle cp, bool is_interface, -+ FieldAllocationCount *fac, -+ objArrayHandle* fields_annotations, -+ int* java_fields_count_ptr, TRAPS); - - // Method parsing - methodHandle parse_method(constantPoolHandle cp, bool is_interface, -@@ -150,25 +155,6 @@ - objArrayHandle compute_transitive_interfaces(instanceKlassHandle super, - objArrayHandle local_ifs, TRAPS); - -- // Special handling for certain classes. -- // Add the "discovered" field to java.lang.ref.Reference if -- // it does not exist. -- void java_lang_ref_Reference_fix_pre(typeArrayHandle* fields_ptr, -- constantPoolHandle cp, -- FieldAllocationCount *fac_ptr, TRAPS); -- // Adjust the field allocation counts for java.lang.Class to add -- // fake fields. -- void java_lang_Class_fix_pre(int* nonstatic_field_size, -- FieldAllocationCount *fac_ptr); -- // Adjust the next_nonstatic_oop_offset to place the fake fields -- // before any Java fields. -- void java_lang_Class_fix_post(int* next_nonstatic_oop_offset); -- // Adjust the field allocation counts for java.dyn.MethodHandle to add -- // a fake address (void*) field. -- void java_dyn_MethodHandle_fix_pre(constantPoolHandle cp, -- typeArrayHandle fields, -- FieldAllocationCount *fac_ptr, TRAPS); -- - // Format checker methods - void classfile_parse_error(const char* msg, TRAPS); - void classfile_parse_error(const char* msg, int index, TRAPS); -diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -@@ -32,6 +32,7 @@ - #include "memory/oopFactory.hpp" - #include "memory/resourceArea.hpp" - #include "memory/universe.inline.hpp" -+#include "oops/fieldStreams.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/instanceMirrorKlass.hpp" - #include "oops/klass.hpp" -@@ -57,6 +58,49 @@ - # include "thread_windows.inline.hpp" - #endif - -+#define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ -+ klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); -+ -+#define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java) \ -+ { SystemDictionary::WK_KLASS_ENUM_NAME(klass), vmSymbols::VM_SYMBOL_ENUM_NAME(name##_name), vmSymbols::VM_SYMBOL_ENUM_NAME(signature), may_be_java }, -+ -+InjectedField JavaClasses::_injected_fields[] = { -+ ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD) -+}; -+ -+int JavaClasses::compute_injected_offset(InjectedFieldID id) { -+ return _injected_fields[id].compute_offset(); -+} -+ -+ -+InjectedField* JavaClasses::get_injected(Symbol* class_name, int* field_count) { -+ *field_count = 0; -+ -+ vmSymbols::SID sid = vmSymbols::find_sid(class_name); -+ if (sid == vmSymbols::NO_SID) { -+ // Only well known classes can inject fields -+ return NULL; -+ } -+ -+ int count = 0; -+ int start = -1; -+ -+#define LOOKUP_INJECTED_FIELD(klass, name, signature, may_be_java) \ -+ if (sid == vmSymbols::VM_SYMBOL_ENUM_NAME(klass)) { \ -+ count++; \ -+ if (start == -1) start = klass##_##name##_enum; \ -+ } -+ ALL_INJECTED_FIELDS(LOOKUP_INJECTED_FIELD); -+#undef LOOKUP_INJECTED_FIELD -+ -+ if (start != -1) { -+ *field_count = count; -+ return _injected_fields + start; -+ } -+ return NULL; -+} -+ -+ - static bool find_field(instanceKlass* ik, - Symbol* name_symbol, Symbol* signature_symbol, - fieldDescriptor* fd, -@@ -440,24 +484,19 @@ - } - - --// During bootstrap, java.lang.Class wasn't loaded so static field --// offsets were computed without the size added it. Go back and --// update all the static field offsets to included the size. --static void fixup_static_field(fieldDescriptor* fd, TRAPS) { -- if (fd->is_static()) { -- int real_offset = fd->offset() + instanceMirrorKlass::offset_of_static_fields(); -- typeArrayOop fields = instanceKlass::cast(fd->field_holder())->fields(); -- fields->short_at_put(fd->index() + instanceKlass::low_offset, extract_low_short_from_int(real_offset)); -- fields->short_at_put(fd->index() + instanceKlass::high_offset, extract_high_short_from_int(real_offset)); -- } --} -- - void java_lang_Class::fixup_mirror(KlassHandle k, TRAPS) { - assert(instanceMirrorKlass::offset_of_static_fields() != 0, "must have been computed already"); - - if (k->oop_is_instance()) { -- // Fixup the offsets -- instanceKlass::cast(k())->do_local_static_fields(&fixup_static_field, CHECK); -+ // During bootstrap, java.lang.Class wasn't loaded so static field -+ // offsets were computed without the size added it. Go back and -+ // update all the static field offsets to included the size. -+ for (JavaFieldStream fs(instanceKlass::cast(k())); !fs.done(); fs.next()) { -+ if (fs.access_flags().is_static()) { -+ int real_offset = fs.offset() + instanceMirrorKlass::offset_of_static_fields(); -+ fs.set_offset(real_offset); -+ } -+ } - } - create_mirror(k, CHECK); - } -@@ -474,7 +513,7 @@ - // Allocate mirror (java.lang.Class instance) - Handle mirror = instanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(k, CHECK_0); - // Setup indirections -- mirror->obj_field_put(klass_offset, k()); -+ mirror->obj_field_put(_klass_offset, k()); - k->set_java_mirror(mirror()); - - instanceMirrorKlass* mk = instanceMirrorKlass::cast(mirror->klass()); -@@ -516,25 +555,22 @@ - - - int java_lang_Class::oop_size(oop java_class) { -- assert(oop_size_offset != 0, "must be set"); -- return java_class->int_field(oop_size_offset); -+ assert(_oop_size_offset != 0, "must be set"); -+ return java_class->int_field(_oop_size_offset); - } - void java_lang_Class::set_oop_size(oop java_class, int size) { -- assert(oop_size_offset != 0, "must be set"); -- java_class->int_field_put(oop_size_offset, size); -+ assert(_oop_size_offset != 0, "must be set"); -+ java_class->int_field_put(_oop_size_offset, size); - } - int java_lang_Class::static_oop_field_count(oop java_class) { -- assert(static_oop_field_count_offset != 0, "must be set"); -- return java_class->int_field(static_oop_field_count_offset); -+ assert(_static_oop_field_count_offset != 0, "must be set"); -+ return java_class->int_field(_static_oop_field_count_offset); - } - void java_lang_Class::set_static_oop_field_count(oop java_class, int size) { -- assert(static_oop_field_count_offset != 0, "must be set"); -- java_class->int_field_put(static_oop_field_count_offset, size); -+ assert(_static_oop_field_count_offset != 0, "must be set"); -+ java_class->int_field_put(_static_oop_field_count_offset, size); - } - -- -- -- - oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) { - // This should be improved by adding a field at the Java level or by - // introducing a new VM klass (see comment in ClassFileParser) -@@ -554,7 +590,7 @@ - klassOop java_lang_Class::as_klassOop(oop java_class) { - //%note memory_2 - assert(java_lang_Class::is_instance(java_class), "must be a Class object"); -- klassOop k = klassOop(java_class->obj_field(klass_offset)); -+ klassOop k = klassOop(java_class->obj_field(_klass_offset)); - assert(k == NULL || k->is_klass(), "type check"); - return k; - } -@@ -610,7 +646,7 @@ - - - klassOop java_lang_Class::array_klass(oop java_class) { -- klassOop k = klassOop(java_class->obj_field(array_klass_offset)); -+ klassOop k = klassOop(java_class->obj_field(_array_klass_offset)); - assert(k == NULL || k->is_klass() && Klass::cast(k)->oop_is_javaArray(), "should be array klass"); - return k; - } -@@ -618,12 +654,12 @@ - - void java_lang_Class::set_array_klass(oop java_class, klassOop klass) { - assert(klass->is_klass() && Klass::cast(klass)->oop_is_javaArray(), "should be array klass"); -- java_class->obj_field_put(array_klass_offset, klass); -+ java_class->obj_field_put(_array_klass_offset, klass); - } - - - methodOop java_lang_Class::resolved_constructor(oop java_class) { -- oop constructor = java_class->obj_field(resolved_constructor_offset); -+ oop constructor = java_class->obj_field(_resolved_constructor_offset); - assert(constructor == NULL || constructor->is_method(), "should be method"); - return methodOop(constructor); - } -@@ -631,21 +667,21 @@ - - void java_lang_Class::set_resolved_constructor(oop java_class, methodOop constructor) { - assert(constructor->is_method(), "should be method"); -- java_class->obj_field_put(resolved_constructor_offset, constructor); -+ java_class->obj_field_put(_resolved_constructor_offset, constructor); - } - - - bool java_lang_Class::is_primitive(oop java_class) { - // should assert: - //assert(java_lang_Class::is_instance(java_class), "must be a Class object"); -- klassOop k = klassOop(java_class->obj_field(klass_offset)); -+ klassOop k = klassOop(java_class->obj_field(_klass_offset)); - return k == NULL; - } - - - BasicType java_lang_Class::primitive_type(oop java_class) { - assert(java_lang_Class::is_primitive(java_class), "just checking"); -- klassOop ak = klassOop(java_class->obj_field(array_klass_offset)); -+ klassOop ak = klassOop(java_class->obj_field(_array_klass_offset)); - BasicType type = T_VOID; - if (ak != NULL) { - // Note: create_basic_type_mirror above initializes ak to a non-null value. -@@ -680,34 +716,18 @@ - - bool java_lang_Class::offsets_computed = false; - int java_lang_Class::classRedefinedCount_offset = -1; --int java_lang_Class::parallelCapable_offset = -1; - - void java_lang_Class::compute_offsets() { - assert(!offsets_computed, "offsets should be initialized only once"); - offsets_computed = true; - -- klassOop k = SystemDictionary::Class_klass(); -+ klassOop klass_oop = SystemDictionary::Class_klass(); - // The classRedefinedCount field is only present starting in 1.5, - // so don't go fatal. - compute_optional_offset(classRedefinedCount_offset, -- k, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature()); -- -- // The field indicating parallelCapable (parallelLockMap) is only present starting in 7, -- klassOop k1 = SystemDictionary::ClassLoader_klass(); -- compute_optional_offset(parallelCapable_offset, -- k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature()); --} -- --// For class loader classes, parallelCapable defined --// based on non-null field --// Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it --bool java_lang_Class::parallelCapable(oop class_loader) { -- if (!JDK_Version::is_gte_jdk17x_version() -- || parallelCapable_offset == -1) { -- // Default for backward compatibility is false -- return false; -- } -- return (class_loader->obj_field(parallelCapable_offset) != NULL); -+ klass_oop, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature()); -+ -+ CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); - } - - int java_lang_Class::classRedefinedCount(oop the_class_mirror) { -@@ -2605,6 +2625,7 @@ - compute_optional_offset(_erasedType_offset, k, vmSymbols::erasedType_name(), vmSymbols::java_dyn_MethodType_signature(), true); - compute_optional_offset(_genericInvoker_offset, k, vmSymbols::genericInvoker_name(), vmSymbols::java_dyn_MethodHandle_signature(), true); - if (_genericInvoker_offset == 0) _genericInvoker_offset = -1; // set to explicit "empty" value -+ METHODTYPEFORM_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); - } - } - -@@ -2722,6 +2743,18 @@ - - - // Support for java_lang_ClassLoader -+bool java_lang_ClassLoader::offsets_computed = false; -+int java_lang_ClassLoader::parallelCapable_offset = -1; -+ -+void java_lang_ClassLoader::compute_offsets() { -+ assert(!offsets_computed, "offsets should be initialized only once"); -+ offsets_computed = true; -+ -+ // The field indicating parallelCapable (parallelLockMap) is only present starting in 7, -+ klassOop k1 = SystemDictionary::ClassLoader_klass(); -+ compute_optional_offset(parallelCapable_offset, -+ k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature()); -+} - - oop java_lang_ClassLoader::parent(oop loader) { - assert(loader->is_oop(), "loader must be oop"); -@@ -2729,6 +2762,18 @@ - } - - -+// For class loader classes, parallelCapable defined -+// based on non-null field -+// Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it -+bool java_lang_ClassLoader::parallelCapable(oop class_loader) { -+ if (!JDK_Version::is_gte_jdk17x_version() -+ || parallelCapable_offset == -1) { -+ // Default for backward compatibility is false -+ return false; -+ } -+ return (class_loader->obj_field(parallelCapable_offset) != NULL); -+} -+ - bool java_lang_ClassLoader::is_trusted_loader(oop loader) { - // Fix for 4474172; see evaluation for more details - loader = non_reflection_class_loader(loader); -@@ -2787,12 +2832,11 @@ - int java_lang_String::offset_offset; - int java_lang_String::count_offset; - int java_lang_String::hash_offset; --int java_lang_Class::klass_offset; --int java_lang_Class::array_klass_offset; --int java_lang_Class::resolved_constructor_offset; --int java_lang_Class::number_of_fake_oop_fields; --int java_lang_Class::oop_size_offset; --int java_lang_Class::static_oop_field_count_offset; -+int java_lang_Class::_klass_offset; -+int java_lang_Class::_array_klass_offset; -+int java_lang_Class::_resolved_constructor_offset; -+int java_lang_Class::_oop_size_offset; -+int java_lang_Class::_static_oop_field_count_offset; - int java_lang_Throwable::backtrace_offset; - int java_lang_Throwable::detailMessage_offset; - int java_lang_Throwable::cause_offset; -@@ -2905,20 +2949,20 @@ - - - void java_nio_Buffer::compute_offsets() { -- klassOop k = SystemDictionary::java_nio_Buffer_klass(); -+ klassOop k = SystemDictionary::nio_Buffer_klass(); - assert(k != NULL, "must be loaded in 1.4+"); - compute_offset(_limit_offset, k, vmSymbols::limit_name(), vmSymbols::int_signature()); - } - - // Support for intrinsification of sun.misc.AtomicLongCSImpl.attemptUpdate - int sun_misc_AtomicLongCSImpl::value_offset() { -- assert(SystemDictionary::sun_misc_AtomicLongCSImpl_klass() != NULL, "can't call this"); -+ assert(SystemDictionary::AtomicLongCSImpl_klass() != NULL, "can't call this"); - return _value_offset; - } - - - void sun_misc_AtomicLongCSImpl::compute_offsets() { -- klassOop k = SystemDictionary::sun_misc_AtomicLongCSImpl_klass(); -+ klassOop k = SystemDictionary::AtomicLongCSImpl_klass(); - // If this class is not present, its value field offset won't be referenced. - if (k != NULL) { - compute_offset(_value_offset, k, vmSymbols::value_name(), vmSymbols::long_signature()); -@@ -2953,23 +2997,6 @@ - java_lang_String::count_offset = java_lang_String::offset_offset + sizeof (jint); - java_lang_String::hash_offset = java_lang_String::count_offset + sizeof (jint); - -- { -- // Do the Class Class -- int offset = header; -- java_lang_Class::oop_size_offset = header; -- offset += BytesPerInt; -- java_lang_Class::static_oop_field_count_offset = offset; -- offset = align_size_up(offset + BytesPerInt, x); -- java_lang_Class::klass_offset = offset; -- offset += x; -- java_lang_Class::array_klass_offset = offset; -- offset += x; -- java_lang_Class::resolved_constructor_offset = offset; -- } -- -- // This is NOT an offset -- java_lang_Class::number_of_fake_oop_fields = java_lang_Class::hc_number_of_fake_oop_fields; -- - // Throwable Class - java_lang_Throwable::backtrace_offset = java_lang_Throwable::hc_backtrace_offset * x + header; - java_lang_Throwable::detailMessage_offset = java_lang_Throwable::hc_detailMessage_offset * x + header; -@@ -3021,8 +3048,8 @@ - - // Compute non-hard-coded field offsets of all the classes in this file - void JavaClasses::compute_offsets() { -- -- java_lang_Class::compute_offsets(); -+ // java_lang_Class::compute_offsets was called earlier in bootstrap -+ java_lang_ClassLoader::compute_offsets(); - java_lang_Thread::compute_offsets(); - java_lang_ThreadGroup::compute_offsets(); - if (EnableMethodHandles) { -@@ -3249,6 +3276,23 @@ - - #endif // PRODUCT - -+int InjectedField::compute_offset() { -+ klassOop klass_oop = klass(); -+ for (AllFieldStream fs(instanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { -+ if (!may_be_java && !fs.access_flags().is_internal()) { -+ // Only look at injected fields -+ continue; -+ } -+ if (fs.name() == name() && fs.signature() == signature()) { -+ return fs.offset(); -+ } -+ } -+ ResourceMark rm; -+ tty->print_cr("Invalid layout of %s at %s", instanceKlass::cast(klass_oop)->external_name(), name()->as_C_string()); -+ fatal("Invalid layout of preloaded class"); -+ return -1; -+} -+ - void javaClasses_init() { - JavaClasses::compute_offsets(); - JavaClasses::check_offsets(); -diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -@@ -156,30 +156,32 @@ - - // Interface to java.lang.Class objects - -+#define CLASS_INJECTED_FIELDS(macro) \ -+ macro(java_lang_Class, klass, object_signature, false) \ -+ macro(java_lang_Class, resolved_constructor, object_signature, false) \ -+ macro(java_lang_Class, array_klass, object_signature, false) \ -+ macro(java_lang_Class, oop_size, int_signature, false) \ -+ macro(java_lang_Class, static_oop_field_count, int_signature, false) -+ - class java_lang_Class : AllStatic { -- friend class VMStructs; -+ friend class VMStructs; -+ - private: - // The fake offsets are added by the class loader when java.lang.Class is loaded - -- enum { -- hc_number_of_fake_oop_fields = 3, -- hc_number_of_fake_int_fields = 2 -- }; -+ static int _klass_offset; -+ static int _resolved_constructor_offset; -+ static int _array_klass_offset; - -- static int klass_offset; -- static int resolved_constructor_offset; -- static int array_klass_offset; -- static int number_of_fake_oop_fields; -+ static int _oop_size_offset; -+ static int _static_oop_field_count_offset; - -- static int oop_size_offset; -- static int static_oop_field_count_offset; -- -- static void compute_offsets(); - static bool offsets_computed; - static int classRedefinedCount_offset; -- static int parallelCapable_offset; - - public: -+ static void compute_offsets(); -+ - // Instance creation - static oop create_mirror(KlassHandle k, TRAPS); - static void fixup_mirror(KlassHandle k, TRAPS); -@@ -209,14 +211,12 @@ - static klassOop array_klass(oop java_class); - static void set_array_klass(oop java_class, klassOop klass); - // compiler support for class operations -- static int klass_offset_in_bytes() { return klass_offset; } -- static int resolved_constructor_offset_in_bytes() { return resolved_constructor_offset; } -- static int array_klass_offset_in_bytes() { return array_klass_offset; } -+ static int klass_offset_in_bytes() { return _klass_offset; } -+ static int resolved_constructor_offset_in_bytes() { return _resolved_constructor_offset; } -+ static int array_klass_offset_in_bytes() { return _array_klass_offset; } - // Support for classRedefinedCount field - static int classRedefinedCount(oop the_class_mirror); - static void set_classRedefinedCount(oop the_class_mirror, int value); -- // Support for parallelCapable field -- static bool parallelCapable(oop the_class_mirror); - - static int oop_size(oop java_class); - static void set_oop_size(oop java_class, int size); -@@ -828,16 +828,19 @@ - - // Interface to java.dyn.MethodHandle objects - -+#define METHODHANDLE_INJECTED_FIELDS(macro) \ -+ macro(java_dyn_MethodHandle, vmentry, intptr_signature, false) \ -+ macro(java_dyn_MethodHandle, vmtarget, object_signature, true) -+ - class MethodHandleEntry; - - class java_dyn_MethodHandle: AllStatic { - friend class JavaClasses; - - private: -- static int _vmentry_offset; // assembly code trampoline for MH -- static int _vmtarget_offset; // class-specific target reference -+ static int _vmentry_offset; // assembly code trampoline for MH -+ static int _vmtarget_offset; // class-specific target reference - static int _type_offset; // the MethodType of this MH -- static int _vmslots_offset; // OPTIONAL hoisted type.form.vmslots - - static void compute_offsets(); - -@@ -853,8 +856,6 @@ - static void set_vmentry(oop mh, MethodHandleEntry* data); - - static int vmslots(oop mh); -- static void init_vmslots(oop mh); -- static int compute_vmslots(oop mh); - - // Testers - static bool is_subclass(klassOop klass) { -@@ -868,14 +869,15 @@ - static int type_offset_in_bytes() { return _type_offset; } - static int vmtarget_offset_in_bytes() { return _vmtarget_offset; } - static int vmentry_offset_in_bytes() { return _vmentry_offset; } -- static int vmslots_offset_in_bytes() { return _vmslots_offset; } - }; - -+#define DIRECTMETHODHANDLE_INJECTED_FIELDS(macro) \ -+ macro(java_dyn_DirectMethodHandle, vmindex, int_signature, true) -+ - class sun_dyn_DirectMethodHandle: public java_dyn_MethodHandle { - friend class JavaClasses; - - private: -- // _vmtarget_offset; // method or class or interface - static int _vmindex_offset; // negative or vtable idx or itable idx - static void compute_offsets(); - -@@ -977,6 +979,9 @@ - // Interface to sun.dyn.MemberName objects - // (These are a private interface for Java code to query the class hierarchy.) - -+#define MEMBERNAME_INJECTED_FIELDS(macro) \ -+ macro(sun_dyn_MemberName, vmtarget, object_signature, true) -+ - class sun_dyn_MemberName: AllStatic { - friend class JavaClasses; - -@@ -1084,6 +1089,10 @@ - static int form_offset_in_bytes() { return _form_offset; } - }; - -+#define METHODTYPEFORM_INJECTED_FIELDS(macro) \ -+ macro(java_dyn_MethodTypeForm, vmslots, int_signature, true) \ -+ macro(java_dyn_MethodTypeForm, vmlayout, object_signature, true) -+ - class java_dyn_MethodTypeForm: AllStatic { - friend class JavaClasses; - -@@ -1097,6 +1106,8 @@ - public: - // Accessors - static int vmslots(oop mtform); -+ static void set_vmslots(oop mtform, int vmslots); -+ - static oop erasedType(oop mtform); - static oop genericInvoker(oop mtform); - -@@ -1114,8 +1125,6 @@ - - private: - static int _target_offset; -- static int _caller_method_offset; -- static int _caller_bci_offset; - - static void compute_offsets(); - -@@ -1124,12 +1133,6 @@ - static oop target(oop site); - static void set_target(oop site, oop target); - -- static oop caller_method(oop site); -- static void set_caller_method(oop site, oop ref); -- -- static jint caller_bci(oop site); -- static void set_caller_bci(oop site, jint bci); -- - // Testers - static bool is_subclass(klassOop klass) { - return Klass::cast(klass)->is_subclass_of(SystemDictionary::CallSite_klass()); -@@ -1140,8 +1143,6 @@ - - // Accessors for code generation: - static int target_offset_in_bytes() { return _target_offset; } -- static int caller_method_offset_in_bytes() { return _caller_method_offset; } -- static int caller_bci_offset_in_bytes() { return _caller_bci_offset; } - }; - - -@@ -1175,11 +1176,18 @@ - hc_parent_offset = 0 - }; - -+ static bool offsets_computed; - static int parent_offset; -+ static int parallelCapable_offset; -+ -+ static void compute_offsets(); - - public: - static oop parent(oop loader); - -+ // Support for parallelCapable field -+ static bool parallelCapable(oop the_class_mirror); -+ - static bool is_trusted_loader(oop loader); - - // Fix for 4474172 -@@ -1308,17 +1316,71 @@ - static oop get_owner_threadObj(oop obj); - }; - -+// Use to declare fields that need to be injected into Java classes -+// for the JVM to use. The name_index and signature_index are -+// declared in vmSymbols. The may_be_java flag is used to declare -+// fields that might already exist in Java but should be injected if -+// they don't. Otherwise the field is unconditionally injected and -+// the JVM uses the injected one. This is to ensure that name -+// collisions don't occur. In general may_be_java should be false -+// unless there's a good reason. -+ -+class InjectedField { -+ public: -+ const SystemDictionary::WKID klass_id; -+ const vmSymbols::SID name_index; -+ const vmSymbols::SID signature_index; -+ const bool may_be_java; -+ -+ -+ klassOop klass() const { return SystemDictionary::well_known_klass(klass_id); } -+ Symbol* name() const { return lookup_symbol(name_index); } -+ Symbol* signature() const { return lookup_symbol(signature_index); } -+ -+ int compute_offset(); -+ -+ // Find the Symbol for this index -+ static Symbol* lookup_symbol(int symbol_index) { -+ return vmSymbols::symbol_at((vmSymbols::SID)symbol_index); -+ } -+}; -+ -+#define DECLARE_INJECTED_FIELD_ENUM(klass, name, signature, may_be_java) \ -+ klass##_##name##_enum, -+ -+#define ALL_INJECTED_FIELDS(macro) \ -+ CLASS_INJECTED_FIELDS(macro) \ -+ METHODHANDLE_INJECTED_FIELDS(macro) \ -+ DIRECTMETHODHANDLE_INJECTED_FIELDS(macro) \ -+ MEMBERNAME_INJECTED_FIELDS(macro) \ -+ METHODTYPEFORM_INJECTED_FIELDS(macro) -+ - // Interface to hard-coded offset checking - - class JavaClasses : AllStatic { - private: -+ -+ static InjectedField _injected_fields[]; -+ - static bool check_offset(const char *klass_name, int offset, const char *field_name, const char* field_sig) PRODUCT_RETURN0; - static bool check_static_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) PRODUCT_RETURN0; - static bool check_constant(const char *klass_name, int constant, const char *field_name, const char* field_sig) PRODUCT_RETURN0; -+ - public: -+ enum InjectedFieldID { -+ ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD_ENUM) -+ MAX_enum -+ }; -+ -+ static int compute_injected_offset(InjectedFieldID id); -+ - static void compute_hard_coded_offsets(); - static void compute_offsets(); - static void check_offsets() PRODUCT_RETURN; -+ -+ static InjectedField* get_injected(Symbol* class_name, int* field_count); - }; - -+#undef DECLARE_INJECTED_FIELD_ENUM -+ - #endif // SHARE_VM_CLASSFILE_JAVACLASSES_HPP -diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp ---- openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp -+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -125,13 +125,13 @@ - bool SystemDictionary::is_parallelCapable(Handle class_loader) { - if (UnsyncloadClass || class_loader.is_null()) return true; - if (AlwaysLockClassLoader) return false; -- return java_lang_Class::parallelCapable(class_loader()); -+ return java_lang_ClassLoader::parallelCapable(class_loader()); - } - // ---------------------------------------------------------------------------- - // ParallelDefineClass flag does not apply to bootclass loader - bool SystemDictionary::is_parallelDefine(Handle class_loader) { - if (class_loader.is_null()) return false; -- if (AllowParallelDefineClass && java_lang_Class::parallelCapable(class_loader())) { -+ if (AllowParallelDefineClass && java_lang_ClassLoader::parallelCapable(class_loader())) { - return true; - } - return false; -@@ -1280,7 +1280,7 @@ - Symbol* class_name, - TRAPS) { - -- klassOop dlm = SystemDictionary::sun_jkernel_DownloadManager_klass(); -+ klassOop dlm = SystemDictionary::DownloadManager_klass(); - instanceKlassHandle nk; - - // If download manager class isn't loaded just return. -@@ -1941,7 +1941,7 @@ - // first do Object, String, Class - initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); - -- debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(Class_klass))); -+ java_lang_Class::compute_offsets(); - - // Fixup mirrors for classes loaded before java.lang.Class. - // These calls iterate over the objects currently in the perm gen -@@ -1999,7 +1999,7 @@ - //_box_klasses[T_ARRAY] = WK_KLASS(object_klass); - - #ifdef KERNEL -- if (sun_jkernel_DownloadManager_klass() == NULL) { -+ if (DownloadManager_klass() == NULL) { - warning("Cannot find sun/jkernel/DownloadManager"); - } - #endif // KERNEL -@@ -2740,7 +2740,7 @@ - class_size += ik->local_interfaces()->size(); - class_size += ik->transitive_interfaces()->size(); - // We do not have to count implementors, since we only store one! -- class_size += ik->fields()->size(); -+ class_size += ik->all_fields_count() * FieldInfo::field_slots; - } - } - -diff --git a/src/share/vm/classfile/systemDictionary.hpp b/src/share/vm/classfile/systemDictionary.hpp ---- openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp -+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp -@@ -133,15 +133,15 @@ - template(reflect_Method_klass, java_lang_reflect_Method, Pre) \ - template(reflect_Constructor_klass, java_lang_reflect_Constructor, Pre) \ - \ -- /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \ -- /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ -- /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ -- template(reflect_MagicAccessorImpl_klass, sun_reflect_MagicAccessorImpl, Opt) \ -- template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \ -- template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \ -- template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \ -- template(reflect_ConstantPool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \ -- template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \ -+ /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \ -+ /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ -+ /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ -+ template(reflect_MagicAccessorImpl_klass, sun_reflect_MagicAccessorImpl, Opt) \ -+ template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \ -+ template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \ -+ template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \ -+ template(reflect_ConstantPool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \ -+ template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \ - \ - /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \ - template(MethodHandle_klass, java_dyn_MethodHandle, Opt) \ -@@ -165,14 +165,14 @@ - template(StackTraceElement_klass, java_lang_StackTraceElement, Opt) \ - /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ - /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ -- template(java_nio_Buffer_klass, java_nio_Buffer, Opt) \ -+ template(nio_Buffer_klass, java_nio_Buffer, Opt) \ - \ - /* If this class isn't present, it won't be referenced. */ \ -- template(sun_misc_AtomicLongCSImpl_klass, sun_misc_AtomicLongCSImpl, Opt) \ -+ template(AtomicLongCSImpl_klass, sun_misc_AtomicLongCSImpl, Opt) \ - \ -- template(sun_jkernel_DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \ -+ template(DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \ - \ -- template(sun_misc_PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt) \ -+ template(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt) \ - \ - /* Preload boxing klasses */ \ - template(Boolean_klass, java_lang_Boolean, Pre) \ -@@ -196,7 +196,7 @@ - enum WKID { - NO_WKID = 0, - -- #define WK_KLASS_ENUM(name, ignore_s, ignore_o) WK_KLASS_ENUM_NAME(name), -+ #define WK_KLASS_ENUM(name, symbol, ignore_o) WK_KLASS_ENUM_NAME(name), WK_KLASS_ENUM_NAME(symbol) = WK_KLASS_ENUM_NAME(name), - WK_KLASSES_DO(WK_KLASS_ENUM) - #undef WK_KLASS_ENUM - -@@ -421,11 +421,16 @@ - } - - public: -- #define WK_KLASS_DECLARE(name, ignore_symbol, option) \ -+ #define WK_KLASS_DECLARE(name, symbol, option) \ - static klassOop name() { return check_klass_##option(_well_known_klasses[WK_KLASS_ENUM_NAME(name)]); } - WK_KLASSES_DO(WK_KLASS_DECLARE); - #undef WK_KLASS_DECLARE - -+ static klassOop well_known_klass(WKID id) { -+ assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); -+ return _well_known_klasses[id]; -+ } -+ - // Local definition for direct access to the private array: - #define WK_KLASS(name) _well_known_klasses[SystemDictionary::WK_KLASS_ENUM_NAME(name)] - -diff --git a/src/share/vm/classfile/vmSymbols.hpp b/src/share/vm/classfile/vmSymbols.hpp ---- openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp -+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp -@@ -258,8 +258,8 @@ - template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/dyn/MethodHandle;") \ - template(makeDynamicCallSite_name, "makeDynamicCallSite") \ - template(makeDynamicCallSite_signature, "(Ljava/dyn/MethodHandle;Ljava/lang/String;Ljava/dyn/MethodType;Ljava/lang/Object;Lsun/dyn/MemberName;I)Ljava/dyn/CallSite;") \ -- NOT_LP64( do_alias(machine_word_signature, int_signature) ) \ -- LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \ -+ NOT_LP64( do_alias(intptr_signature, int_signature) ) \ -+ LP64_ONLY( do_alias(intptr_signature, long_signature) ) \ - \ - /* common method and field names */ \ - template(object_initializer_name, "<init>") \ -@@ -356,6 +356,11 @@ - template(erasedType_name, "erasedType") \ - template(genericInvoker_name, "genericInvoker") \ - template(append_name, "append") \ -+ template(klass_name, "klass") \ -+ template(resolved_constructor_name, "resolved_constructor") \ -+ template(array_klass_name, "array_klass") \ -+ template(oop_size_name, "oop_size") \ -+ template(static_oop_field_count_name, "static_oop_field_count") \ - \ - /* non-intrinsic name/signature pairs: */ \ - template(register_method_name, "register") \ -diff --git a/src/share/vm/interpreter/interpreterRuntime.cpp b/src/share/vm/interpreter/interpreterRuntime.cpp ---- openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp -+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp -@@ -976,11 +976,8 @@ - // check the access_flags for the field in the klass - - instanceKlass* ik = instanceKlass::cast(java_lang_Class::as_klassOop(cp_entry->f1())); -- typeArrayOop fields = ik->fields(); - int index = cp_entry->field_index(); -- assert(index < fields->length(), "holders field index is out of range"); -- // bail out if field accesses are not watched -- if ((fields->ushort_at(index) & JVM_ACC_FIELD_ACCESS_WATCHED) == 0) return; -+ if ((ik->field_access_flags(index) & JVM_ACC_FIELD_ACCESS_WATCHED) == 0) return; - - switch(cp_entry->flag_state()) { - case btos: // fall through -@@ -1013,11 +1010,9 @@ - - // check the access_flags for the field in the klass - instanceKlass* ik = instanceKlass::cast(k); -- typeArrayOop fields = ik->fields(); - int index = cp_entry->field_index(); -- assert(index < fields->length(), "holders field index is out of range"); - // bail out if field modifications are not watched -- if ((fields->ushort_at(index) & JVM_ACC_FIELD_MODIFICATION_WATCHED) == 0) return; -+ if ((ik->field_access_flags(index) & JVM_ACC_FIELD_MODIFICATION_WATCHED) == 0) return; - - char sig_type = '\0'; - -diff --git a/src/share/vm/oops/cpCacheOop.cpp b/src/share/vm/oops/cpCacheOop.cpp ---- openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp -+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp -@@ -128,17 +128,13 @@ - void ConstantPoolCacheEntry::set_field(Bytecodes::Code get_code, - Bytecodes::Code put_code, - KlassHandle field_holder, -- int orig_field_index, -+ int field_index, - int field_offset, - TosState field_type, - bool is_final, - bool is_volatile) { - set_f1(field_holder()->java_mirror()); - set_f2(field_offset); -- // The field index is used by jvm/ti and is the index into fields() array -- // in holder instanceKlass. This is scaled by instanceKlass::next_offset. -- assert((orig_field_index % instanceKlass::next_offset) == 0, "wierd index"); -- const int field_index = orig_field_index / instanceKlass::next_offset; - assert(field_index <= field_index_mask, - "field index does not fit in low flag bits"); - set_flags(as_flags(field_type, is_final, false, is_volatile, false, false) | -@@ -149,7 +145,7 @@ - } - - int ConstantPoolCacheEntry::field_index() const { -- return (_flags & field_index_mask) * instanceKlass::next_offset; -+ return (_flags & field_index_mask); - } - - void ConstantPoolCacheEntry::set_method(Bytecodes::Code invoke_code, -diff --git a/src/share/vm/oops/fieldInfo.hpp b/src/share/vm/oops/fieldInfo.hpp -new file mode 100644 ---- /dev/null -+++ openjdk/hotspot/src/share/vm/oops/fieldInfo.hpp -@@ -0,0 +1,132 @@ -+/* -+ * 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. -+ * -+ */ -+ -+#ifndef SHARE_VM_OOPS_FIELDINFO_HPP -+#define SHARE_VM_OOPS_FIELDINFO_HPP -+ -+#include "oops/typeArrayOop.hpp" -+#include "classfile/vmSymbols.hpp" -+ -+// This class represents the field information contained in the fields -+// array of an instanceKlass. Currently it's laid on top an array of -+// Java shorts but in the future it could simply be used as a real -+// array type. FieldInfo generally shouldn't be used directly. -+// Fields should be queried either through instanceKlass or through -+// the various FieldStreams. -+class FieldInfo VALUE_OBJ_CLASS_SPEC { -+ friend class fieldDescriptor; -+ friend class JavaFieldStream; -+ friend class ClassFileParser; -+ -+ public: -+ // fields -+ // Field info extracted from the class file and stored -+ // as an array of 7 shorts -+ enum FieldOffset { -+ access_flags_offset = 0, -+ name_index_offset = 1, -+ signature_index_offset = 2, -+ initval_index_offset = 3, -+ low_offset = 4, -+ high_offset = 5, -+ generic_signature_offset = 6, -+ field_slots = 7 -+ }; -+ -+ private: -+ u2 _shorts[field_slots]; -+ -+ void set_name_index(u2 val) { _shorts[name_index_offset] = val; } -+ void set_signature_index(u2 val) { _shorts[signature_index_offset] = val; } -+ void set_initval_index(u2 val) { _shorts[initval_index_offset] = val; } -+ void set_generic_signature_index(u2 val) { _shorts[generic_signature_offset] = val; } -+ -+ u2 name_index() const { return _shorts[name_index_offset]; } -+ u2 signature_index() const { return _shorts[signature_index_offset]; } -+ u2 initval_index() const { return _shorts[initval_index_offset]; } -+ u2 generic_signature_index() const { return _shorts[generic_signature_offset]; } -+ -+ public: -+ static FieldInfo* from_field_array(typeArrayOop fields, int index) { -+ return ((FieldInfo*)fields->short_at_addr(index * field_slots)); -+ } -+ -+ void initialize(u2 access_flags, -+ u2 name_index, -+ u2 signature_index, -+ u2 initval_index, -+ u2 generic_signature_index, -+ u4 offset) { -+ _shorts[access_flags_offset] = access_flags; -+ _shorts[name_index_offset] = name_index; -+ _shorts[signature_index_offset] = signature_index; -+ _shorts[initval_index_offset] = initval_index; -+ _shorts[generic_signature_offset] = generic_signature_index; -+ set_offset(offset); -+ } -+ -+ u2 access_flags() const { return _shorts[access_flags_offset]; } -+ u4 offset() const { return build_int_from_shorts(_shorts[low_offset], _shorts[high_offset]); } -+ -+ Symbol* name(constantPoolHandle cp) const { -+ int index = name_index(); -+ if (is_internal()) { -+ return lookup_symbol(index); -+ } -+ return cp->symbol_at(index); -+ } -+ -+ Symbol* signature(constantPoolHandle cp) const { -+ int index = signature_index(); -+ if (is_internal()) { -+ return lookup_symbol(index); -+ } -+ return cp->symbol_at(index); -+ } -+ -+ Symbol* generic_signature(constantPoolHandle cp) const { -+ int index = generic_signature_index(); -+ if (index == 0) { -+ return NULL; -+ } -+ return cp->symbol_at(index); -+ } -+ -+ void set_access_flags(u2 val) { _shorts[access_flags_offset] = val; } -+ void set_offset(u4 val) { -+ _shorts[low_offset] = extract_low_short_from_int(val); -+ _shorts[high_offset] = extract_high_short_from_int(val); -+ } -+ -+ bool is_internal() const { -+ return (access_flags() & JVM_ACC_FIELD_INTERNAL) != 0; -+ } -+ -+ Symbol* lookup_symbol(int symbol_index) const { -+ assert(is_internal(), "only internal fields"); -+ return vmSymbols::symbol_at((vmSymbols::SID)symbol_index); -+ } -+}; -+ -+#endif // SHARE_VM_OOPS_FIELDINFO_HPP -diff --git a/src/share/vm/oops/fieldStreams.hpp b/src/share/vm/oops/fieldStreams.hpp -new file mode 100644 ---- /dev/null -+++ openjdk/hotspot/src/share/vm/oops/fieldStreams.hpp -@@ -0,0 +1,174 @@ -+/* -+ * 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. -+ * -+ */ -+ -+#ifndef SHARE_VM_OOPS_FIELDSTREAMS_HPP -+#define SHARE_VM_OOPS_FIELDSTREAMS_HPP -+ -+#include "oops/instanceKlass.hpp" -+#include "oops/fieldInfo.hpp" -+ -+// The is the base class for iteration over the fields array -+// describing the declared fields in the class. Several subclasses -+// are provided depending on the kind of iteration required. The -+// JavaFieldStream is for iterating over regular Java fields and it -+// generally the preferred iterator. InternalFieldStream only -+// iterates over fields that have been injected by the JVM. -+// AllFieldStream exposes all fields and should only be used in rare -+// cases. -+class FieldStreamBase : public StackObj { -+ protected: -+ typeArrayHandle _fields; -+ constantPoolHandle _constants; -+ int _index; -+ int _limit; -+ -+ FieldInfo* field() const { return FieldInfo::from_field_array(_fields(), _index); } -+ -+ FieldStreamBase(typeArrayHandle fields, constantPoolHandle constants, int start, int limit) { -+ _fields = fields; -+ _constants = constants; -+ _index = start; -+ _limit = limit; -+ } -+ -+ FieldStreamBase(typeArrayHandle fields, constantPoolHandle constants) { -+ _fields = fields; -+ _constants = constants; -+ _index = 0; -+ _limit = fields->length() / FieldInfo::field_slots; -+ } -+ -+ public: -+ FieldStreamBase(instanceKlass* klass) { -+ _fields = klass->fields(); -+ _constants = klass->constants(); -+ _index = 0; -+ _limit = klass->java_fields_count(); -+ } -+ FieldStreamBase(instanceKlassHandle klass) { -+ _fields = klass->fields(); -+ _constants = klass->constants(); -+ _index = 0; -+ _limit = klass->java_fields_count(); -+ } -+ -+ // accessors -+ int index() const { return _index; } -+ -+ void next() { _index += 1; } -+ bool done() const { return _index >= _limit; } -+ -+ // Accessors for current field -+ AccessFlags access_flags() const { -+ AccessFlags flags; -+ flags.set_flags(field()->access_flags()); -+ return flags; -+ } -+ -+ void set_access_flags(u2 flags) const { -+ field()->set_access_flags(flags); -+ } -+ -+ void set_access_flags(AccessFlags flags) const { -+ set_access_flags(flags.as_short()); -+ } -+ -+ Symbol* name() const { -+ return field()->name(_constants); -+ } -+ -+ Symbol* signature() const { -+ return field()->signature(_constants); -+ } -+ -+ Symbol* generic_signature() const { -+ return field()->generic_signature(_constants); -+ } -+ -+ int offset() const { -+ return field()->offset(); -+ } -+ -+ void set_offset(int offset) { -+ field()->set_offset(offset); -+ } -+}; -+ -+// Iterate over only the internal fields -+class JavaFieldStream : public FieldStreamBase { -+ public: -+ JavaFieldStream(instanceKlass* k): FieldStreamBase(k->fields(), k->constants(), 0, k->java_fields_count()) {} -+ JavaFieldStream(instanceKlassHandle k): FieldStreamBase(k->fields(), k->constants(), 0, k->java_fields_count()) {} -+ -+ int name_index() const { -+ assert(!field()->is_internal(), "regular only"); -+ return field()->name_index(); -+ } -+ void set_name_index(int index) { -+ assert(!field()->is_internal(), "regular only"); -+ field()->set_name_index(index); -+ } -+ int signature_index() const { -+ assert(!field()->is_internal(), "regular only"); -+ return field()->signature_index(); -+ } -+ void set_signature_index(int index) { -+ assert(!field()->is_internal(), "regular only"); -+ field()->set_signature_index(index); -+ } -+ int generic_signature_index() const { -+ assert(!field()->is_internal(), "regular only"); -+ return field()->generic_signature_index(); -+ } -+ void set_generic_signature_index(int index) { -+ assert(!field()->is_internal(), "regular only"); -+ field()->set_generic_signature_index(index); -+ } -+ int initval_index() const { -+ assert(!field()->is_internal(), "regular only"); -+ return field()->initval_index(); -+ } -+ void set_initval_index(int index) { -+ assert(!field()->is_internal(), "regular only"); -+ return field()->set_initval_index(index); -+ } -+}; -+ -+ -+// Iterate over only the internal fields -+class InternalFieldStream : public FieldStreamBase { -+ public: -+ InternalFieldStream(instanceKlass* k): FieldStreamBase(k->fields(), k->constants(), k->java_fields_count(), k->all_fields_count()) {} -+ InternalFieldStream(instanceKlassHandle k): FieldStreamBase(k->fields(), k->constants(), k->java_fields_count(), k->all_fields_count()) {} -+}; -+ -+ -+class AllFieldStream : public FieldStreamBase { -+ public: -+ AllFieldStream(typeArrayHandle fields, constantPoolHandle constants): FieldStreamBase(fields, constants) {} -+ AllFieldStream(instanceKlass* k): FieldStreamBase(k->fields(), k->constants()) {} -+ AllFieldStream(instanceKlassHandle k): FieldStreamBase(k->fields(), k->constants()) {} -+}; -+ -+#endif // SHARE_VM_OOPS_FIELDSTREAMS_HPP -diff --git a/src/share/vm/oops/instanceKlass.cpp b/src/share/vm/oops/instanceKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp -@@ -36,6 +36,7 @@ - #include "memory/genOopClosures.inline.hpp" - #include "memory/oopFactory.hpp" - #include "memory/permGen.hpp" -+#include "oops/fieldStreams.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/instanceMirrorKlass.hpp" - #include "oops/instanceOop.hpp" -@@ -774,14 +775,11 @@ - - - bool instanceKlass::find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { -- const int n = fields()->length(); -- for (int i = 0; i < n; i += next_offset ) { -- int name_index = fields()->ushort_at(i + name_index_offset); -- int sig_index = fields()->ushort_at(i + signature_index_offset); -- Symbol* f_name = constants()->symbol_at(name_index); -- Symbol* f_sig = constants()->symbol_at(sig_index); -+ for (JavaFieldStream fs(as_klassOop()); !fs.done(); fs.next()) { -+ Symbol* f_name = fs.name(); -+ Symbol* f_sig = fs.signature(); - if (f_name == name && f_sig == sig) { -- fd->initialize(as_klassOop(), i); -+ fd->initialize(as_klassOop(), fs.index()); - return true; - } - } -@@ -795,11 +793,10 @@ - closure->do_symbol(&_source_file_name); - closure->do_symbol(&_source_debug_extension); - -- const int n = fields()->length(); -- for (int i = 0; i < n; i += next_offset ) { -- int name_index = fields()->ushort_at(i + name_index_offset); -+ for (JavaFieldStream fs(this); !fs.done(); fs.next()) { -+ int name_index = fs.name_index(); - closure->do_symbol(constants()->symbol_at_addr(name_index)); -- int sig_index = fields()->ushort_at(i + signature_index_offset); -+ int sig_index = fs.signature_index(); - closure->do_symbol(constants()->symbol_at_addr(sig_index)); - } - } -@@ -864,10 +861,9 @@ - - - bool instanceKlass::find_local_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const { -- int length = fields()->length(); -- for (int i = 0; i < length; i += next_offset) { -- if (offset_from_fields( i ) == offset) { -- fd->initialize(as_klassOop(), i); -+ for (JavaFieldStream fs(as_klassOop()); !fs.done(); fs.next()) { -+ if (fs.offset() == offset) { -+ fd->initialize(as_klassOop(), fs.index()); - if (fd->is_static() == is_static) return true; - } - } -@@ -898,11 +894,12 @@ - - - void instanceKlass::do_local_static_fields(FieldClosure* cl) { -- fieldDescriptor fd; -- int length = fields()->length(); -- for (int i = 0; i < length; i += next_offset) { -- fd.initialize(as_klassOop(), i); -- if (fd.is_static()) cl->do_field(&fd); -+ for (JavaFieldStream fs(this); !fs.done(); fs.next()) { -+ if (fs.access_flags().is_static()) { -+ fieldDescriptor fd; -+ fd.initialize(as_klassOop(), fs.index()); -+ cl->do_field(&fd); -+ } - } - } - -@@ -914,11 +911,12 @@ - - - void instanceKlass::do_local_static_fields_impl(instanceKlassHandle this_oop, void f(fieldDescriptor* fd, TRAPS), TRAPS) { -- fieldDescriptor fd; -- int length = this_oop->fields()->length(); -- for (int i = 0; i < length; i += next_offset) { -- fd.initialize(this_oop(), i); -- if (fd.is_static()) { f(&fd, CHECK); } // Do NOT remove {}! (CHECK macro expands into several statements) -+ for (JavaFieldStream fs(this_oop()); !fs.done(); fs.next()) { -+ if (fs.access_flags().is_static()) { -+ fieldDescriptor fd; -+ fd.initialize(this_oop(), fs.index()); -+ f(&fd, CHECK); -+ } - } - } - -@@ -933,11 +931,11 @@ - super->do_nonstatic_fields(cl); - } - fieldDescriptor fd; -- int length = fields()->length(); -+ int length = java_fields_count(); - // In DebugInfo nonstatic fields are sorted by offset. - int* fields_sorted = NEW_C_HEAP_ARRAY(int, 2*(length+1)); - int j = 0; -- for (int i = 0; i < length; i += next_offset) { -+ for (int i = 0; i < length; i += 1) { - fd.initialize(as_klassOop(), i); - if (!fd.is_static()) { - fields_sorted[j + 0] = fd.offset(); -@@ -2412,43 +2410,6 @@ - oop_oop_iterate(obj, &blk); - } - --#ifndef PRODUCT -- --void instanceKlass::verify_class_klass_nonstatic_oop_maps(klassOop k) { -- // This verification code is disabled. JDK_Version::is_gte_jdk14x_version() -- // cannot be called since this function is called before the VM is -- // able to determine what JDK version is running with. -- // The check below always is false since 1.4. -- return; -- -- // This verification code temporarily disabled for the 1.4 -- // reflection implementation since java.lang.Class now has -- // Java-level instance fields. Should rewrite this to handle this -- // case. -- if (!(JDK_Version::is_gte_jdk14x_version() && UseNewReflection)) { -- // Verify that java.lang.Class instances have a fake oop field added. -- instanceKlass* ik = instanceKlass::cast(k); -- -- // Check that we have the right class -- static bool first_time = true; -- guarantee(k == SystemDictionary::Class_klass() && first_time, "Invalid verify of maps"); -- first_time = false; -- const int extra = java_lang_Class::number_of_fake_oop_fields; -- guarantee(ik->nonstatic_field_size() == extra, "just checking"); -- guarantee(ik->nonstatic_oop_map_count() == 1, "just checking"); -- guarantee(ik->size_helper() == align_object_size(instanceOopDesc::header_size() + extra), "just checking"); -- -- // Check that the map is (2,extra) -- int offset = java_lang_Class::klass_offset; -- -- OopMapBlock* map = ik->start_of_nonstatic_oop_maps(); -- guarantee(map->offset() == offset && map->count() == (unsigned int) extra, -- "sanity"); -- } --} -- --#endif // ndef PRODUCT -- - // JNIid class for jfieldIDs only - // Note to reviewers: - // These JNI functions are just moved over to column 1 and not changed -diff --git a/src/share/vm/oops/instanceKlass.hpp b/src/share/vm/oops/instanceKlass.hpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp -@@ -27,6 +27,7 @@ - - #include "oops/constMethodOop.hpp" - #include "oops/constantPoolOop.hpp" -+#include "oops/fieldInfo.hpp" - #include "oops/instanceOop.hpp" - #include "oops/klassOop.hpp" - #include "oops/klassVtable.hpp" -@@ -230,6 +231,7 @@ - int _static_field_size; // number words used by static fields (oop and non-oop) in this klass - int _static_oop_field_count;// number of static oop fields in this klass - int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks -+ int _java_fields_count; // The number of declared Java fields - bool _is_marked_dependent; // used for marking during flushing and deoptimization - bool _rewritten; // methods rewritten. - bool _has_nonstatic_fields; // for sizing with UseCompressedOops -@@ -309,28 +311,29 @@ - objArrayOop transitive_interfaces() const { return _transitive_interfaces; } - void set_transitive_interfaces(objArrayOop a) { oop_store_without_check((oop*) &_transitive_interfaces, (oop) a); } - -- // fields -- // Field info extracted from the class file and stored -- // as an array of 7 shorts -- enum FieldOffset { -- access_flags_offset = 0, -- name_index_offset = 1, -- signature_index_offset = 2, -- initval_index_offset = 3, -- low_offset = 4, -- high_offset = 5, -- generic_signature_offset = 6, -- next_offset = 7 -- }; -+ private: -+ friend class fieldDescriptor; -+ FieldInfo* field(int index) const { return FieldInfo::from_field_array(_fields, index); } -+ -+ public: -+ int field_offset (int index) const { return field(index)->offset(); } -+ int field_access_flags(int index) const { return field(index)->access_flags(); } -+ Symbol* field_name (int index) const { return field(index)->name(constants()); } -+ Symbol* field_signature (int index) const { return field(index)->signature(constants()); } -+ -+ // Number of Java declared fields -+ int java_fields_count() const { return _java_fields_count; } -+ -+ // Number of fields including any injected fields -+ int all_fields_count() const { return _fields->length() / sizeof(FieldInfo::field_slots); } - - typeArrayOop fields() const { return _fields; } -- int offset_from_fields( int index ) const { -- return build_int_from_shorts( fields()->ushort_at(index + low_offset), -- fields()->ushort_at(index + high_offset) ); -+ -+ void set_fields(typeArrayOop f, int java_fields_count) { -+ oop_store_without_check((oop*) &_fields, (oop) f); -+ _java_fields_count = java_fields_count; - } - -- void set_fields(typeArrayOop f) { oop_store_without_check((oop*) &_fields, (oop) f); } -- - // inner classes - typeArrayOop inner_classes() const { return _inner_classes; } - void set_inner_classes(typeArrayOop f) { oop_store_without_check((oop*) &_inner_classes, (oop) f); } -@@ -846,10 +849,6 @@ - // Verification - const char* internal_name() const; - void oop_verify_on(oop obj, outputStream* st); -- --#ifndef PRODUCT -- static void verify_class_klass_nonstatic_oop_maps(klassOop k) PRODUCT_RETURN; --#endif - }; - - inline methodOop instanceKlass::method_at_vtable(int index) { -diff --git a/src/share/vm/oops/instanceKlassKlass.cpp b/src/share/vm/oops/instanceKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -@@ -426,7 +426,7 @@ - ik->set_local_interfaces(NULL); - ik->set_transitive_interfaces(NULL); - ik->init_implementor(); -- ik->set_fields(NULL); -+ ik->set_fields(NULL, 0); - ik->set_constants(NULL); - ik->set_class_loader(NULL); - ik->set_protection_domain(NULL); -diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp ---- openjdk/hotspot/src/share/vm/prims/jni.cpp -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp -@@ -498,7 +498,7 @@ - - // First check if this is a static field - if (modifiers & JVM_ACC_STATIC) { -- intptr_t offset = instanceKlass::cast(k1())->offset_from_fields( slot ); -+ intptr_t offset = instanceKlass::cast(k1())->field_offset( slot ); - JNIid* id = instanceKlass::cast(k1())->jni_id_for(offset); - assert(id != NULL, "corrupt Field object"); - debug_only(id->set_is_static_field_id();) -@@ -510,7 +510,7 @@ - // The slot is the index of the field description in the field-array - // The jfieldID is the offset of the field within the object - // It may also have hash bits for k, if VerifyJNIFields is turned on. -- intptr_t offset = instanceKlass::cast(k1())->offset_from_fields( slot ); -+ intptr_t offset = instanceKlass::cast(k1())->field_offset( slot ); - assert(instanceKlass::cast(k1())->contains_field_offset(offset), "stay within object"); - ret = jfieldIDWorkaround::to_instance_jfieldID(k1(), offset); - return ret; -diff --git a/src/share/vm/prims/jvm.cpp b/src/share/vm/prims/jvm.cpp ---- openjdk/hotspot/src/share/vm/prims/jvm.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp -@@ -32,6 +32,7 @@ - #include "gc_interface/collectedHeap.inline.hpp" - #include "memory/oopFactory.hpp" - #include "memory/universe.inline.hpp" -+#include "oops/fieldStreams.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/objArrayKlass.hpp" - #include "prims/jvm.h" -@@ -1562,7 +1563,7 @@ - - fieldDescriptor fd; - KlassHandle kh(THREAD, k); -- intptr_t offset = instanceKlass::cast(kh())->offset_from_fields(slot); -+ intptr_t offset = instanceKlass::cast(kh())->field_offset(slot); - - if (modifiers & JVM_ACC_STATIC) { - // for static fields we only look in the current class -@@ -1662,9 +1663,6 @@ - // Ensure class is linked - k->link_class(CHECK_NULL); - -- typeArrayHandle fields(THREAD, k->fields()); -- int fields_len = fields->length(); -- - // 4496456 We need to filter out java.lang.Throwable.backtrace - bool skip_backtrace = false; - -@@ -1673,12 +1671,11 @@ - - if (publicOnly) { - num_fields = 0; -- for (int i = 0, j = 0; i < fields_len; i += instanceKlass::next_offset, j++) { -- int mods = fields->ushort_at(i + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS; -- if (mods & JVM_ACC_PUBLIC) ++num_fields; -+ for (JavaFieldStream fs(k()); !fs.done(); fs.next()) { -+ if (fs.access_flags().is_public()) ++num_fields; - } - } else { -- num_fields = fields_len / instanceKlass::next_offset; -+ num_fields = k->java_fields_count(); - - if (k() == SystemDictionary::Throwable_klass()) { - num_fields--; -@@ -1691,16 +1688,15 @@ - - int out_idx = 0; - fieldDescriptor fd; -- for (int i = 0; i < fields_len; i += instanceKlass::next_offset) { -+ for (JavaFieldStream fs(k); !fs.done(); fs.next()) { - if (skip_backtrace) { - // 4496456 skip java.lang.Throwable.backtrace -- int offset = k->offset_from_fields(i); -+ int offset = fs.offset(); - if (offset == java_lang_Throwable::get_backtrace_offset()) continue; - } - -- int mods = fields->ushort_at(i + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS; -- if (!publicOnly || (mods & JVM_ACC_PUBLIC)) { -- fd.initialize(k(), i); -+ if (!publicOnly || fs.access_flags().is_public()) { -+ fd.initialize(k(), fs.index()); - oop field = Reflection::new_field(&fd, UseNewReflection, CHECK_NULL); - result->obj_at_put(out_idx, field); - ++out_idx; -@@ -2188,7 +2184,7 @@ - k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread); - if (!Klass::cast(k)->oop_is_instance()) - return 0; -- return instanceKlass::cast(k)->fields()->length() / instanceKlass::next_offset; -+ return instanceKlass::cast(k)->java_fields_count(); - JVM_END - - -@@ -2284,8 +2280,7 @@ - JVMWrapper("JVM_GetFieldIxModifiers"); - klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls)); - k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread); -- typeArrayOop fields = instanceKlass::cast(k)->fields(); -- return fields->ushort_at(field_index * instanceKlass::next_offset + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS; -+ return instanceKlass::cast(k)->field_access_flags(field_index) & JVM_RECOGNIZED_FIELD_MODIFIERS; - JVM_END - - -@@ -2468,7 +2463,7 @@ - JVM_END - - --JVM_QUICK_ENTRY(jint, JVM_GetCPFieldModifiers(JNIEnv *env, jclass cls, int cp_index, jclass called_cls)) -+JVM_ENTRY(jint, JVM_GetCPFieldModifiers(JNIEnv *env, jclass cls, int cp_index, jclass called_cls)) - JVMWrapper("JVM_GetCPFieldModifiers"); - klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls)); - klassOop k_called = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(called_cls)); -@@ -2480,12 +2475,9 @@ - case JVM_CONSTANT_Fieldref: { - Symbol* name = cp->uncached_name_ref_at(cp_index); - Symbol* signature = cp->uncached_signature_ref_at(cp_index); -- typeArrayOop fields = instanceKlass::cast(k_called)->fields(); -- int fields_count = fields->length(); -- for (int i = 0; i < fields_count; i += instanceKlass::next_offset) { -- if (cp_called->symbol_at(fields->ushort_at(i + instanceKlass::name_index_offset)) == name && -- cp_called->symbol_at(fields->ushort_at(i + instanceKlass::signature_index_offset)) == signature) { -- return fields->ushort_at(i + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS; -+ for (JavaFieldStream fs(k_called); !fs.done(); fs.next()) { -+ if (fs.name() == name && fs.signature() == signature) { -+ return fs.access_flags().as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS; - } - } - return -1; -diff --git a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp -@@ -25,6 +25,7 @@ - #include "precompiled.hpp" - #include "classfile/symbolTable.hpp" - #include "interpreter/bytecodeStream.hpp" -+#include "oops/fieldStreams.hpp" - #include "prims/jvmtiClassFileReconstituter.hpp" - #include "runtime/signature.hpp" - #ifdef TARGET_ARCH_x86 -@@ -46,25 +47,22 @@ - // JVMSpec| field_info fields[fields_count]; - void JvmtiClassFileReconstituter::write_field_infos() { - HandleMark hm(thread()); -- typeArrayHandle fields(thread(), ikh()->fields()); -- int fields_length = fields->length(); -- int num_fields = fields_length / instanceKlass::next_offset; - objArrayHandle fields_anno(thread(), ikh()->fields_annotations()); - -- write_u2(num_fields); -- for (int index = 0; index < fields_length; index += instanceKlass::next_offset) { -- AccessFlags access_flags; -- int flags = fields->ushort_at(index + instanceKlass::access_flags_offset); -- access_flags.set_flags(flags); -- int name_index = fields->ushort_at(index + instanceKlass::name_index_offset); -- int signature_index = fields->ushort_at(index + instanceKlass::signature_index_offset); -- int initial_value_index = fields->ushort_at(index + instanceKlass::initval_index_offset); -+ // Compute the real number of Java fields -+ int java_fields = ikh()->java_fields_count(); -+ -+ write_u2(java_fields * FieldInfo::field_slots); -+ for (JavaFieldStream fs(ikh()); !fs.done(); fs.next()) { -+ AccessFlags access_flags = fs.access_flags(); -+ int name_index = fs.name_index(); -+ int signature_index = fs.signature_index(); -+ int initial_value_index = fs.initval_index(); - guarantee(name_index != 0 && signature_index != 0, "bad constant pool index for field"); -- int offset = ikh()->offset_from_fields( index ); -- int generic_signature_index = -- fields->ushort_at(index + instanceKlass::generic_signature_offset); -+ // int offset = ikh()->field_offset( index ); -+ int generic_signature_index = fs.generic_signature_index(); - typeArrayHandle anno(thread(), fields_anno.not_null() ? -- (typeArrayOop)(fields_anno->obj_at(index / instanceKlass::next_offset)) : -+ (typeArrayOop)(fields_anno->obj_at(fs.index())) : - (typeArrayOop)NULL); - - // JVMSpec| field_info { -@@ -75,7 +73,7 @@ - // JVMSpec| attribute_info attributes[attributes_count]; - // JVMSpec| } - -- write_u2(flags & JVM_RECOGNIZED_FIELD_MODIFIERS); -+ write_u2(access_flags.as_int() & JVM_RECOGNIZED_FIELD_MODIFIERS); - write_u2(name_index); - write_u2(signature_index); - int attr_count = 0; -diff --git a/src/share/vm/prims/jvmtiEnv.cpp b/src/share/vm/prims/jvmtiEnv.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp -@@ -2044,7 +2044,6 @@ - // make sure we haven't set this watch before - if (fdesc_ptr->is_field_access_watched()) return JVMTI_ERROR_DUPLICATE; - fdesc_ptr->set_is_field_access_watched(true); -- update_klass_field_access_flag(fdesc_ptr); - - JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_ACCESS, true); - -@@ -2057,7 +2056,6 @@ - // make sure we have a watch to clear - if (!fdesc_ptr->is_field_access_watched()) return JVMTI_ERROR_NOT_FOUND; - fdesc_ptr->set_is_field_access_watched(false); -- update_klass_field_access_flag(fdesc_ptr); - - JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_ACCESS, false); - -@@ -2070,7 +2068,6 @@ - // make sure we haven't set this watch before - if (fdesc_ptr->is_field_modification_watched()) return JVMTI_ERROR_DUPLICATE; - fdesc_ptr->set_is_field_modification_watched(true); -- update_klass_field_access_flag(fdesc_ptr); - - JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_MODIFICATION, true); - -@@ -2083,7 +2080,6 @@ - // make sure we have a watch to clear - if (!fdesc_ptr->is_field_modification_watched()) return JVMTI_ERROR_NOT_FOUND; - fdesc_ptr->set_is_field_modification_watched(false); -- update_klass_field_access_flag(fdesc_ptr); - - JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_MODIFICATION, false); - -diff --git a/src/share/vm/prims/jvmtiEnvBase.cpp b/src/share/vm/prims/jvmtiEnvBase.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp -@@ -565,15 +565,6 @@ - } - - --// update the access_flags for the field in the klass --void --JvmtiEnvBase::update_klass_field_access_flag(fieldDescriptor *fd) { -- instanceKlass* ik = instanceKlass::cast(fd->field_holder()); -- typeArrayOop fields = ik->fields(); -- fields->ushort_at_put(fd->index(), (jushort)fd->access_flags().as_short()); --} -- -- - // return the vframe on the specified thread and depth, NULL if no such frame - vframe* - JvmtiEnvBase::vframeFor(JavaThread* java_thread, jint depth) { -diff --git a/src/share/vm/prims/jvmtiEnvBase.hpp b/src/share/vm/prims/jvmtiEnvBase.hpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp -@@ -267,8 +267,6 @@ - // convert to a jni jclass from a non-null klassOop - jclass get_jni_class_non_null(klassOop k); - -- void update_klass_field_access_flag(fieldDescriptor *fd); -- - jint count_locked_objects(JavaThread *java_thread, Handle hobj); - jvmtiError get_locked_objects_in_frame(JavaThread *calling_thread, - JavaThread* java_thread, -diff --git a/src/share/vm/prims/jvmtiRedefineClasses.cpp b/src/share/vm/prims/jvmtiRedefineClasses.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp -+++ openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp -@@ -30,6 +30,7 @@ - #include "interpreter/rewriter.hpp" - #include "memory/gcLocker.hpp" - #include "memory/universe.inline.hpp" -+#include "oops/fieldStreams.hpp" - #include "oops/klassVtable.hpp" - #include "prims/jvmtiImpl.hpp" - #include "prims/jvmtiRedefineClasses.hpp" -@@ -551,41 +552,35 @@ - - // Check if the number, names, types and order of fields declared in these classes - // are the same. -- typeArrayOop k_old_fields = the_class->fields(); -- typeArrayOop k_new_fields = scratch_class->fields(); -- int n_fields = k_old_fields->length(); -- if (n_fields != k_new_fields->length()) { -- return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; -- } -- -- for (i = 0; i < n_fields; i += instanceKlass::next_offset) { -+ JavaFieldStream old_fs(the_class); -+ JavaFieldStream new_fs(scratch_class); -+ for (; !old_fs.done() && !new_fs.done(); old_fs.next(), new_fs.next()) { - // access -- old_flags = k_old_fields->ushort_at(i + instanceKlass::access_flags_offset); -- new_flags = k_new_fields->ushort_at(i + instanceKlass::access_flags_offset); -+ old_flags = old_fs.access_flags().as_short(); -+ new_flags = new_fs.access_flags().as_short(); - if ((old_flags ^ new_flags) & JVM_RECOGNIZED_FIELD_MODIFIERS) { - return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; - } - // offset -- if (k_old_fields->short_at(i + instanceKlass::low_offset) != -- k_new_fields->short_at(i + instanceKlass::low_offset) || -- k_old_fields->short_at(i + instanceKlass::high_offset) != -- k_new_fields->short_at(i + instanceKlass::high_offset)) { -+ if (old_fs.offset() != new_fs.offset()) { - return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; - } - // name and signature -- jshort name_index = k_old_fields->short_at(i + instanceKlass::name_index_offset); -- jshort sig_index = k_old_fields->short_at(i +instanceKlass::signature_index_offset); -- Symbol* name_sym1 = the_class->constants()->symbol_at(name_index); -- Symbol* sig_sym1 = the_class->constants()->symbol_at(sig_index); -- name_index = k_new_fields->short_at(i + instanceKlass::name_index_offset); -- sig_index = k_new_fields->short_at(i + instanceKlass::signature_index_offset); -- Symbol* name_sym2 = scratch_class->constants()->symbol_at(name_index); -- Symbol* sig_sym2 = scratch_class->constants()->symbol_at(sig_index); -+ Symbol* name_sym1 = the_class->constants()->symbol_at(old_fs.name_index()); -+ Symbol* sig_sym1 = the_class->constants()->symbol_at(old_fs.signature_index()); -+ Symbol* name_sym2 = scratch_class->constants()->symbol_at(new_fs.name_index()); -+ Symbol* sig_sym2 = scratch_class->constants()->symbol_at(new_fs.signature_index()); - if (name_sym1 != name_sym2 || sig_sym1 != sig_sym2) { - return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; - } - } - -+ // If both streams aren't done then we have a differing number of -+ // fields. -+ if (!old_fs.done() || !new_fs.done()) { -+ return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; -+ } -+ - // Do a parallel walk through the old and new methods. Detect - // cases where they match (exist in both), have been added in - // the new methods, or have been deleted (exist only in the -@@ -2363,38 +2358,34 @@ - int i; // for portability - - // update each field in klass to use new constant pool indices as needed -- typeArrayHandle fields(THREAD, scratch_class->fields()); -- int n_fields = fields->length(); -- for (i = 0; i < n_fields; i += instanceKlass::next_offset) { -- jshort cur_index = fields->short_at(i + instanceKlass::name_index_offset); -+ for (JavaFieldStream fs(scratch_class); !fs.done(); fs.next()) { -+ jshort cur_index = fs.name_index(); - jshort new_index = find_new_index(cur_index); - if (new_index != 0) { - RC_TRACE_WITH_THREAD(0x00080000, THREAD, - ("field-name_index change: %d to %d", cur_index, new_index)); -- fields->short_at_put(i + instanceKlass::name_index_offset, new_index); -+ fs.set_name_index(new_index); - } -- cur_index = fields->short_at(i + instanceKlass::signature_index_offset); -+ cur_index = fs.signature_index(); - new_index = find_new_index(cur_index); - if (new_index != 0) { - RC_TRACE_WITH_THREAD(0x00080000, THREAD, - ("field-signature_index change: %d to %d", cur_index, new_index)); -- fields->short_at_put(i + instanceKlass::signature_index_offset, -- new_index); -+ fs.set_signature_index(new_index); - } -- cur_index = fields->short_at(i + instanceKlass::initval_index_offset); -+ cur_index = fs.initval_index(); - new_index = find_new_index(cur_index); - if (new_index != 0) { - RC_TRACE_WITH_THREAD(0x00080000, THREAD, - ("field-initval_index change: %d to %d", cur_index, new_index)); -- fields->short_at_put(i + instanceKlass::initval_index_offset, new_index); -+ fs.set_initval_index(new_index); - } -- cur_index = fields->short_at(i + instanceKlass::generic_signature_offset); -+ cur_index = fs.generic_signature_index(); - new_index = find_new_index(cur_index); - if (new_index != 0) { - RC_TRACE_WITH_THREAD(0x00080000, THREAD, - ("field-generic_signature change: %d to %d", cur_index, new_index)); -- fields->short_at_put(i + instanceKlass::generic_signature_offset, -- new_index); -+ fs.set_generic_signature_index(new_index); - } - } // end for each field - -diff --git a/src/share/vm/prims/methodHandles.cpp b/src/share/vm/prims/methodHandles.cpp ---- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp -+++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp -@@ -386,7 +386,7 @@ - int slot = java_lang_reflect_Field::slot(target_oop); // fd.index() - int mods = java_lang_reflect_Field::modifiers(target_oop); - klassOop k = java_lang_Class::as_klassOop(clazz); -- int offset = instanceKlass::cast(k)->offset_from_fields(slot); -+ int offset = instanceKlass::cast(k)->field_offset(slot); - init_MemberName(mname_oop, k, accessFlags_from(mods), offset); - } else { - int decode_flags = 0; klassOop receiver_limit = NULL; -@@ -646,6 +646,7 @@ - } - } - } -+ assert(java_lang_invoke_MethodTypeForm::vmslots(mtform()) == argument_slot_count(mtype()), "must agree"); - } - - // Conversely, a member name which is only initialized from JVM internals -@@ -1410,8 +1411,6 @@ - THROW(vmSymbols::java_lang_InternalError()); - } - -- java_dyn_MethodHandle::init_vmslots(mh()); -- - if (VerifyMethodHandles) { - // The privileged code which invokes this routine should not make - // a mistake about types, but it's better to verify. -@@ -1531,7 +1530,6 @@ - if (m.is_null()) { THROW(vmSymbols::java_lang_InternalError()); } - if (m->is_abstract()) { THROW(vmSymbols::java_lang_AbstractMethodError()); } - -- java_dyn_MethodHandle::init_vmslots(mh()); - - if (VerifyMethodHandles) { - verify_BoundMethodHandle_with_receiver(mh, m, CHECK); -@@ -1639,8 +1637,6 @@ - THROW(vmSymbols::java_lang_InternalError()); - } - -- java_dyn_MethodHandle::init_vmslots(mh()); -- - if (VerifyMethodHandles) { - int insert_after = argnum - 1; - verify_vmargslot(mh, insert_after, sun_dyn_BoundMethodHandle::vmargslot(mh()), CHECK); -diff --git a/src/share/vm/prims/unsafe.cpp b/src/share/vm/prims/unsafe.cpp ---- openjdk/hotspot/src/share/vm/prims/unsafe.cpp -+++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp -@@ -652,7 +652,7 @@ - } - } - -- int offset = instanceKlass::cast(k)->offset_from_fields(slot); -+ int offset = instanceKlass::cast(k)->field_offset(slot); - return field_offset_from_byte_offset(offset); - } - -diff --git a/src/share/vm/runtime/fieldDescriptor.cpp b/src/share/vm/runtime/fieldDescriptor.cpp ---- openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.cpp -+++ openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.cpp -@@ -42,59 +42,51 @@ - objArrayOop md = ik->fields_annotations(); - if (md == NULL) - return NULL; -- assert((index() % instanceKlass::next_offset) == 0, ""); -- return typeArrayOop(md->obj_at(index() / instanceKlass::next_offset)); -+ return typeArrayOop(md->obj_at(index())); - } - - constantTag fieldDescriptor::initial_value_tag() const { -- return constants()->tag_at(_initial_value_index); -+ return constants()->tag_at(initial_value_index()); - } - - jint fieldDescriptor::int_initial_value() const { -- return constants()->int_at(_initial_value_index); -+ return constants()->int_at(initial_value_index()); - } - - jlong fieldDescriptor::long_initial_value() const { -- return constants()->long_at(_initial_value_index); -+ return constants()->long_at(initial_value_index()); - } - - jfloat fieldDescriptor::float_initial_value() const { -- return constants()->float_at(_initial_value_index); -+ return constants()->float_at(initial_value_index()); - } - - jdouble fieldDescriptor::double_initial_value() const { -- return constants()->double_at(_initial_value_index); -+ return constants()->double_at(initial_value_index()); - } - - oop fieldDescriptor::string_initial_value(TRAPS) const { -- return constants()->string_at(_initial_value_index, CHECK_0); -+ return constants()->string_at(initial_value_index(), CHECK_0); - } - - void fieldDescriptor::initialize(klassOop k, int index) { - instanceKlass* ik = instanceKlass::cast(k); - _cp = ik->constants(); -- typeArrayOop fields = ik->fields(); -+ FieldInfo* f = ik->field(index); -+ assert(!f->is_internal(), "regular Java fields only"); - -- assert(fields->length() % instanceKlass::next_offset == 0, "Illegal size of field array"); -- assert(fields->length() >= index + instanceKlass::next_offset, "Illegal size of field array"); -- -- _access_flags.set_field_flags(fields->ushort_at(index + instanceKlass::access_flags_offset)); -- _name_index = fields->ushort_at(index + instanceKlass::name_index_offset); -- _signature_index = fields->ushort_at(index + instanceKlass::signature_index_offset); -- _initial_value_index = fields->ushort_at(index + instanceKlass::initval_index_offset); -- guarantee(_name_index != 0 && _signature_index != 0, "bad constant pool index for fieldDescriptor"); -- _offset = ik->offset_from_fields( index ); -- _generic_signature_index = fields->ushort_at(index + instanceKlass::generic_signature_offset); -+ _access_flags = accessFlags_from(f->access_flags()); -+ guarantee(f->name_index() != 0 && f->signature_index() != 0, "bad constant pool index for fieldDescriptor"); - _index = index; - } - - #ifndef PRODUCT - - void fieldDescriptor::print_on(outputStream* st) const { -- _access_flags.print_on(st); -- constants()->symbol_at(_name_index)->print_value_on(st); -+ access_flags().print_on(st); -+ name()->print_value_on(st); - st->print(" "); -- constants()->symbol_at(_signature_index)->print_value_on(st); -+ signature()->print_value_on(st); - st->print(" @%d ", offset()); - if (WizardMode && has_initial_value()) { - st->print("(initval "); -diff --git a/src/share/vm/runtime/fieldDescriptor.hpp b/src/share/vm/runtime/fieldDescriptor.hpp ---- openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.hpp -+++ openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.hpp -@@ -40,29 +40,40 @@ - class fieldDescriptor VALUE_OBJ_CLASS_SPEC { - private: - AccessFlags _access_flags; -- int _name_index; -- int _signature_index; -- int _initial_value_index; -- int _offset; -- int _generic_signature_index; -- int _index; // index into fields() array -+ int _index; // the field index - constantPoolHandle _cp; - -+ // update the access_flags for the field in the klass -+ void update_klass_field_access_flag() { -+ instanceKlass* ik = instanceKlass::cast(field_holder()); -+ ik->field(index())->set_access_flags(_access_flags.as_short()); -+ } -+ -+ FieldInfo* field() const { -+ instanceKlass* ik = instanceKlass::cast(field_holder()); -+ return ik->field(_index); -+ } -+ - public: -- Symbol* name() const { return _cp->symbol_at(_name_index); } -- Symbol* signature() const { return _cp->symbol_at(_signature_index); } -+ Symbol* name() const { -+ return field()->name(_cp); -+ } -+ Symbol* signature() const { -+ return field()->signature(_cp); -+ } - klassOop field_holder() const { return _cp->pool_holder(); } - constantPoolOop constants() const { return _cp(); } - AccessFlags access_flags() const { return _access_flags; } - oop loader() const; - // Offset (in words) of field from start of instanceOop / klassOop -- int offset() const { return _offset; } -- Symbol* generic_signature() const { return (_generic_signature_index > 0 ? _cp->symbol_at(_generic_signature_index) : (Symbol*)NULL); } -+ int offset() const { return field()->offset(); } -+ Symbol* generic_signature() const { return field()->generic_signature(_cp); } - int index() const { return _index; } - typeArrayOop annotations() const; - - // Initial field value -- bool has_initial_value() const { return _initial_value_index != 0; } -+ bool has_initial_value() const { return field()->initval_index() != 0; } -+ int initial_value_index() const { return field()->initval_index(); } - constantTag initial_value_tag() const; // The tag will return true on one of is_int(), is_long(), is_single(), is_double() - jint int_initial_value() const; - jlong long_initial_value() const; -@@ -74,25 +85,31 @@ - BasicType field_type() const { return FieldType::basic_type(signature()); } - - // Access flags -- bool is_public() const { return _access_flags.is_public(); } -- bool is_private() const { return _access_flags.is_private(); } -- bool is_protected() const { return _access_flags.is_protected(); } -+ bool is_public() const { return access_flags().is_public(); } -+ bool is_private() const { return access_flags().is_private(); } -+ bool is_protected() const { return access_flags().is_protected(); } - bool is_package_private() const { return !is_public() && !is_private() && !is_protected(); } - -- bool is_static() const { return _access_flags.is_static(); } -- bool is_final() const { return _access_flags.is_final(); } -- bool is_volatile() const { return _access_flags.is_volatile(); } -- bool is_transient() const { return _access_flags.is_transient(); } -+ bool is_static() const { return access_flags().is_static(); } -+ bool is_final() const { return access_flags().is_final(); } -+ bool is_volatile() const { return access_flags().is_volatile(); } -+ bool is_transient() const { return access_flags().is_transient(); } - -- bool is_synthetic() const { return _access_flags.is_synthetic(); } -+ bool is_synthetic() const { return access_flags().is_synthetic(); } - -- bool is_field_access_watched() const { return _access_flags.is_field_access_watched(); } -+ bool is_field_access_watched() const { return access_flags().is_field_access_watched(); } - bool is_field_modification_watched() const -- { return _access_flags.is_field_modification_watched(); } -- void set_is_field_access_watched(const bool value) -- { _access_flags.set_is_field_access_watched(value); } -- void set_is_field_modification_watched(const bool value) -- { _access_flags.set_is_field_modification_watched(value); } -+ { return access_flags().is_field_modification_watched(); } -+ -+ void set_is_field_access_watched(const bool value) { -+ _access_flags.set_is_field_access_watched(value); -+ update_klass_field_access_flag(); -+ } -+ -+ void set_is_field_modification_watched(const bool value) { -+ _access_flags.set_is_field_modification_watched(value); -+ update_klass_field_access_flag(); -+ } - - // Initialization - void initialize(klassOop k, int index); -diff --git a/src/share/vm/runtime/reflectionUtils.hpp b/src/share/vm/runtime/reflectionUtils.hpp ---- openjdk/hotspot/src/share/vm/runtime/reflectionUtils.hpp -+++ openjdk/hotspot/src/share/vm/runtime/reflectionUtils.hpp -@@ -107,10 +107,8 @@ - - class FieldStream : public KlassStream { - private: -- int length() const { return fields()->length(); } -- constantPoolOop constants() const { return _klass->constants(); } -- protected: -- typeArrayOop fields() const { return _klass->fields(); } -+ int length() const { return _klass->java_fields_count(); } -+ - public: - FieldStream(instanceKlassHandle klass, bool local_only, bool classes_only) - : KlassStream(klass, local_only, classes_only) { -@@ -118,26 +116,23 @@ - next(); - } - -- void next() { _index -= instanceKlass::next_offset; } -+ void next() { _index -= 1; } - - // Accessors for current field - AccessFlags access_flags() const { - AccessFlags flags; -- flags.set_flags(fields()->ushort_at(index() + instanceKlass::access_flags_offset)); -+ flags.set_flags(_klass->field_access_flags(_index)); - return flags; - } - Symbol* name() const { -- int name_index = fields()->ushort_at(index() + instanceKlass::name_index_offset); -- return constants()->symbol_at(name_index); -+ return _klass->field_name(_index); - } - Symbol* signature() const { -- int signature_index = fields()->ushort_at(index() + -- instanceKlass::signature_index_offset); -- return constants()->symbol_at(signature_index); -+ return _klass->field_signature(_index); - } - // missing: initval() - int offset() const { -- return _klass->offset_from_fields( index() ); -+ return _klass->field_offset( index() ); - } - }; - -@@ -213,10 +208,10 @@ - } - int field_count(); - void next() { -- _index -= instanceKlass::next_offset; -+ _index -= 1; - if (has_filtered_field()) { - while (_index >=0 && FilteredFieldsMap::is_filtered_field((klassOop)_klass(), offset())) { -- _index -= instanceKlass::next_offset; -+ _index -= 1; - } - } - } -diff --git a/src/share/vm/runtime/thread.cpp b/src/share/vm/runtime/thread.cpp ---- openjdk/hotspot/src/share/vm/runtime/thread.cpp -+++ openjdk/hotspot/src/share/vm/runtime/thread.cpp -@@ -981,7 +981,7 @@ - // General purpose hook into Java code, run once when the VM is initialized. - // The Java library method itself may be changed independently from the VM. - static void call_postVMInitHook(TRAPS) { -- klassOop k = SystemDictionary::sun_misc_PostVMInitHook_klass(); -+ klassOop k = SystemDictionary::PostVMInitHook_klass(); - instanceKlassHandle klass (THREAD, k); - if (klass.not_null()) { - JavaValue result(T_VOID); -diff --git a/src/share/vm/runtime/vmStructs.cpp b/src/share/vm/runtime/vmStructs.cpp ---- openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp -@@ -241,6 +241,7 @@ - nonstatic_field(instanceKlass, _nof_implementors, int) \ - nonstatic_field(instanceKlass, _implementors[0], klassOop) \ - nonstatic_field(instanceKlass, _fields, typeArrayOop) \ -+ nonstatic_field(instanceKlass, _java_fields_count, int) \ - nonstatic_field(instanceKlass, _constants, constantPoolOop) \ - nonstatic_field(instanceKlass, _class_loader, oop) \ - nonstatic_field(instanceKlass, _protection_domain, oop) \ -@@ -931,11 +932,11 @@ - /* java_lang_Class fields */ \ - /*********************************/ \ - \ -- static_field(java_lang_Class, klass_offset, int) \ -- static_field(java_lang_Class, resolved_constructor_offset, int) \ -- static_field(java_lang_Class, array_klass_offset, int) \ -- static_field(java_lang_Class, oop_size_offset, int) \ -- static_field(java_lang_Class, static_oop_field_count_offset, int) \ -+ static_field(java_lang_Class, _klass_offset, int) \ -+ static_field(java_lang_Class, _resolved_constructor_offset, int) \ -+ static_field(java_lang_Class, _array_klass_offset, int) \ -+ static_field(java_lang_Class, _oop_size_offset, int) \ -+ static_field(java_lang_Class, _static_oop_field_count_offset, int) \ - \ - /************************/ \ - /* Miscellaneous fields */ \ -@@ -1627,19 +1628,24 @@ - declare_constant(constMethodOopDesc::_has_localvariable_table) \ - \ - /*************************************/ \ -- /* instanceKlass FieldOffset enum */ \ -+ /* instanceKlass enum */ \ - /*************************************/ \ - \ -- declare_constant(instanceKlass::access_flags_offset) \ -- declare_constant(instanceKlass::name_index_offset) \ -- declare_constant(instanceKlass::signature_index_offset) \ -- declare_constant(instanceKlass::initval_index_offset) \ -- declare_constant(instanceKlass::low_offset) \ -- declare_constant(instanceKlass::high_offset) \ -- declare_constant(instanceKlass::generic_signature_offset) \ -- declare_constant(instanceKlass::next_offset) \ - declare_constant(instanceKlass::implementors_limit) \ - \ -+ /*************************************/ \ -+ /* FieldInfo FieldOffset enum */ \ -+ /*************************************/ \ -+ \ -+ declare_constant(FieldInfo::access_flags_offset) \ -+ declare_constant(FieldInfo::name_index_offset) \ -+ declare_constant(FieldInfo::signature_index_offset) \ -+ declare_constant(FieldInfo::initval_index_offset) \ -+ declare_constant(FieldInfo::low_offset) \ -+ declare_constant(FieldInfo::high_offset) \ -+ declare_constant(FieldInfo::generic_signature_offset) \ -+ declare_constant(FieldInfo::field_slots) \ -+ \ - /************************************************/ \ - /* instanceKlass InnerClassAttributeOffset enum */ \ - /************************************************/ \ -diff --git a/src/share/vm/utilities/accessFlags.hpp b/src/share/vm/utilities/accessFlags.hpp ---- openjdk/hotspot/src/share/vm/utilities/accessFlags.hpp -+++ openjdk/hotspot/src/share/vm/utilities/accessFlags.hpp -@@ -79,9 +79,14 @@ - // Note that the class-related ACC_ANNOTATION bit conflicts with these flags. - JVM_ACC_FIELD_ACCESS_WATCHED = 0x00002000, // field access is watched by JVMTI - JVM_ACC_FIELD_MODIFICATION_WATCHED = 0x00008000, // field modification is watched by JVMTI -+ JVM_ACC_FIELD_INTERNAL = 0x00000400, // internal field, same as JVM_ACC_ABSTRACT -+ -+ JVM_ACC_FIELD_INTERNAL_FLAGS = JVM_ACC_FIELD_ACCESS_WATCHED | -+ JVM_ACC_FIELD_MODIFICATION_WATCHED | -+ JVM_ACC_FIELD_INTERNAL, - - // flags accepted by set_field_flags() -- JVM_ACC_FIELD_FLAGS = 0x00008000 | JVM_ACC_WRITTEN_FLAGS -+ JVM_ACC_FIELD_FLAGS = JVM_RECOGNIZED_FIELD_MODIFIERS | JVM_ACC_FIELD_INTERNAL_FLAGS - - }; - -@@ -150,13 +155,17 @@ - bool is_field_access_watched() const { return (_flags & JVM_ACC_FIELD_ACCESS_WATCHED) != 0; } - bool is_field_modification_watched() const - { return (_flags & JVM_ACC_FIELD_MODIFICATION_WATCHED) != 0; } -+ bool is_internal() const { return (_flags & JVM_ACC_FIELD_INTERNAL) != 0; } - - // get .class file flags - jint get_flags () const { return (_flags & JVM_ACC_WRITTEN_FLAGS); } - - // Initialization - void add_promoted_flags(jint flags) { _flags |= (flags & JVM_ACC_PROMOTED_FLAGS); } -- void set_field_flags(jint flags) { _flags = (flags & JVM_ACC_FIELD_FLAGS); } -+ void set_field_flags(jint flags) { -+ assert((flags & JVM_ACC_FIELD_FLAGS) == flags, "only recognized flags"); -+ _flags = (flags & JVM_ACC_FIELD_FLAGS); -+ } - void set_flags(jint flags) { _flags = (flags & JVM_ACC_WRITTEN_FLAGS); } - - void set_queued_for_compilation() { atomic_set_bits(JVM_ACC_QUEUED); } -@@ -218,8 +227,8 @@ - } - - // Conversion -- jshort as_short() { return (jshort)_flags; } -- jint as_int() { return _flags; } -+ jshort as_short() const { return (jshort)_flags; } -+ jint as_int() const { return _flags; } - - inline friend AccessFlags accessFlags_from(jint flags); -
--- a/patches/openjdk/7188114-alternate_command_line_parser.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,611 +0,0 @@ -# HG changeset patch -# User ksrini -# Date 1343740201 25200 -# Node ID 4f08c170e2daef20a8b249ba50a9986f7cd09e67 -# Parent 75cf6b2c4f573f155d3173f11d207a2155a887a9 -7188114: (launcher) need an alternate command line parser for Windows -Reviewed-by: darcy, dholmes, jjh -Contributed-by: akhil.arora@oracle.com - -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/src/windows/bin/cmdtoargs.c -@@ -0,0 +1,598 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+ -+/* -+ * Converts a single string command line to the traditional argc, argv. -+ * There are rules which govern the breaking of the the arguments, and -+ * these rules are embodied in the regression tests below, and duplicated -+ * in the jdk regression tests. -+ */ -+ -+#ifndef IDE_STANDALONE -+#include "java.h" -+#include "jli_util.h" -+#else /* IDE_STANDALONE */ -+// The defines we need for stand alone testing -+#include <stdio.h> -+#include <stdlib.h> -+#include <Windows.h> -+#define JNI_TRUE TRUE -+#define JNI_FALSE FALSE -+#define JLI_MemRealloc realloc -+#define JLI_StringDup _strdup -+#define JLI_MemFree free -+#define jboolean boolean -+typedef struct { -+ char* arg; -+ boolean has_wildcard; -+} StdArg ; -+#endif -+static StdArg *stdargs; -+static int stdargc; -+ -+static char* next_arg(char* cmdline, char* arg, jboolean* wildcard) { -+ -+ char* src = cmdline; -+ char* dest = arg; -+ jboolean separator = JNI_FALSE; -+ int quotes = 0; -+ int slashes = 0; -+ -+ char prev = 0; -+ char ch = 0; -+ int i; -+ jboolean done = JNI_FALSE; -+ -+ *wildcard = JNI_FALSE; -+ while ((ch = *src) != 0 && !done) { -+ switch (ch) { -+ case '"': -+ if (separator) { -+ done = JNI_TRUE; -+ break; -+ } -+ if (prev == '\\') { -+ for (i = 1; i < slashes; i += 2) { -+ *dest++ = prev; -+ } -+ if (slashes % 2 == 1) { -+ *dest++ = ch; -+ } else { -+ quotes++; -+ } -+ } else if (prev == '"' && quotes % 2 == 0) { -+ quotes++; -+ *dest++ = ch; // emit every other consecutive quote -+ } else if (quotes == 0) { -+ quotes++; // starting quote -+ } else { -+ quotes--; // matching quote -+ } -+ slashes = 0; -+ break; -+ -+ case '\\': -+ slashes++; -+ if (separator) { -+ done = JNI_TRUE; -+ separator = JNI_FALSE; -+ } -+ break; -+ -+ case ' ': -+ case '\t': -+ if (quotes % 2 == 1) { -+ *dest++ = ch; -+ } else { -+ separator = JNI_TRUE; -+ } -+ slashes = 0; -+ break; -+ -+ case '*': -+ case '?': -+ if (separator) { -+ done = JNI_TRUE; -+ separator = JNI_FALSE; -+ break; -+ } -+ if (quotes % 2 == 0) { -+ *wildcard = JNI_TRUE; -+ } -+ if (prev == '\\') { -+ *dest++ = prev; -+ } -+ *dest++ = ch; -+ break; -+ -+ default: -+ if (prev == '\\') { -+ for (i = 0 ; i < slashes ; i++) { -+ *dest++ = prev; -+ } -+ *dest++ = ch; -+ } else if (separator) { -+ done = JNI_TRUE; -+ } else { -+ *dest++ = ch; -+ } -+ slashes = 0; -+ } -+ -+ if (!done) { -+ prev = ch; -+ src++; -+ } -+ } -+ if (prev == '\\') { -+ for (i = 0; i < slashes; i++) { -+ *dest++ = prev; -+ } -+ } -+ *dest = 0; -+ return done ? src : NULL; -+} -+ -+int JLI_GetStdArgc() { -+ return stdargc; -+} -+ -+StdArg* JLI_GetStdArgs() { -+ return stdargs; -+} -+ -+void JLI_CmdToArgs(char* cmdline) { -+ int nargs = 0; -+ StdArg* argv = NULL; -+ jboolean wildcard = JNI_FALSE; -+ char* src = cmdline; -+ -+ // allocate arg buffer with sufficient space to receive the largest arg -+ char* arg = JLI_StringDup(cmdline); -+ -+ do { -+ src = next_arg(src, arg, &wildcard); -+ // resize to accommodate another Arg -+ argv = (StdArg*) JLI_MemRealloc(argv, (nargs+1) * sizeof(StdArg)); -+ argv[nargs].arg = JLI_StringDup(arg); -+ argv[nargs].has_wildcard = wildcard; -+ -+ nargs++; -+ } while (src != NULL); -+ -+ stdargc = nargs; -+ stdargs = argv; -+} -+ -+#ifdef IDE_STANDALONE -+void doexit(int rv) { -+ printf("Hit any key to quit\n"); -+ int c = getchar(); -+ exit(rv); -+} -+ -+void doabort() { -+ doexit(1); -+} -+ -+class Vector { -+public: -+ char* cmdline; -+ int argc; -+ char* argv[10]; -+ boolean wildcard[10]; -+ boolean enabled; -+ -+ Vector(){} -+ // Initialize our test vector with the program name, argv[0] -+ // and the single string command line. -+ Vector(char* pname, char* cline) { -+ argv[0] = pname; -+ wildcard[0] = FALSE; -+ cmdline = cline; -+ argc = 1; -+ enabled = TRUE; -+ } -+ -+ // add our expected strings, the program name has already been -+ // added so ignore that -+ void add(char* arg, boolean w) { -+ argv[argc] = arg; -+ wildcard[argc] = w; -+ argc++; -+ } -+ -+ void disable() { -+ enabled = FALSE; -+ } -+ -+ // validate the returned arguments with the expected arguments, using the -+ // new CmdToArgs method. -+ bool check() { -+ // "pgmname" rest of cmdline ie. pgmname + 2 double quotes + space + cmdline from windows -+ char* cptr = (char*) malloc(strlen(argv[0]) + sizeof(char) * 3 + strlen(cmdline) + 1); -+ _snprintf(cptr, MAX_PATH, "\"%s\" %s", argv[0], cmdline); -+ JLI_CmdToArgs(cptr); -+ free(cptr); -+ StdArg *kargv = JLI_GetStdArgs(); -+ int kargc = JLI_GetStdArgc(); -+ bool retval = true; -+ printf("\n===========================\n"); -+ printf("cmdline=%s\n", cmdline); -+ if (argc != kargc) { -+ printf("*** argument count does not match\n"); -+ printme(); -+ printtest(kargc, kargv); -+ doabort(); -+ } -+ for (int i = 0 ; i < argc && retval == true ; i++) { -+ if (strcmp(argv[i], kargv[i].arg) != 0) { -+ printf("*** argument at [%d] don't match\n got: %s\n exp: %s\n", -+ i, kargv[i].arg, argv[i]); -+ doabort(); -+ } -+ } -+ for (int i = 0 ; i < argc && retval == true ; i++) { -+ if (wildcard[i] != kargv[i].has_wildcard) { -+ printf("*** expansion flag at [%d] doesn't match\n got: %d\n exp: %d\n", -+ i, kargv[i].has_wildcard, wildcard[i]); -+ doabort(); -+ } -+ } -+ for (int i = 0 ; i < kargc ; i++) { -+ printf("k[%d]=%s\n", i, kargv[i].arg); -+ printf(" [%d]=%s\n", i, argv[i]); -+ } -+ return retval; -+ } -+ void printtest(int kargc, StdArg* kargv) { -+ for (int i = 0 ; i < kargc ; i++) { -+ printf("k[%d]=%s\n", i, kargv[i].arg); -+ } -+ } -+ void printme() { -+ for (int i = 0 ; i < argc ; i++) { -+ printf(" [%d]=%s\n", i, argv[i]); -+ } -+ } -+}; -+ -+void dotest(Vector** vectors) { -+ Vector* v = vectors[0]; -+ for (int i = 0 ; v != NULL;) { -+ if (v->enabled) { -+ v->check(); -+ } -+ v = vectors[++i]; -+ } -+} -+ -+#define MAXV 128 -+int main(int argc, char* argv[]) { -+ -+ int n; -+ for (n=1; n < argc; n++) { -+ printf("%d %s\n", n, argv[n]); -+ } -+ if (n > 1) { -+ JLI_CmdToArgs(GetCommandLine()); -+ for (n = 0; n < stdargc; n++) { -+ printf(" [%d]=%s\n", n, stdargs[n].arg); -+ printf(" [%d]=%s\n", n, stdargs[n].has_wildcard ? "TRUE" : "FALSE"); -+ } -+ doexit(0); -+ } -+ -+ Vector *vectors[MAXV]; -+ -+ memset(vectors, 0, sizeof(vectors)); -+ int i = 0; -+ Vector* v = new Vector(argv[0], "abcd"); -+ v->add("abcd", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"a b c d\""); -+ v->add("a b c d", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "a\"b c d\"e"); -+ v->add("ab c de", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "ab\\\"cd"); -+ v->add("ab\"cd", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"a b c d\\\\\""); -+ v->add("a b c d\\", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "ab\\\\\\\"cd"); -+ v->add("ab\\\"cd", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ // Windows tests -+ v = new Vector(argv[0], "a\\\\\\c"); -+ v->add("a\\\\\\c", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"a\\\\\\d\""); -+ v->add("a\\\\\\d", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"a b c\" d e"); -+ v->add("a b c", FALSE); -+ v->add("d", FALSE); -+ v->add("e", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"ab\\\"c\" \"\\\\\" d"); -+ v->add("ab\"c", FALSE); -+ v->add("\\", FALSE); -+ v->add("d", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "a\\\\\\c d\"e f\"g h"); -+ v->add("a\\\\\\c", FALSE); -+ v->add("de fg", FALSE); -+ v->add("h", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "a\\\\\\\"b c d"); -+ v->add("a\\\"b", FALSE); // XXX "a\\\\\\\"b" -+ v->add("c", FALSE); -+ v->add("d", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "a\\\\\\\\\"g c\" d e"); // XXX "a\\\\\\\\\"b c\" d e" -+ v->add("a\\\\\g c", FALSE); // XXX "a\\\\\\\\\"b c" -+ v->add("d", FALSE); -+ v->add("e", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ // Additional tests -+ v = new Vector(argv[0], "\"a b c\"\""); -+ v->add("a b c\"", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"\"a b c\"\""); -+ v->add("a", FALSE); -+ v->add("b", FALSE); -+ v->add("c", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"\"\"a b c\"\"\""); -+ v->add("\"a b c\"", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"\"\"\"a b c\"\"\"\""); -+ v->add("\"a", FALSE); -+ v->add("b", FALSE); -+ v->add("c\"", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"\"\"\"\"a b c\"\"\"\"\""); -+ v->add("\"\"a b c\"\"", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"C:\\TEST A\\\\\""); -+ v->add("C:\\TEST A\\", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"\"C:\\TEST A\\\\\"\""); -+ v->add("C:\\TEST", FALSE); -+ v->add("A\\", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ // test if a wildcard is present -+ v = new Vector(argv[0], "abc*def"); -+ v->add("abc*def", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"abc*def\""); -+ v->add("abc*def", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "*.abc"); -+ v->add("*.abc", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"*.abc\""); -+ v->add("*.abc", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "x.???"); -+ v->add("x.???", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\"x.???\""); -+ v->add("x.???", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "Debug\\*"); -+ v->add("Debug\\*", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "Debug\\f?a"); -+ v->add("Debug\\f?a", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "Debug\\?a.java"); -+ v->add("Debug\\?a.java", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "foo *.noexts"); -+ v->add("foo", FALSE); -+ v->add("*.noexts", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "X\\Y\\Z"); -+ v->add("X\\Y\\Z", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "\\X\\Y\\Z"); -+ v->add("\\X\\Y\\Z", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "a b"); -+ v->add("a", FALSE); -+ v->add("b", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "a\tb"); -+ v->add("a", FALSE); -+ v->add("b", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ -+ v = new Vector(argv[0], "a \t b"); -+ v->add("a", FALSE); -+ v->add("b", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], "*\\"); -+ v->add("*\\", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], "*/"); -+ v->add("*/", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], ".\\*"); -+ v->add(".\\*", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], "./*"); -+ v->add("./*", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], ".\\*"); -+ v->add(".\\*", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], ".//*"); -+ v->add(".//*", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], "..\\..\\*"); -+ v->add("..\\..\\*", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], "../../*"); -+ v->add("../../*", TRUE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], "..\\..\\"); -+ v->add("..\\..\\", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ v = new Vector(argv[0], "../../"); -+ v->add("../../", FALSE); -+ // v->disable(); -+ vectors[i++] = v; -+ -+ dotest(vectors); -+ printf("All tests pass [%d]\n", i); -+ doexit(0); -+} -+#endif /* IDE_STANDALONE */
--- a/patches/openjdk/7199143-OCSP_timeout.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1372302277 18000 -# Node ID 5db08be3f8c2f84a02ff21c433d319205865d5d5 -# Parent af2db2941f434093f07571ce1bbb35666a596694 -7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout -Summary: Added com.sun.security.ocsp.timeout system property to control timeout -Reviewed-by: mullan, vinnie -Contributed-by: jason.uh@oracle.com - ---- openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java -+++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java -@@ -43,6 +43,7 @@ - import java.util.Map; - - import static sun.security.provider.certpath.OCSPResponse.*; -+import sun.security.action.GetIntegerAction; - import sun.security.util.Debug; - import sun.security.x509.AccessDescription; - import sun.security.x509.AuthorityInfoAccessExtension; -@@ -65,7 +66,31 @@ - - private static final Debug debug = Debug.getInstance("certpath"); - -- private static final int CONNECT_TIMEOUT = 15000; // 15 seconds -+ private static final int DEFAULT_CONNECT_TIMEOUT = 15000; -+ -+ /** -+ * Integer value indicating the timeout length, in seconds, to be -+ * used for the OCSP check. A timeout of zero is interpreted as -+ * an infinite timeout. -+ */ -+ private static final int CONNECT_TIMEOUT = initializeTimeout(); -+ -+ /** -+ * Initialize the timeout length by getting the OCSP timeout -+ * system property. If the property has not been set, or if its -+ * value is negative, set the timeout length to the default. -+ */ -+ private static int initializeTimeout() { -+ int tmp = java.security.AccessController.doPrivileged( -+ new GetIntegerAction("com.sun.security.ocsp.timeout", -+ DEFAULT_CONNECT_TIMEOUT)); -+ if (tmp < 0) { -+ tmp = DEFAULT_CONNECT_TIMEOUT; -+ } -+ // Convert to milliseconds, as the system property will be -+ // specified in seconds -+ return tmp * 1000; -+ } - - private OCSP() {} -
--- a/patches/openjdk/8002070-remove_logger_stack_search.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,152 +0,0 @@ -changeset: 4948:4a67dd684bc2 -user: andrew -date: Tue Jun 18 08:07:48 2013 -0500 -files: src/share/classes/java/util/logging/Logger.java -description: -8002070: Remove the stack search for a resource bundle for Logger to use -Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) -Reviewed-by: mchung, alanb - - ---- openjdk/jdk/src/share/classes/java/util/logging/Logger.java -+++ openjdk/jdk/src/share/classes/java/util/logging/Logger.java -@@ -26,8 +26,16 @@ - - package java.util.logging; - --import java.util.*; -+import java.lang.ref.WeakReference; -+import java.security.AccessController; -+import java.security.PrivilegedAction; -+import java.util.ArrayList; -+import java.util.Iterator; -+import java.util.Locale; -+import java.util.MissingResourceException; -+import java.util.ResourceBundle; -+import java.util.concurrent.CopyOnWriteArrayList; --import java.security.*; --import java.lang.ref.WeakReference; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** -@@ -100,14 +105,8 @@ - * <p> - * When mapping ResourceBundle names to ResourceBundles, the Logger - * will first try to use the Thread's ContextClassLoader. If that -- * is null it will try the SystemClassLoader instead. As a temporary -- * transition feature in the initial implementation, if the Logger is -- * unable to locate a ResourceBundle from the ContextClassLoader or -- * SystemClassLoader the Logger will also search up the class stack -- * and use successive calling ClassLoaders to try to locate a ResourceBundle. -- * (This call stack search is to allow containers to transition to -- * using ContextClassLoaders and is likely to be removed in future -- * versions.) -+ * is null it will try the -+ * {@linkplain java.lang.ClassLoader#getSystemClassLoader() system ClassLoader} instead. - * <p> - * Formatting (including localization) is the responsibility of - * the output Handler, which will typically call a Formatter. -@@ -1323,12 +1322,16 @@ - return useParentHandlers; - } - -- // Private utility method to map a resource bundle name to an -- // actual resource bundle, using a simple one-entry cache. -- // Returns null for a null name. -- // May also return null if we can't find the resource bundle and -- // there is no suitable previous cached value. -- -+ /** -+ * Private utility method to map a resource bundle name to an -+ * actual resource bundle, using a simple one-entry cache. -+ * Returns null for a null name. -+ * May also return null if we can't find the resource bundle and -+ * there is no suitable previous cached value. -+ * -+ * @param name the ResourceBundle to locate -+ * @return ResourceBundle specified by name or null if not found -+ */ - static final String SYSTEM_LOGGER_RB_NAME = "sun.util.logging.resources.logging"; - - private static ResourceBundle findSystemResourceBundle(final Locale locale) { -@@ -1355,8 +1358,8 @@ - Locale currentLocale = Locale.getDefault(); - - // Normally we should hit on our simple one entry cache. -- if (catalog != null && currentLocale == catalogLocale -- && name == catalogName) { -+ if (catalog != null && currentLocale.equals(catalogLocale) -+ && name.equals(catalogName)) { - return catalog; - } - -@@ -1367,8 +1370,8 @@ - return catalog; - } - -- // Use the thread's context ClassLoader. If there isn't one, -- // use the SystemClassloader. -+ // Use the thread's context ClassLoader. If there isn't one, use the -+ // {@linkplain java.lang.ClassLoader#getSystemClassLoader() system ClassLoader}. - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - if (cl == null) { - cl = ClassLoader.getSystemClassLoader(); -@@ -1379,45 +1382,8 @@ - catalogLocale = currentLocale; - return catalog; - } catch (MissingResourceException ex) { -- // Woops. We can't find the ResourceBundle in the default -- // ClassLoader. Drop through. -+ return null; - } -- -- -- // Fall back to searching up the call stack and trying each -- // calling ClassLoader. -- for (int ix = 0; ; ix++) { -- Class clz = sun.reflect.Reflection.getCallerClass(ix); -- if (clz == null) { -- break; -- } -- ClassLoader cl2 = clz.getClassLoader(); -- if (cl2 == null) { -- cl2 = ClassLoader.getSystemClassLoader(); -- } -- if (cl == cl2) { -- // We've already checked this classloader. -- continue; -- } -- cl = cl2; -- try { -- catalog = ResourceBundle.getBundle(name, currentLocale, cl); -- catalogName = name; -- catalogLocale = currentLocale; -- return catalog; -- } catch (MissingResourceException ex) { -- // Ok, this one didn't work either. -- // Drop through, and try the next one. -- } -- } -- -- if (name.equals(catalogName)) { -- // Return the previous cached value for that name. -- // This may be null. -- return catalog; -- } -- // Sorry, we're out of luck. -- return null; - } - - // Private utility method to initialize our one entry -@@ -1428,8 +1395,7 @@ - if (name == null) { - return; - } -- ResourceBundle rb = findResourceBundle(name); -- if (rb == null) { -+ if (findResourceBundle(name) == null) { - // We've failed to find an expected ResourceBundle. - throw new MissingResourceException("Can't find " + name + " bundle", name, ""); - } -
--- a/patches/openjdk/8002070-remove_logger_stack_search_2.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,546 +0,0 @@ -changeset: 4981:108fe5a882a7 -user: andrew -date: Wed Jun 26 22:44:03 2013 -0500 -files: src/share/classes/java/util/logging/Logger.java test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java test/java/util/logging/bundlesearch/LoadItUp.java test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties -description: -8002070: Remove the stack search for a resource bundle for Logger to use -Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) -Reviewed-by: mchung - - ---- openjdk/jdk/src/share/classes/java/util/logging/Logger.java -+++ openjdk/jdk/src/share/classes/java/util/logging/Logger.java -@@ -1322,16 +1322,6 @@ - return useParentHandlers; - } - -- /** -- * Private utility method to map a resource bundle name to an -- * actual resource bundle, using a simple one-entry cache. -- * Returns null for a null name. -- * May also return null if we can't find the resource bundle and -- * there is no suitable previous cached value. -- * -- * @param name the ResourceBundle to locate -- * @return ResourceBundle specified by name or null if not found -- */ - static final String SYSTEM_LOGGER_RB_NAME = "sun.util.logging.resources.logging"; - - private static ResourceBundle findSystemResourceBundle(final Locale locale) { -@@ -1349,6 +1339,16 @@ - }); - } - -+ /** -+ * Private utility method to map a resource bundle name to an -+ * actual resource bundle, using a simple one-entry cache. -+ * Returns null for a null name. -+ * May also return null if we can't find the resource bundle and -+ * there is no suitable previous cached value. -+ * -+ * @param name the ResourceBundle to locate -+ * @return ResourceBundle specified by name or null if not found -+ */ - private synchronized ResourceBundle findResourceBundle(String name) { - // Return a null bundle for a null name. - if (name == null) { -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties -@@ -0,0 +1,25 @@ -+# -+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+sample1=translation #2 for sample1 -+sample2=translation #2 for sample2 -+supports-test=ResourceBundleSearchTest -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java -@@ -0,0 +1,89 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+import java.lang.reflect.InvocationTargetException; -+import java.lang.reflect.Method; -+import java.net.URL; -+import java.net.URLClassLoader; -+ -+/** -+ * This class is used to ensure that a resource bundle loadable by a classloader -+ * is on the caller's stack, but not on the classpath or TCCL to ensure that -+ * Logger.getLogger() can't load the bundle via a stack search -+ * -+ * @author Jim Gish -+ */ -+public class IndirectlyLoadABundle { -+ -+ private final static String rbName = "StackSearchableResource"; -+ -+ public boolean loadAndTest() throws Throwable { -+ // Find out where we are running from so we can setup the URLClassLoader URLs -+ // test.src and test.classes will be set if running in jtreg, but probably -+ // not otherwise -+ String testDir = System.getProperty("test.src", System.getProperty("user.dir")); -+ String testClassesDir = System.getProperty("test.classes", -+ System.getProperty("user.dir")); -+ String sep = System.getProperty("file.separator"); -+ URL[] urls = new URL[2]; -+ -+ // Allow for both jtreg and standalone cases here -+ urls[0] = new URL("file://" + testDir + sep + "resources" + sep); -+ urls[1] = new URL("file://" + testClassesDir + sep ); -+ System.out.println("INFO: urls[0] = " + urls[0]); -+ System.out.println("INFO: urls[1] = " + urls[1]); -+ -+ // Make sure we can find it via the URLClassLoader -+ URLClassLoader yetAnotherResourceCL = new URLClassLoader(urls, null); -+ if (!testForValidResourceSetup(yetAnotherResourceCL)) { -+ throw new Exception("Couldn't directly load bundle " + rbName -+ + " as expected. Test config problem"); -+ } -+ // But it shouldn't be available via the system classloader -+ ClassLoader myCL = this.getClass().getClassLoader(); -+ if (testForValidResourceSetup(myCL)) { -+ throw new Exception("Was able to directly load bundle " + rbName -+ + " from " + myCL + " but shouldn't have been" -+ + " able to. Test config problem"); -+ } -+ -+ Class<?> loadItUpClazz = Class.forName("LoadItUp", true, yetAnotherResourceCL); -+ ClassLoader actual = loadItUpClazz.getClassLoader(); -+ if (actual != yetAnotherResourceCL) { -+ throw new Exception("LoadItUp was loaded by an unexpected CL: " + actual); -+ } -+ Object loadItUp = loadItUpClazz.newInstance(); -+ Method testMethod = loadItUpClazz.getMethod("test", String.class); -+ try { -+ return (Boolean) testMethod.invoke(loadItUp, rbName); -+ } catch (InvocationTargetException ex) { -+ throw ex.getTargetException(); -+ } -+ } -+ -+ private boolean testForValidResourceSetup(ClassLoader cl) { -+ // First make sure the test environment is setup properly and the bundle actually -+ // exists -+ return ResourceBundleSearchTest.isOnClassPath(rbName, cl); -+ } -+} -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp.java -@@ -0,0 +1,62 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+import java.util.MissingResourceException; -+import java.util.logging.Logger; -+ -+/* -+ * This class is loaded onto the call stack when the test method is called -+ * and then its classloader can be used to find a property bundle in the same -+ * directory as the class. However, Logger is not allowed -+ * to find the bundle by looking up the stack for this classloader. -+ * We verify that this cannot happen. -+ * -+ * @author Jim Gish -+ */ -+public class LoadItUp { -+ -+ private final static boolean DEBUG = false; -+ -+ public Boolean test(String rbName) throws Exception { -+ // we should not be able to find the resource in this directory via -+ // getLogger calls. The only way that would be possible given this setup -+ // is that if Logger.getLogger searched up the call stack -+ return lookupBundle(rbName); -+ } -+ -+ private boolean lookupBundle(String rbName) { -+ // See if Logger.getLogger can find the resource in this directory -+ try { -+ Logger aLogger = Logger.getLogger("NestedLogger", rbName); -+ } catch (MissingResourceException re) { -+ if (DEBUG) { -+ System.out.println( -+ "As expected, LoadItUp.lookupBundle() did not find the bundle " -+ + rbName); -+ } -+ return false; -+ } -+ System.out.println("FAILED: LoadItUp.lookupBundle() found the bundle " -+ + rbName + " using a stack search."); -+ return true; -+ } -+} -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java -@@ -0,0 +1,249 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+/* -+ * @test -+ * @bug 8010127 -+ * @summary Remove the stack search for a resource bundle Logger to use -+ * @author Jim Gish -+ * @build ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp -+ * @run main ResourceBundleSearchTest -+ */ -+import java.net.URL; -+import java.net.URLClassLoader; -+import java.util.ArrayList; -+import java.util.List; -+import java.util.Locale; -+import java.util.MissingResourceException; -+import java.util.ResourceBundle; -+import java.util.logging.Logger; -+ -+public class ResourceBundleSearchTest { -+ -+ private final static boolean DEBUG = false; -+ private final static String LOGGER_PREFIX = "myLogger."; -+ private static int loggerNum = 0; -+ private final static String PROP_RB_NAME = "ClassPathTestBundle"; -+ private final static String TCCL_TEST_BUNDLE = "ContextClassLoaderTestBundle"; -+ -+ private static int numPass = 0; -+ private static int numFail = 0; -+ private static List<String> msgs = new ArrayList<String>(); -+ -+ public static void main(String[] args) throws Throwable { -+ ResourceBundleSearchTest test = new ResourceBundleSearchTest(); -+ test.runTests(); -+ } -+ -+ private void runTests() throws Throwable { -+ // ensure we are using en as the default Locale so we can find the resource -+ Locale.setDefault(Locale.ENGLISH); -+ -+ String testClasses = System.getProperty("test.classes"); -+ System.out.println( "test.classes = " + testClasses ); -+ -+ ClassLoader myClassLoader = ClassLoader.getSystemClassLoader(); -+ -+ // Find out where we are running from so we can setup the URLClassLoader URL -+ String userDir = System.getProperty("user.dir"); -+ String testDir = System.getProperty("test.src", userDir); -+ String sep = System.getProperty("file.separator"); -+ -+ URL[] urls = new URL[1]; -+ urls[0] = new URL("file://" + testDir + sep + "resources" + sep); -+ URLClassLoader rbClassLoader = new URLClassLoader(urls); -+ -+ // Test 1 - can we find a Logger bundle from doing a stack search? -+ // We shouldn't be able to -+ assertFalse(testGetBundleFromStackSearch(), "testGetBundleFromStackSearch"); -+ -+ // Test 2 - can we find a Logger bundle off of the Thread context class -+ // loader? We should be able to. -+ assertTrue( -+ testGetBundleFromTCCL(TCCL_TEST_BUNDLE, rbClassLoader), -+ "testGetBundleFromTCCL"); -+ -+ // Test 3 - Can we find a Logger bundle from the classpath? We should be -+ // able to, but .... -+ // We check to see if the bundle is on the classpath or not so that this -+ // will work standalone. In the case of jtreg/samevm, -+ // the resource bundles are not on the classpath. Running standalone -+ // (or othervm), they are -+ if (isOnClassPath(PROP_RB_NAME, myClassLoader)) { -+ debug("We should be able to see " + PROP_RB_NAME + " on the classpath"); -+ assertTrue(testGetBundleFromSystemClassLoader(PROP_RB_NAME), -+ "testGetBundleFromSystemClassLoader"); -+ } else { -+ debug("We should not be able to see " + PROP_RB_NAME + " on the classpath"); -+ assertFalse(testGetBundleFromSystemClassLoader(PROP_RB_NAME), -+ "testGetBundleFromSystemClassLoader"); -+ } -+ -+ report(); -+ } -+ -+ private void report() throws Exception { -+ System.out.println("Num passed = " + numPass + " Num failed = " + numFail); -+ if (numFail > 0) { -+ // We only care about the messages if they were errors -+ for (String msg : msgs) { -+ System.out.println(msg); -+ } -+ throw new Exception(numFail + " out of " + (numPass + numFail) -+ + " tests failed."); -+ } -+ } -+ -+ public void assertTrue(boolean testResult, String testName) { -+ if (testResult) { -+ numPass++; -+ } else { -+ numFail++; -+ System.out.println("FAILED: " + testName -+ + " was supposed to return true but did NOT!"); -+ } -+ } -+ -+ public void assertFalse(boolean testResult, String testName) { -+ if (!testResult) { -+ numPass++; -+ } else { -+ numFail++; -+ System.out.println("FAILED: " + testName -+ + " was supposed to return false but did NOT!"); -+ } -+ } -+ -+ public boolean testGetBundleFromStackSearch() throws Throwable { -+ // This should fail. This was the old functionality to search up the -+ // caller's call stack -+ IndirectlyLoadABundle indirectLoader = new IndirectlyLoadABundle(); -+ return indirectLoader.loadAndTest(); -+ } -+ -+ public boolean testGetBundleFromTCCL(String bundleName, -+ ClassLoader setOnTCCL) throws InterruptedException { -+ // This should succeed. We should be able to get the bundle from the -+ // thread context class loader -+ debug("Looking for " + bundleName + " using TCCL"); -+ LoggingThread lr = new LoggingThread(bundleName, setOnTCCL); -+ lr.start(); -+ synchronized (lr) { -+ try { -+ lr.wait(); -+ } catch (InterruptedException ex) { -+ throw ex; -+ } -+ } -+ msgs.add(lr.msg); -+ return lr.foundBundle; -+ } -+ -+ /* -+ * @param String bundleClass -+ * @param ClassLoader to use for search -+ * @return true iff bundleClass is on system classpath -+ */ -+ public static boolean isOnClassPath(String baseName, ClassLoader cl) { -+ ResourceBundle rb = null; -+ try { -+ rb = ResourceBundle.getBundle(baseName, Locale.getDefault(), cl); -+ System.out.println("INFO: Found bundle " + baseName + " on " + cl); -+ } catch (MissingResourceException e) { -+ System.out.println("INFO: Could not find bundle " + baseName + " on " + cl); -+ return false; -+ } -+ return (rb != null); -+ } -+ -+ private static String newLoggerName() { -+ // we need a new logger name every time we attempt to find a bundle via -+ // the Logger.getLogger call, so we'll simply tack on an integer which -+ // we increment each time this is called -+ loggerNum++; -+ return LOGGER_PREFIX + loggerNum; -+ } -+ -+ public boolean testGetBundleFromSystemClassLoader(String bundleName) { -+ // this should succeed if the bundle is on the system classpath. -+ try { -+ Logger aLogger = Logger.getLogger(ResourceBundleSearchTest.newLoggerName(), -+ bundleName); -+ } catch (MissingResourceException re) { -+ msgs.add("INFO: testGetBundleFromSystemClassLoader() did not find bundle " -+ + bundleName); -+ return false; -+ } -+ msgs.add("INFO: testGetBundleFromSystemClassLoader() found the bundle " -+ + bundleName); -+ return true; -+ } -+ -+ public static class LoggingThread extends Thread { -+ -+ boolean foundBundle = false; -+ String msg = null; -+ ClassLoader clToSetOnTCCL = null; -+ String bundleName = null; -+ -+ public LoggingThread(String bundleName) { -+ this.bundleName = bundleName; -+ } -+ -+ public LoggingThread(String bundleName, ClassLoader setOnTCCL) { -+ this.clToSetOnTCCL = setOnTCCL; -+ this.bundleName = bundleName; -+ } -+ -+ public void run() { -+ boolean setTCCL = false; -+ try { -+ if (clToSetOnTCCL != null) { -+ Thread.currentThread().setContextClassLoader(clToSetOnTCCL); -+ setTCCL = true; -+ } -+ // this should succeed if the bundle is on the system classpath. -+ try { -+ Logger aLogger = Logger.getLogger(ResourceBundleSearchTest.newLoggerName(), -+ bundleName); -+ msg = "INFO: LoggingRunnable() found the bundle " + bundleName -+ + (setTCCL ? " with " : " without ") + "setting the TCCL"; -+ foundBundle = true; -+ } catch (MissingResourceException re) { -+ msg = "INFO: LoggingRunnable() did not find the bundle " + bundleName -+ + (setTCCL ? " with " : " without ") + "setting the TCCL"; -+ foundBundle = false; -+ } -+ } catch (Throwable e) { -+ e.printStackTrace(); -+ System.exit(1); -+ } -+ } -+ } -+ -+ private void debug(String msg) { -+ if (DEBUG) { -+ System.out.println(msg); -+ } -+ } -+} -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties -@@ -0,0 +1,25 @@ -+# -+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+sample1=translation #3 for sample1 -+sample2=translation #3 for sample2 -+supports-test=ResourceBundleSearchTest -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties -@@ -0,0 +1,25 @@ -+# -+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+sample1=translation #4 for sample1 -+sample2=translation #4 for sample2 -+supports-test=ResourceBundleSearchTest -
--- a/patches/openjdk/8006120-server_jre.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1372384541 18000 -# Node ID 75cf6b2c4f573f155d3173f11d207a2155a887a9 -# Parent 5db08be3f8c2f84a02ff21c433d319205865d5d5 -8006120: Provide "Server JRE" for 7u train -Reviewed-by: pbhat, cgruszka -Contributed-by: amy.y.wang@oracle.com - ---- openjdk/jdk/make/common/Defs.gmk -+++ openjdk/jdk/make/common/Defs.gmk -@@ -296,6 +296,7 @@ - - JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-image - JRE_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-image -+JDK_SERVER_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-image - - #where the demo source can be found - DEMOSRCDIR = $(SHARE_SRC)/demo ---- openjdk/jdk/make/common/Release.gmk -+++ openjdk/jdk/make/common/Release.gmk -@@ -226,15 +226,16 @@ - trim-image-jre trim-image-jdk \ - identify-image-jre identify-image-jdk \ - process-image-jre process-image-jdk \ --compare-image \ --sec-files sec-files-win jgss-files :: -+compare-image \ -+sec-files sec-files-win jgss-files server-jdk-image :: - @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..." - - # Order is important here, trim jre after jdk image is created - images:: sanity-images post-sanity-images \ - $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \ - trim-image-jre trim-image-jdk \ -- process-image-jre process-image-jdk sec-files sec-files-win jgss-files -+ process-image-jre process-image-jdk sec-files sec-files-win \ -+ jgss-files server-jdk-image - - # Don't use these - image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre -@@ -850,6 +851,18 @@ - done - $(RM) $(JRE_BIN_LIST) - -+# Duplicate current j2re-image contents to server-j2re-image -+# for the server version of jre, before deploy build -+server-jdk-image:: -+ $(RM) -r $(JDK_SERVER_IMAGE_DIR) -+ $(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_IMAGE_DIR) -+ $(RM) -r $(JDK_SERVER_IMAGE_DIR)/demo -+ $(RM) -r $(JDK_SERVER_IMAGE_DIR)/sample -+ $(RM) $(JDK_SERVER_IMAGE_DIR)/bin/jcontrol -+ $(RM) $(JDK_SERVER_IMAGE_DIR)/jre/bin/jcontrol -+ $(RM) $(JDK_SERVER_IMAGE_DIR)/man/ja_JP.UTF-8/man1/javaws.1 -+ $(RM) $(JDK_SERVER_IMAGE_DIR)/man/man1/javaws.1 -+ - ###################################################### - # JDK Image - ######################################################
--- a/patches/openjdk/8006536-remove_trailing_slashes.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1372302908 18000 -# Node ID b904ff04371605b2bd33ea6f80794585cf6eb84c -# Parent 4f08c170e2daef20a8b249ba50a9986f7cd09e67 -8006536: [launcher] removes trailing slashes on arguments -Reviewed-by: ksrini, akhil -Contributed-by: jviswana@linux.vnet.ibm.com - ---- openjdk/jdk/src/windows/bin/cmdtoargs.c -+++ openjdk/jdk/src/windows/bin/cmdtoargs.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -104,6 +104,11 @@ - - case ' ': - case '\t': -+ if (prev == '\\') { -+ for (i = 0 ; i < slashes; i++) { -+ *dest++ = prev; -+ } -+ } - if (quotes % 2 == 1) { - *dest++ = ch; - } else { -@@ -591,6 +596,12 @@ - // v->disable(); - vectors[i++] = v; - -+ v= new Vector(argv[0], "a b\\\\ d"); -+ v->add("a", FALSE); -+ v->add("b\\\\", FALSE); -+ v->add("d", FALSE); -+ vectors[i++] = v; -+ - dotest(vectors); - printf("All tests pass [%d]\n", i); - doexit(0);
--- a/patches/openjdk/8009463-space_and_final_backslash.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -# HG changeset patch -# User uta -# Date 1362736022 -14400 -# Node ID 81f7897e8144196779a3e0050150ceaa9d7c26fe -# Parent 686d810cb9b66eae9456e259dd697854b8d0eaec -8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. -Reviewed-by: alanb, ahgross - ---- openjdk/jdk/src/windows/classes/java/lang/ProcessImpl.java -+++ openjdk/jdk/src/windows/classes/java/lang/ProcessImpl.java -@@ -262,6 +262,22 @@ - if (needsEscaping(isCmdFile, s)) { - cmdbuf.append('"'); - cmdbuf.append(s); -+ -+ // The code protects the [java.exe] and console command line -+ // parser, that interprets the [\"] combination as an escape -+ // sequence for the ["] char. -+ // http://msdn.microsoft.com/en-us/library/17w5ykft.aspx -+ // -+ // If the argument is an FS path, doubling of the tail [\] -+ // char is not a problem for non-console applications. -+ // -+ // The [\"] sequence is not an escape sequence for the [cmd.exe] -+ // command line parser. The case of the [""] tail escape -+ // sequence could not be realized due to the argument validation -+ // procedure. -+ if (!isCmdFile && s.endsWith("\\")) { -+ cmdbuf.append('\\'); -+ } - cmdbuf.append('"'); - } else { - cmdbuf.append(s);
--- a/patches/openjdk/8010118-caller_sensitive.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2950 +0,0 @@ -changeset: 4945:0ab2712a035a -user: andrew -date: Tue Jun 18 08:09:59 2013 -0500 -files: make/java/java/FILES_c.gmk make/java/java/mapfile-vers make/java/java/reorder-i586 make/java/java/reorder-sparc make/java/java/reorder-sparcv9 src/share/classes/java/io/ObjectStreamClass.java src/share/classes/java/io/ObjectStreamField.java src/share/classes/java/lang/Class.java src/share/classes/java/lang/ClassLoader.java src/share/classes/java/lang/Package.java src/share/classes/java/lang/Runtime.java src/share/classes/java/lang/System.java src/share/classes/java/lang/Thread.java src/share/classes/java/lang/invoke/MemberName.java src/share/classes/java/lang/invoke/MethodHandleImpl.java src/share/classes/java/lang/invoke/MethodHandleNatives.java src/share/classes/java/lang/invoke/MethodHandleProxies.java src/share/classes/java/lang/invoke/MethodHandles.java src/share/classes/java/lang/reflect/Constructor.java src/share/classes/java/lang/reflect/Field.java src/share/classes/java/lang/reflect/Method.java src/share/classes/java/lang/reflect/Proxy.java src/share/classes/java/security/AccessController.java src/share/classes/java/sql/DriverManager.java src/share/classes/java/util/ResourceBundle.java src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java src/share/classes/java/util/logging/Logger.java src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java src/share/classes/sun/misc/Unsafe.java src/share/classes/sun/reflect/CallerSensitive.java src/share/classes/sun/reflect/Reflection.java src/share/native/java/lang/ClassLoader.c src/share/native/java/lang/SecurityManager.c src/share/native/sun/reflect/Reflection.c test/Makefile test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java test/sun/reflect/CallerSensitive/ClassFileReader.java test/sun/reflect/CallerSensitive/MethodFinder.java test/sun/reflect/CallerSensitive/MissingCallerSensitive.java -description: -8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive -Reviewed-by: alanb, twisti, jrose, kvn - - ---- openjdk/jdk/make/java/java/FILES_c.gmk -+++ openjdk/jdk/make/java/java/FILES_c.gmk -@@ -48,7 +48,6 @@ - Proxy.c \ - RandomAccessFile.c \ - RandomAccessFile_md.c \ -- ResourceBundle.c \ - Runtime.c \ - SecurityManager.c \ - Shutdown.c \ -@@ -69,7 +68,6 @@ - jdk_util_md.c \ - check_version.c \ - java_props_md.c \ -- DriverManager.c \ - ConstantPool.c \ - MessageUtils.c \ - GC.c \ ---- openjdk/jdk/make/java/java/mapfile-vers -+++ openjdk/jdk/make/java/java/mapfile-vers -@@ -233,8 +232,6 @@ - Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2; - Java_java_security_AccessController_getStackAccessControlContext; - Java_java_security_AccessController_getInheritedAccessControlContext; -- Java_java_sql_DriverManager_getCallerClassLoader; -- Java_java_util_ResourceBundle_getClassContext; - Java_java_util_TimeZone_getSystemTimeZoneID; - Java_java_util_TimeZone_getSystemGMTOffsetID; - Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8; ---- openjdk/jdk/make/java/java/reorder-i586 -+++ openjdk/jdk/make/java/java/reorder-i586 -@@ -73,7 +73,6 @@ - # Test Sleep - # Test IntToString - # Test LoadToolkit --text: .text%Java_java_util_ResourceBundle_getClassContext; - text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; - text: .text%JNU_GetEnv; - text: .text%Java_java_io_UnixFileSystem_checkAccess; ---- openjdk/jdk/make/java/java/reorder-sparc -+++ openjdk/jdk/make/java/java/reorder-sparc -@@ -78,7 +78,6 @@ - # Test Sleep - # Test IntToString - # Test LoadToolkit --text: .text%Java_java_util_ResourceBundle_getClassContext; - text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; - text: .text%JNU_GetEnv; - text: .text%Java_java_io_UnixFileSystem_checkAccess; ---- openjdk/jdk/make/java/java/reorder-sparcv9 -+++ openjdk/jdk/make/java/java/reorder-sparcv9 -@@ -74,7 +74,6 @@ - # Test Sleep - # Test IntToString - # Test LoadToolkit --text: .text%Java_java_util_ResourceBundle_getClassContext; - text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; - text: .text%JNU_GetEnv; - text: .text%Java_java_io_UnixFileSystem_checkAccess; ---- openjdk/jdk/src/share/classes/java/io/ObjectStreamClass.java -+++ openjdk/jdk/src/share/classes/java/io/ObjectStreamClass.java -@@ -49,6 +49,8 @@ - import java.util.concurrent.ConcurrentHashMap; - import java.util.concurrent.ConcurrentMap; - import sun.misc.Unsafe; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - import sun.reflect.ReflectionFactory; - import sun.reflect.misc.ReflectUtil; - -@@ -259,12 +261,13 @@ - * - * @return the <code>Class</code> instance that this descriptor represents - */ -+ @CallerSensitive - public Class<?> forClass() { - if (cl == null) { - return null; - } -- ClassLoader ccl = ObjectStreamField.getCallerClassLoader(); -- if (ReflectUtil.needsPackageAccessCheck(ccl, cl.getClassLoader())) { -+ Class<?> caller = Reflection.getCallerClass(); -+ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) { - ReflectUtil.checkPackageAccess(cl); - } - return cl; ---- openjdk/jdk/src/share/classes/java/io/ObjectStreamField.java -+++ openjdk/jdk/src/share/classes/java/io/ObjectStreamField.java -@@ -26,6 +26,7 @@ - package java.io; - - import java.lang.reflect.Field; -+import sun.reflect.CallerSensitive; - import sun.reflect.Reflection; - import sun.reflect.misc.ReflectUtil; - -@@ -159,32 +160,15 @@ - * @return a <code>Class</code> object representing the type of the - * serializable field - */ -+ @CallerSensitive - public Class<?> getType() { -- ClassLoader ccl = getCallerClassLoader(); -- if (ReflectUtil.needsPackageAccessCheck(ccl, type.getClassLoader())) { -+ Class<?> caller = Reflection.getCallerClass(); -+ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) { - ReflectUtil.checkPackageAccess(type); - } - return type; - } - -- // Returns the invoker's class loader. -- // This is package private because it is accessed from ObjectStreamClass. -- // NOTE: This must always be invoked when there is exactly one intervening -- // frame from the core libraries on the stack between this method's -- // invocation and the desired invoker. The frame count of 3 is determined -- // as follows: -- // -- // 0: Reflection.getCallerClass -- // 1: getCallerClassLoader() -- // 2: ObjectStreamField.getType() or ObjectStreamClass.forClass() -- // 3: the caller we want to check -- // -- // NOTE: copied from java.lang.ClassLoader and modified. -- static ClassLoader getCallerClassLoader() { -- Class caller = Reflection.getCallerClass(3); -- return caller.getClassLoader(); -- } -- - /** - * Returns character encoding of field type. The encoding is as follows: - * <blockquote><pre> ---- openjdk/jdk/src/share/classes/java/lang/Class.java -+++ openjdk/jdk/src/share/classes/java/lang/Class.java -@@ -53,6 +53,7 @@ - import java.util.Map; - import java.util.HashMap; - import sun.misc.Unsafe; -+import sun.reflect.CallerSensitive; - import sun.reflect.ConstantPool; - import sun.reflect.Reflection; - import sun.reflect.ReflectionFactory; -@@ -183,9 +184,11 @@ - * by this method fails - * @exception ClassNotFoundException if the class cannot be located - */ -+ @CallerSensitive - public static Class<?> forName(String className) - throws ClassNotFoundException { -- return forName0(className, true, ClassLoader.getCallerClassLoader()); -+ return forName0(className, true, -+ ClassLoader.getClassLoader(Reflection.getCallerClass())); - } - - -@@ -249,6 +252,7 @@ - * @see java.lang.ClassLoader - * @since 1.2 - */ -+ @CallerSensitive - public static Class<?> forName(String name, boolean initialize, - ClassLoader loader) - throws ClassNotFoundException -@@ -256,7 +260,7 @@ - if (loader == null) { - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { -- ClassLoader ccl = ClassLoader.getCallerClassLoader(); -+ ClassLoader ccl = ClassLoader.getClassLoader(Reflection.getCallerClass()); - if (ccl != null) { - sm.checkPermission( - SecurityConstants.GET_CLASSLOADER_PERMISSION); -@@ -318,18 +322,14 @@ - * </ul> - * - */ -+ @CallerSensitive - public T newInstance() - throws InstantiationException, IllegalAccessException - { - if (System.getSecurityManager() != null) { -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), false); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), false); - } -- return newInstance0(); -- } - -- private T newInstance0() -- throws InstantiationException, IllegalAccessException -- { - // NOTE: the following code may not be strictly correct under - // the current Java memory model. - -@@ -363,7 +363,7 @@ - // Security check (same as in java.lang.reflect.Constructor) - int modifiers = tmpConstructor.getModifiers(); - if (!Reflection.quickCheckMemberAccess(this, modifiers)) { -- Class caller = Reflection.getCallerClass(3); -+ Class<?> caller = Reflection.getCallerClass(); - if (newInstanceCallerCache != caller) { - Reflection.ensureMemberAccess(caller, this, null, modifiers); - newInstanceCallerCache = caller; -@@ -604,16 +604,14 @@ - * @see SecurityManager#checkPermission - * @see java.lang.RuntimePermission - */ -+ @CallerSensitive - public ClassLoader getClassLoader() { - ClassLoader cl = getClassLoader0(); - if (cl == null) - return null; - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { -- ClassLoader ccl = ClassLoader.getCallerClassLoader(); -- if (ccl != null && ccl != cl && !cl.isAncestor(ccl)) { -- sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); -- } -+ ClassLoader.checkClassLoaderPermission(cl, Reflection.getCallerClass()); - } - return cl; - } -@@ -894,6 +892,7 @@ - * that class is a local or anonymous class; otherwise {@code null}. - * @since 1.5 - */ -+ @CallerSensitive - public Method getEnclosingMethod() { - EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo(); - -@@ -923,7 +922,7 @@ - // - // Note that we need to do this on the enclosing class - enclosingCandidate.checkMemberAccess(Member.DECLARED, -- ClassLoader.getCallerClassLoader(), true); -+ Reflection.getCallerClass(), true); - /* - * Loop over all declared methods; match method name, - * number of and type of parameters, *and* return -@@ -1031,6 +1030,7 @@ - * that class is a local or anonymous class; otherwise {@code null}. - * @since 1.5 - */ -+ @CallerSensitive - public Constructor<?> getEnclosingConstructor() { - EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo(); - -@@ -1059,7 +1059,7 @@ - // - // Note that we need to do this on the enclosing class - enclosingCandidate.checkMemberAccess(Member.DECLARED, -- ClassLoader.getCallerClassLoader(), true); -+ Reflection.getCallerClass(), true); - /* - * Loop over all declared constructors; match number - * of and type of parameters. -@@ -1106,6 +1106,7 @@ - * @return the immediately enclosing class of the underlying class - * @since 1.5 - */ -+ @CallerSensitive - public Class<?> getEnclosingClass() { - // There are five kinds of classes (or interfaces): - // a) Top level classes -@@ -1138,7 +1139,7 @@ - // see java.lang.SecurityManager.checkMemberAccess - if (enclosingCandidate != null) { - enclosingCandidate.checkMemberAccess(Member.DECLARED, -- ClassLoader.getCallerClassLoader(), true); -+ Reflection.getCallerClass(), true); - } - return enclosingCandidate; - } -@@ -1323,11 +1324,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Class<?>[] getClasses() { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), false); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), false); - - // Privileged so this implementation can look at DECLARED classes, - // something the caller might not have privilege to do. The code here -@@ -1398,11 +1400,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Field[] getFields() throws SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true); - return copyFields(privateGetPublicFields(null)); - } - -@@ -1449,11 +1452,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Method[] getMethods() throws SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true); - return copyMethods(privateGetPublicMethods()); - } - -@@ -1498,11 +1502,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Constructor<?>[] getConstructors() throws SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true); - return copyConstructors(privateGetDeclaredConstructors(true)); - } - -@@ -1556,12 +1561,13 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Field getField(String name) - throws NoSuchFieldException, SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true); - Field field = getField0(name); - if (field == null) { - throw new NoSuchFieldException(name); -@@ -1641,12 +1647,13 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Method getMethod(String name, Class<?>... parameterTypes) - throws NoSuchMethodException, SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true); - Method method = getMethod0(name, parameterTypes); - if (method == null) { - throw new NoSuchMethodException(getName() + "." + name + argumentTypesToString(parameterTypes)); -@@ -1695,12 +1702,13 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Constructor<T> getConstructor(Class<?>... parameterTypes) - throws NoSuchMethodException, SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true); - return getConstructor0(parameterTypes, Member.PUBLIC); - } - -@@ -1738,11 +1746,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Class<?>[] getDeclaredClasses() throws SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), false); -+ checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), false); - return getDeclaredClasses0(); - } - -@@ -1782,11 +1791,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Field[] getDeclaredFields() throws SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true); - return copyFields(privateGetDeclaredFields(false)); - } - -@@ -1830,11 +1840,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Method[] getDeclaredMethods() throws SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true); - return copyMethods(privateGetDeclaredMethods(false)); - } - -@@ -1875,11 +1886,12 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Constructor<?>[] getDeclaredConstructors() throws SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true); - return copyConstructors(privateGetDeclaredConstructors(false)); - } - -@@ -1918,12 +1930,13 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Field getDeclaredField(String name) - throws NoSuchFieldException, SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true); - Field field = searchFields(privateGetDeclaredFields(false), name); - if (field == null) { - throw new NoSuchFieldException(name); -@@ -1973,12 +1986,13 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Method getDeclaredMethod(String name, Class<?>... parameterTypes) - throws NoSuchMethodException, SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true); - Method method = searchMethods(privateGetDeclaredMethods(false), name, parameterTypes); - if (method == null) { - throw new NoSuchMethodException(getName() + "." + name + argumentTypesToString(parameterTypes)); -@@ -2023,12 +2037,13 @@ - * - * @since JDK1.1 - */ -+ @CallerSensitive - public Constructor<T> getDeclaredConstructor(Class<?>... parameterTypes) - throws NoSuchMethodException, SecurityException { - // be very careful not to change the stack depth of this - // checkMemberAccess call for security reasons - // see java.lang.SecurityManager.checkMemberAccess -- checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true); -+ checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true); - return getConstructor0(parameterTypes, Member.DECLARED); - } - -@@ -2186,23 +2201,40 @@ - */ - static native Class getPrimitiveClass(String name); - -+ private static boolean isCheckMemberAccessOverridden(SecurityManager smgr) { -+ if (smgr.getClass() == SecurityManager.class) return false; -+ -+ Class<?>[] paramTypes = new Class<?>[] {Class.class, int.class}; -+ return smgr.getClass().getMethod0("checkMemberAccess", paramTypes). -+ getDeclaringClass() != SecurityManager.class; -+ } -+ - - /* - * Check if client is allowed to access members. If access is denied, - * throw a SecurityException. - * -- * Be very careful not to change the stack depth of this checkMemberAccess -- * call for security reasons. -- * See java.lang.SecurityManager.checkMemberAccess. -- * - * <p> Default policy: allow all clients access with normal Java access - * control. - */ -- private void checkMemberAccess(int which, ClassLoader ccl, boolean checkProxyInterfaces) { -- SecurityManager s = System.getSecurityManager(); -+ private void checkMemberAccess(int which, Class<?> caller, boolean checkProxyInterfaces) { -+ final SecurityManager s = System.getSecurityManager(); - if (s != null) { -- s.checkMemberAccess(this, which); -- ClassLoader cl = getClassLoader0(); -+ final ClassLoader ccl = ClassLoader.getClassLoader(caller); -+ final ClassLoader cl = getClassLoader0(); -+ if (!isCheckMemberAccessOverridden(s)) { -+ // Inlined SecurityManager.checkMemberAccess -+ if (which != Member.PUBLIC) { -+ if (ccl != cl) { -+ s.checkPermission(SecurityConstants.CHECK_MEMBER_ACCESS_PERMISSION); -+ } -+ } -+ } else { -+ // Don't refactor; otherwise break the stack depth for -+ // checkMemberAccess of subclasses of SecurityManager as specified. -+ s.checkMemberAccess(this, which); -+ } -+ - if (ReflectUtil.needsPackageAccessCheck(ccl, cl)) { - String name = this.getName(); - int i = name.lastIndexOf('.'); ---- openjdk/jdk/src/share/classes/java/lang/ClassLoader.java -+++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java -@@ -56,6 +56,7 @@ - import sun.misc.Resource; - import sun.misc.URLClassPath; - import sun.misc.VM; -+import sun.reflect.CallerSensitive; - import sun.reflect.Reflection; - import sun.security.util.SecurityConstants; - -@@ -1396,15 +1395,13 @@ - * - * @since 1.2 - */ -+ @CallerSensitive - public final ClassLoader getParent() { - if (parent == null) - return null; - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { -- ClassLoader ccl = getCallerClassLoader(); -- if (ccl != null && !isAncestor(ccl)) { -- sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); -- } -+ checkClassLoaderPermission(parent, Reflection.getCallerClass()); - } - return parent; - } -@@ -1464,6 +1461,7 @@ - * - * @revised 1.4 - */ -+ @CallerSensitive - public static ClassLoader getSystemClassLoader() { - initSystemClassLoader(); - if (scl == null) { -@@ -1471,10 +1469,7 @@ - } - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { -- ClassLoader ccl = getCallerClassLoader(); -- if (ccl != null && ccl != scl && !scl.isAncestor(ccl)) { -- sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); -- } -+ checkClassLoaderPermission(scl, Reflection.getCallerClass()); - } - return scl; - } -@@ -1522,13 +1517,25 @@ - return false; - } - -- // Returns the invoker's class loader, or null if none. -- // NOTE: This must always be invoked when there is exactly one intervening -- // frame from the core libraries on the stack between this method's -- // invocation and the desired invoker. -- static ClassLoader getCallerClassLoader() { -- // NOTE use of more generic Reflection.getCallerClass() -- Class caller = Reflection.getCallerClass(3); -+ // Tests if class loader access requires "getClassLoader" permission -+ // check. A class loader 'from' can access class loader 'to' if -+ // class loader 'from' is same as class loader 'to' or an ancestor -+ // of 'to'. The class loader in a system domain can access -+ // any class loader. -+ private static boolean needsClassLoaderPermissionCheck(ClassLoader from, -+ ClassLoader to) -+ { -+ if (from == to) -+ return false; -+ -+ if (from == null) -+ return false; -+ -+ return !to.isAncestor(from); -+ } -+ -+ // Returns the class's class loader, or null if none. -+ static ClassLoader getClassLoader(Class<?> caller) { - // This can be null if the VM is requesting it - if (caller == null) { - return null; -@@ -1537,6 +1544,17 @@ - return caller.getClassLoader0(); - } - -+ static void checkClassLoaderPermission(ClassLoader cl, Class<?> caller) { -+ SecurityManager sm = System.getSecurityManager(); -+ if (sm != null) { -+ // caller can be null if the VM is requesting it -+ ClassLoader ccl = getClassLoader(caller); -+ if (needsClassLoaderPermissionCheck(ccl, cl)) { -+ sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); -+ } -+ } -+ } -+ - // The class loader for the system - // @GuardedBy("ClassLoader.class") - private static ClassLoader scl; ---- openjdk/jdk/src/share/classes/java/lang/Package.java -+++ openjdk/jdk/src/share/classes/java/lang/Package.java -@@ -47,9 +47,10 @@ - import java.util.HashMap; - import java.util.Iterator; - -+import java.lang.annotation.Annotation; - import sun.net.www.ParseUtil; -- --import java.lang.annotation.Annotation; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** - * {@code Package} objects contain version information -@@ -272,8 +273,9 @@ - * @return the package of the requested name. It may be null if no package - * information is available from the archive or codebase. - */ -+ @CallerSensitive - public static Package getPackage(String name) { -- ClassLoader l = ClassLoader.getCallerClassLoader(); -+ ClassLoader l = ClassLoader.getClassLoader(Reflection.getCallerClass()); - if (l != null) { - return l.getPackage(name); - } else { -@@ -293,8 +295,9 @@ - * @return a new array of packages known to the callers {@code ClassLoader} - * instance. An zero length array is returned if none are known. - */ -+ @CallerSensitive - public static Package[] getPackages() { -- ClassLoader l = ClassLoader.getCallerClassLoader(); -+ ClassLoader l = ClassLoader.getClassLoader(Reflection.getCallerClass()); - if (l != null) { - return l.getPackages(); - } else { ---- openjdk/jdk/src/share/classes/java/lang/Runtime.java -+++ openjdk/jdk/src/share/classes/java/lang/Runtime.java -@@ -27,6 +27,8 @@ - - import java.io.*; - import java.util.StringTokenizer; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** - * Every Java application has a single instance of class -@@ -776,8 +778,9 @@ - * @see java.lang.SecurityException - * @see java.lang.SecurityManager#checkLink(java.lang.String) - */ -+ @CallerSensitive - public void load(String filename) { -- load0(System.getCallerClass(), filename); -+ load0(Reflection.getCallerClass(), filename); - } - - synchronized void load0(Class fromClass, String filename) { -@@ -829,8 +832,9 @@ - * @see java.lang.SecurityException - * @see java.lang.SecurityManager#checkLink(java.lang.String) - */ -+ @CallerSensitive - public void loadLibrary(String libname) { -- loadLibrary0(System.getCallerClass(), libname); -+ loadLibrary0(Reflection.getCallerClass(), libname); - } - - synchronized void loadLibrary0(Class fromClass, String libname) { ---- openjdk/jdk/src/share/classes/java/lang/System.java -+++ openjdk/jdk/src/share/classes/java/lang/System.java -@@ -34,7 +34,8 @@ - import java.nio.channels.Channel; - import java.nio.channels.spi.SelectorProvider; - import sun.nio.ch.Interruptible; - import sun.net.InetAddressCachePolicy; -+import sun.reflect.CallerSensitive; - import sun.reflect.Reflection; - import sun.security.util.SecurityConstants; - import sun.reflect.annotation.AnnotationType; -@@ -1055,8 +1056,9 @@ - * @see java.lang.Runtime#load(java.lang.String) - * @see java.lang.SecurityManager#checkLink(java.lang.String) - */ -+ @CallerSensitive - public static void load(String filename) { -- Runtime.getRuntime().load0(getCallerClass(), filename); -+ Runtime.getRuntime().load0(Reflection.getCallerClass(), filename); - } - - /** -@@ -1080,8 +1082,9 @@ - * @see java.lang.Runtime#loadLibrary(java.lang.String) - * @see java.lang.SecurityManager#checkLink(java.lang.String) - */ -+ @CallerSensitive - public static void loadLibrary(String libname) { -- Runtime.getRuntime().loadLibrary0(getCallerClass(), libname); -+ Runtime.getRuntime().loadLibrary0(Reflection.getCallerClass(), libname); - } - - /** -@@ -1197,10 +1200,4 @@ - } - }); - } -- -- /* returns the class of the caller. */ -- static Class getCallerClass() { -- // NOTE use of more generic Reflection.getCallerClass() -- return Reflection.getCallerClass(3); -- } - } ---- openjdk/jdk/src/share/classes/java/lang/Thread.java -+++ openjdk/jdk/src/share/classes/java/lang/Thread.java -@@ -37,6 +37,8 @@ - import java.util.concurrent.ConcurrentMap; - import java.util.concurrent.locks.LockSupport; - import sun.nio.ch.Interruptible; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - import sun.security.util.SecurityConstants; - - -@@ -1440,16 +1442,15 @@ - * - * @since 1.2 - */ -+ @CallerSensitive - public ClassLoader getContextClassLoader() { - if (contextClassLoader == null) - return null; -+ - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { -- ClassLoader ccl = ClassLoader.getCallerClassLoader(); -- if (ccl != null && ccl != contextClassLoader && -- !contextClassLoader.isAncestor(ccl)) { -- sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); -- } -+ ClassLoader.checkClassLoaderPermission(contextClassLoader, -+ Reflection.getCallerClass()); - } - return contextClassLoader; - } ---- openjdk/jdk/src/share/classes/java/lang/reflect/Constructor.java -+++ openjdk/jdk/src/share/classes/java/lang/reflect/Constructor.java -@@ -25,6 +25,7 @@ - - package java.lang.reflect; - -+import sun.reflect.CallerSensitive; - import sun.reflect.ConstructorAccessor; - import sun.reflect.Reflection; - import sun.reflect.generics.repository.ConstructorRepository; -@@ -505,13 +506,14 @@ - * @exception ExceptionInInitializerError if the initialization provoked - * by this method fails. - */ -+ @CallerSensitive - public T newInstance(Object ... initargs) - throws InstantiationException, IllegalAccessException, - IllegalArgumentException, InvocationTargetException - { - if (!override) { - if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -- Class caller = Reflection.getCallerClass(2); -+ Class<?> caller = Reflection.getCallerClass(); - if (securityCheckCache != caller) { - Reflection.ensureMemberAccess(caller, clazz, null, modifiers); - securityCheckCache = caller; ---- openjdk/jdk/src/share/classes/java/lang/reflect/Field.java -+++ openjdk/jdk/src/share/classes/java/lang/reflect/Field.java -@@ -25,6 +25,7 @@ - - package java.lang.reflect; - -+import sun.reflect.CallerSensitive; - import sun.reflect.FieldAccessor; - import sun.reflect.Reflection; - import sun.reflect.generics.repository.FieldRepository; -@@ -366,9 +367,15 @@ - * @exception ExceptionInInitializerError if the initialization provoked - * by this method fails. - */ -+ @CallerSensitive - public Object get(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).get(obj); - } - -@@ -394,9 +401,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public boolean getBoolean(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getBoolean(obj); - } - -@@ -422,9 +435,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public byte getByte(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getByte(obj); - } - -@@ -452,9 +471,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public char getChar(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getChar(obj); - } - -@@ -482,9 +507,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public short getShort(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getShort(obj); - } - -@@ -512,9 +543,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public int getInt(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getInt(obj); - } - -@@ -542,9 +579,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public long getLong(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getLong(obj); - } - -@@ -572,9 +615,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public float getFloat(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getFloat(obj); - } - -@@ -602,9 +651,15 @@ - * by this method fails. - * @see Field#get - */ -+ @CallerSensitive - public double getDouble(Object obj) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - return getFieldAccessor(obj).getDouble(obj); - } - -@@ -674,9 +729,15 @@ - * @exception ExceptionInInitializerError if the initialization provoked - * by this method fails. - */ -+ @CallerSensitive - public void set(Object obj, Object value) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).set(obj, value); - } - -@@ -704,9 +765,15 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setBoolean(Object obj, boolean z) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setBoolean(obj, z); - } - -@@ -734,9 +801,15 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setByte(Object obj, byte b) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setByte(obj, b); - } - -@@ -764,9 +837,15 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setChar(Object obj, char c) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setChar(obj, c); - } - -@@ -794,9 +873,15 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setShort(Object obj, short s) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setShort(obj, s); - } - -@@ -824,9 +909,15 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setInt(Object obj, int i) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setInt(obj, i); - } - -@@ -854,9 +945,15 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setLong(Object obj, long l) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setLong(obj, l); - } - -@@ -884,9 +981,15 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setFloat(Object obj, float f) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setFloat(obj, f); - } - -@@ -914,20 +1017,25 @@ - * by this method fails. - * @see Field#set - */ -+ @CallerSensitive - public void setDouble(Object obj, double d) - throws IllegalArgumentException, IllegalAccessException - { -+ if (!override) { -+ if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -+ checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers); -+ } -+ } - getFieldAccessor(obj).setDouble(obj, d); - } - -- // Convenience routine which performs security checks -+ // security check is done before calling this method - private FieldAccessor getFieldAccessor(Object obj) - throws IllegalAccessException - { -- doSecurityCheck(obj); - boolean ov = override; -- FieldAccessor a = (ov)? overrideFieldAccessor : fieldAccessor; -- return (a != null)? a : acquireFieldAccessor(ov); -+ FieldAccessor a = (ov) ? overrideFieldAccessor : fieldAccessor; -+ return (a != null) ? a : acquireFieldAccessor(ov); - } - - // NOTE that there is no synchronization used here. It is correct -@@ -1069,10 +1069,7 @@ - // NOTE: be very careful if you change the stack depth of this - // routine. The depth of the "getCallerClass" call is hardwired so - // that the compiler can have an easier time if this gets inlined. -- private void doSecurityCheck(Object obj) throws IllegalAccessException { -- if (!override) { -- if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -- Class caller = Reflection.getCallerClass(4); -+ private void checkAccess(Class caller, Class clazz, Object obj, int modifiers) throws IllegalAccessException { - Class targetClass = ((obj == null || !Modifier.isProtected(modifiers)) - ? clazz - : obj.getClass()); -@@ -1088,8 +1085,6 @@ - securityCheckCache = caller; - securityCheckTargetClassCache = targetClass; - } -- } -- } - } - - /* ---- openjdk/jdk/src/share/classes/java/lang/reflect/Method.java -+++ openjdk/jdk/src/share/classes/java/lang/reflect/Method.java -@@ -25,6 +25,7 @@ - - package java.lang.reflect; - -+import sun.reflect.CallerSensitive; - import sun.reflect.MethodAccessor; - import sun.reflect.Reflection; - import sun.reflect.generics.repository.MethodRepository; -@@ -583,13 +584,18 @@ - * @exception ExceptionInInitializerError if the initialization - * provoked by this method fails. - */ -+ @CallerSensitive - public Object invoke(Object obj, Object... args) - throws IllegalAccessException, IllegalArgumentException, - InvocationTargetException - { - if (!override) { - if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) { -- Class caller = Reflection.getCallerClass(1); -+ // Until there is hotspot @CallerSensitive support -+ // can't call Reflection.getCallerClass() here -+ // Workaround for now: add a frame getCallerClass to -+ // make the caller at stack depth 2 -+ Class<?> caller = getCallerClass(); - Class targetClass = ((obj == null || !Modifier.isProtected(modifiers)) - ? clazz - : obj.getClass()); -@@ -601,6 +606,16 @@ - return ma.invoke(obj, args); - } - -+ /* -+ * This method makes the frame count to be 2 to find the caller -+ */ -+ @CallerSensitive -+ private Class<?> getCallerClass() { -+ // Reflection.getCallerClass() currently returns the frame at depth 2 -+ // before the hotspot support is in. -+ return Reflection.getCallerClass(); -+ } -+ - /** - * Returns {@code true} if this method is a bridge - * method; returns {@code false} otherwise. ---- openjdk/jdk/src/share/classes/java/lang/reflect/Proxy.java -+++ openjdk/jdk/src/share/classes/java/lang/reflect/Proxy.java -@@ -39,6 +39,7 @@ - import java.util.Set; - import java.util.WeakHashMap; - import sun.misc.ProxyGenerator; -+import sun.reflect.CallerSensitive; - import sun.reflect.Reflection; - import sun.reflect.misc.ReflectUtil; - import sun.security.util.SecurityConstants; -@@ -405,28 +405,21 @@ - * @throws NullPointerException if the {@code interfaces} array - * argument or any of its elements are {@code null} - */ -+ @CallerSensitive - public static Class<?> getProxyClass(ClassLoader loader, - Class<?>... interfaces) - throws IllegalArgumentException - { -- return getProxyClass0(loader, interfaces); // stack walk magic: do not refactor -- } -- -- private static void checkProxyLoader(ClassLoader ccl, -- ClassLoader loader) -- { - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { -- if (loader == null && ccl != null) { -- if (!ProxyAccessHelper.allowNullLoader) { -- sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); -- } -- } -+ checkProxyAccess(Reflection.getCallerClass(), loader, interfaces); - } -+ -+ return getProxyClass0(loader, interfaces); - } - - /* -- * Generate a proxy class (caller-sensitive). -+ * Check permissions required to create a proxy class. - * - * To define a proxy class, it performs the access checks as in - * Class.forName (VM will invoke ClassLoader.checkPackageAccess): -@@ -444,16 +438,28 @@ - * will throw IllegalAccessError when the generated proxy class is - * being defined via the defineClass0 method. - */ -+ private static void checkProxyAccess(Class<?> caller, -+ ClassLoader loader, -+ Class<?>... interfaces) -+ { -+ SecurityManager sm = System.getSecurityManager(); -+ if (sm != null) { -+ ClassLoader ccl = caller.getClassLoader(); -+ if (loader == null && ccl != null) { -+ if (!ProxyAccessHelper.allowNullLoader) { -+ sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); -+ } -+ } -+ ReflectUtil.checkProxyPackageAccess(ccl, interfaces); -+ } -+ } -+ -+ /** -+ * Generate a proxy class. Must call the checkProxyAccess method -+ * to perform permission checks before calling this. -+ */ - private static Class<?> getProxyClass0(ClassLoader loader, - Class<?>... interfaces) { -- SecurityManager sm = System.getSecurityManager(); -- if (sm != null) { -- final int CALLER_FRAME = 3; // 0: Reflection, 1: getProxyClass0 2: Proxy 3: caller -- final Class<?> caller = Reflection.getCallerClass(CALLER_FRAME); -- final ClassLoader ccl = caller.getClassLoader(); -- checkProxyLoader(ccl, loader); -- ReflectUtil.checkProxyPackageAccess(ccl, interfaces); -- } - if (interfaces.length > 65535) { - throw new IllegalArgumentException("interface limit exceeded"); - } -@@ -696,6 +701,7 @@ - * if the invocation handler, {@code h}, is - * {@code null} - */ -+ @CallerSensitive - public static Object newProxyInstance(ClassLoader loader, - Class<?>[] interfaces, - InvocationHandler h) -@@ -705,10 +711,15 @@ - throw new NullPointerException(); - } - -+ final SecurityManager sm = System.getSecurityManager(); -+ if (sm != null) { -+ checkProxyAccess(Reflection.getCallerClass(), loader, interfaces); -+ } -+ - /* - * Look up or generate the designated proxy class. - */ -- Class<?> cl = getProxyClass0(loader, interfaces); // stack walk magic: do not refactor -+ Class<?> cl = getProxyClass0(loader, interfaces); - - /* - * Invoke its constructor with the designated invocation handler. -@@ -716,7 +727,6 @@ - try { - final Constructor<?> cons = cl.getConstructor(constructorParams); - final InvocationHandler ih = h; -- SecurityManager sm = System.getSecurityManager(); - if (sm != null && ProxyAccessHelper.needsNewInstanceCheck(cl)) { - // create proxy instance with doPrivilege as the proxy class may - // implement non-public interfaces that requires a special permission ---- openjdk/jdk/src/share/classes/java/security/AccessController.java -+++ openjdk/jdk/src/share/classes/java/security/AccessController.java -@@ -26,6 +26,8 @@ - package java.security; - - import sun.security.util.Debug; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** - * <p> The AccessController class is used for access control operations -@@ -264,6 +266,7 @@ - * @see java.security.DomainCombiner - */ - -+ @CallerSensitive - public static native <T> T doPrivileged(PrivilegedAction<T> action); - - /** -@@ -288,14 +291,14 @@ - * - * @since 1.6 - */ -+ @CallerSensitive - public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action) { -- - AccessControlContext acc = getStackAccessControlContext(); - if (acc == null) { - return AccessController.doPrivileged(action); - } - DomainCombiner dc = acc.getAssignedCombiner(); -- return AccessController.doPrivileged(action, preserveCombiner(dc)); -+ return AccessController.doPrivileged(action, preserveCombiner(dc, Reflection.getCallerClass())); - } - - -@@ -326,6 +329,7 @@ - * @see #doPrivileged(PrivilegedAction) - * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext) - */ -+ @CallerSensitive - public static native <T> T doPrivileged(PrivilegedAction<T> action, - AccessControlContext context); - -@@ -353,6 +357,7 @@ - * @see #doPrivilegedWithCombiner(PrivilegedExceptionAction) - * @see java.security.DomainCombiner - */ -+ @CallerSensitive - public static native <T> T - doPrivileged(PrivilegedExceptionAction<T> action) - throws PrivilegedActionException; -@@ -383,6 +388,7 @@ - * - * @since 1.6 - */ -+ @CallerSensitive - public static <T> T doPrivilegedWithCombiner - (PrivilegedExceptionAction<T> action) throws PrivilegedActionException { - -@@ -391,26 +397,18 @@ - return AccessController.doPrivileged(action); - } - DomainCombiner dc = acc.getAssignedCombiner(); -- return AccessController.doPrivileged(action, preserveCombiner(dc)); -+ return AccessController.doPrivileged(action, preserveCombiner(dc, Reflection.getCallerClass())); - } - - /** - * preserve the combiner across the doPrivileged call - */ -- private static AccessControlContext preserveCombiner -- (DomainCombiner combiner) { -- -- /** -- * callerClass[0] = Reflection.getCallerClass -- * callerClass[1] = AccessController.preserveCombiner -- * callerClass[2] = AccessController.doPrivileged -- * callerClass[3] = caller -- */ -- final Class callerClass = sun.reflect.Reflection.getCallerClass(3); -+ private static AccessControlContext preserveCombiner(DomainCombiner combiner, -+ final Class<?> caller) { - ProtectionDomain callerPd = doPrivileged - (new PrivilegedAction<ProtectionDomain>() { - public ProtectionDomain run() { -- return callerClass.getProtectionDomain(); -+ return caller.getProtectionDomain(); - } - }); - -@@ -455,6 +453,7 @@ - * @see #doPrivileged(PrivilegedAction) - * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext) - */ -+ @CallerSensitive - public static native <T> T - doPrivileged(PrivilegedExceptionAction<T> action, - AccessControlContext context) ---- openjdk/jdk/src/share/classes/java/sql/DriverManager.java -+++ openjdk/jdk/src/share/classes/java/sql/DriverManager.java -@@ -30,5 +30,7 @@ - import java.security.AccessController; - import java.security.PrivilegedAction; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** - * <P>The basic service for managing a set of JDBC drivers.<br> -@@ -180,14 +181,10 @@ - * @return a Connection to the URL - * @exception SQLException if a database access error occurs - */ -+ @CallerSensitive - public static Connection getConnection(String url, - java.util.Properties info) throws SQLException { -- -- // Gets the classloader of the code that called this method, may -- // be null. -- ClassLoader callerCL = DriverManager.getCallerClassLoader(); -- -- return (getConnection(url, info, callerCL)); -+ return (getConnection(url, info, Reflection.getCallerClass())); - } - - /** -@@ -203,14 +200,11 @@ - * @return a connection to the URL - * @exception SQLException if a database access error occurs - */ -+ @CallerSensitive - public static Connection getConnection(String url, - String user, String password) throws SQLException { - java.util.Properties info = new java.util.Properties(); - -- // Gets the classloader of the code that called this method, may -- // be null. -- ClassLoader callerCL = DriverManager.getCallerClassLoader(); -- - if (user != null) { - info.put("user", user); - } -@@ -218,7 +212,7 @@ - info.put("password", password); - } - -- return (getConnection(url, info, callerCL)); -+ return (getConnection(url, info, Reflection.getCallerClass())); - } - - /** -@@ -231,16 +225,12 @@ - * @return a connection to the URL - * @exception SQLException if a database access error occurs - */ -+ @CallerSensitive - public static Connection getConnection(String url) - throws SQLException { - - java.util.Properties info = new java.util.Properties(); -- -- // Gets the classloader of the code that called this method, may -- // be null. -- ClassLoader callerCL = DriverManager.getCallerClassLoader(); -- -- return (getConnection(url, info, callerCL)); -+ return (getConnection(url, info, Reflection.getCallerClass())); - } - - /** -@@ -233,6 +224,7 @@ - * that can connect to the given URL - * @exception SQLException if a database access error occurs - */ -+ @CallerSensitive - public static Driver getDriver(String url) - throws SQLException { - java.util.Vector drivers = null; -@@ -248,9 +240,7 @@ - drivers = readDrivers; - } - -- // Gets the classloader of the code that called this method, may -- // be null. -- ClassLoader callerCL = DriverManager.getCallerClassLoader(); -+ Class<?> callerClass = Reflection.getCallerClass(); - - // Walk through the loaded drivers attempting to locate someone - // who understands the given URL. -@@ -258,8 +248,7 @@ - DriverInfo di = (DriverInfo)drivers.elementAt(i); - // If the caller does not have permission to load the driver then - // skip it. -- if ( getCallerClass(callerCL, di.driverClassName ) != -- di.driverClass ) { -+ if ( callerClass != di.driverClass ) { - println(" skipping: " + di); - continue; - } -@@ -322,31 +311,29 @@ - * @param driver the JDBC Driver to drop - * @exception SQLException if a database access error occurs - */ -+ @CallerSensitive - public static synchronized void deregisterDriver(Driver driver) - throws SQLException { -- // Gets the classloader of the code that called this method, -- // may be null. -- ClassLoader callerCL = DriverManager.getCallerClassLoader(); - println("DriverManager.deregisterDriver: " + driver); - - // Walk through the loaded drivers. - int i; - DriverInfo di = null; - for (i = 0; i < writeDrivers.size(); i++) { - di = (DriverInfo)writeDrivers.elementAt(i); - if (di.driver == driver) { - break; - } - } - // If we can't find the driver just return. - if (i >= writeDrivers.size()) { - println(" couldn't find driver to unload"); - return; - } - - // If the caller does not have permission to load the driver then - // throw a security exception. -- if (getCallerClass(callerCL, di.driverClassName ) != di.driverClass ) { -+ if (Reflection.getCallerClass() != di.driverClass) { - throw new SecurityException(); - } - -@@ -350,6 +350,7 @@ - * - * @return the list of JDBC Drivers loaded by the caller's class loader - */ -+ @CallerSensitive - public static java.util.Enumeration<Driver> getDrivers() { - java.util.Vector<Driver> result = new java.util.Vector<Driver>(); - java.util.Vector drivers = null; -@@ -363,16 +364,14 @@ - drivers = readDrivers; - } - -- // Gets the classloader of the code that called this method, may -- // be null. -- ClassLoader callerCL = DriverManager.getCallerClassLoader(); -+ Class<?> callerClass = Reflection.getCallerClass(); - - // Walk through the loaded drivers. - for (int i = 0; i < drivers.size(); i++) { - DriverInfo di = (DriverInfo)drivers.elementAt(i); - // If the caller does not have permission to load the driver then - // skip it. -- if ( getCallerClass(callerCL, di.driverClassName ) != di.driverClass ) { -+ if ( callerClass != di.driverClass ) { - println(" skipping: " + di); - continue; - } -@@ -546,19 +537,20 @@ - - // Worker method called by the public getConnection() methods. - private static Connection getConnection( -- String url, java.util.Properties info, ClassLoader callerCL) throws SQLException { -+ String url, java.util.Properties info, Class<?> caller) throws SQLException { - java.util.Vector drivers = null; - /* - * When callerCl is null, we should check the application's - * (which is invoking this class indirectly) - * classloader, so that the JDBC driver class outside rt.jar - * can be loaded from here. - */ -- synchronized(DriverManager.class) { -- // synchronize loading of the correct classloader. -- if(callerCL == null) { -- callerCL = Thread.currentThread().getContextClassLoader(); -- } -+ ClassLoader callerCL = caller != null ? caller.getClassLoader() : null; -+ synchronized (DriverManager.class) { -+ // synchronize loading of the correct classloader. -+ if (callerCL == null) { -+ callerCL = Thread.currentThread().getContextClassLoader(); -+ } - } - - if(url == null) { -@@ -603,10 +595,6 @@ - private static boolean initialized = false; - - private static Object logSync = new Object(); -- -- /* Returns the caller's class loader, or null if none */ -- private static native ClassLoader getCallerClassLoader(); -- - } - - // DriverInfo is a package-private support class. ---- openjdk/jdk/src/share/classes/java/util/ResourceBundle.java -+++ openjdk/jdk/src/share/classes/java/util/ResourceBundle.java -@@ -56,6 +56,8 @@ - import java.util.concurrent.ConcurrentMap; - import java.util.jar.JarEntry; - -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - - /** -@@ -412,14 +414,10 @@ - - /* - * Automatic determination of the ClassLoader to be used to load -- * resources on behalf of the client. N.B. The client is getLoader's -- * caller's caller. -+ * resources on behalf of the client. - */ -- private static ClassLoader getLoader() { -- Class[] stack = getClassContext(); -- /* Magic number 2 identifies our caller's caller */ -- Class c = stack[2]; -- ClassLoader cl = (c == null) ? null : c.getClassLoader(); -+ private static ClassLoader getLoader(Class<?> caller) { -+ ClassLoader cl = caller == null ? null : caller.getClassLoader(); - if (cl == null) { - // When the caller's loader is the boot class loader, cl is null - // here. In that case, ClassLoader.getSystemClassLoader() may -@@ -433,8 +431,6 @@ - return cl; - } - -- private static native Class[] getClassContext(); -- - /** - * A wrapper of ClassLoader.getSystemClassLoader(). - */ -@@ -719,11 +715,12 @@ - * if no resource bundle for the specified base name can be found - * @return a resource bundle for the given base name and the default locale - */ -+ @CallerSensitive - public static final ResourceBundle getBundle(String baseName) - { - return getBundleImpl(baseName, Locale.getDefault(), - /* must determine loader here, else we break stack invariant */ -- getLoader(), -+ getLoader(Reflection.getCallerClass()), - Control.INSTANCE); - } - -@@ -761,11 +758,12 @@ - * needed. - * @since 1.6 - */ -+ @CallerSensitive - public static final ResourceBundle getBundle(String baseName, - Control control) { - return getBundleImpl(baseName, Locale.getDefault(), - /* must determine loader here, else we break stack invariant */ -- getLoader(), -+ getLoader(Reflection.getCallerClass()), - control); - } - -@@ -790,12 +788,13 @@ - * if no resource bundle for the specified base name can be found - * @return a resource bundle for the given base name and locale - */ -+ @CallerSensitive - public static final ResourceBundle getBundle(String baseName, - Locale locale) - { - return getBundleImpl(baseName, locale, - /* must determine loader here, else we break stack invariant */ -- getLoader(), -+ getLoader(Reflection.getCallerClass()), - Control.INSTANCE); - } - -@@ -836,11 +835,12 @@ - * needed. - * @since 1.6 - */ -+ @CallerSensitive - public static final ResourceBundle getBundle(String baseName, Locale targetLocale, - Control control) { - return getBundleImpl(baseName, targetLocale, - /* must determine loader here, else we break stack invariant */ -- getLoader(), -+ getLoader(Reflection.getCallerClass()), - control); - } - -@@ -1676,8 +1676,9 @@ - * @since 1.6 - * @see ResourceBundle.Control#getTimeToLive(String,Locale) - */ -+ @CallerSensitive - public static final void clearCache() { -- clearCache(getLoader()); -+ clearCache(getLoader(Reflection.getCallerClass())); - } - - /** ---- openjdk/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java -+++ openjdk/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java -@@ -34,8 +34,10 @@ - */ - - package java.util.concurrent.atomic; -+import java.lang.reflect.*; - import sun.misc.Unsafe; --import java.lang.reflect.*; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** - * A reflection-based utility that enables atomic updates to -@@ -69,8 +71,9 @@ - * @throws RuntimeException with a nested reflection-based - * exception if the class does not hold field or is the wrong type - */ -+ @CallerSensitive - public static <U> AtomicIntegerFieldUpdater<U> newUpdater(Class<U> tclass, String fieldName) { -- return new AtomicIntegerFieldUpdaterImpl<U>(tclass, fieldName); -+ return new AtomicIntegerFieldUpdaterImpl<U>(tclass, fieldName, Reflection.getCallerClass()); - } - - /** -@@ -268,13 +271,11 @@ - private final Class<T> tclass; - private final Class cclass; - -- AtomicIntegerFieldUpdaterImpl(Class<T> tclass, String fieldName) { -+ AtomicIntegerFieldUpdaterImpl(Class<T> tclass, String fieldName, Class<?> caller) { - Field field = null; -- Class caller = null; - int modifiers = 0; - try { - field = tclass.getDeclaredField(fieldName); -- caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); - sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); ---- openjdk/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java -+++ openjdk/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java -@@ -34,8 +34,10 @@ - */ - - package java.util.concurrent.atomic; -+import java.lang.reflect.*; - import sun.misc.Unsafe; --import java.lang.reflect.*; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** - * A reflection-based utility that enables atomic updates to -@@ -69,11 +71,13 @@ - * @throws RuntimeException with a nested reflection-based - * exception if the class does not hold field or is the wrong type. - */ -+ @CallerSensitive - public static <U> AtomicLongFieldUpdater<U> newUpdater(Class<U> tclass, String fieldName) { -+ Class<?> caller = Reflection.getCallerClass(); - if (AtomicLong.VM_SUPPORTS_LONG_CAS) -- return new CASUpdater<U>(tclass, fieldName); -+ return new CASUpdater<U>(tclass, fieldName, caller); - else -- return new LockedUpdater<U>(tclass, fieldName); -+ return new LockedUpdater<U>(tclass, fieldName, caller); - } - - /** -@@ -267,13 +271,11 @@ - private final Class<T> tclass; - private final Class cclass; - -- CASUpdater(Class<T> tclass, String fieldName) { -+ CASUpdater(Class<T> tclass, String fieldName, Class<?> caller) { - Field field = null; -- Class caller = null; - int modifiers = 0; - try { - field = tclass.getDeclaredField(fieldName); -- caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); - sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); -@@ -350,13 +352,11 @@ - private final Class<T> tclass; - private final Class cclass; - -- LockedUpdater(Class<T> tclass, String fieldName) { -+ LockedUpdater(Class<T> tclass, String fieldName, Class<?> caller) { - Field field = null; -- Class caller = null; - int modifiers = 0; - try { - field = tclass.getDeclaredField(fieldName); -- caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); - sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); ---- openjdk/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java -+++ openjdk/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java -@@ -34,8 +34,10 @@ - */ - - package java.util.concurrent.atomic; -+import java.lang.reflect.*; - import sun.misc.Unsafe; --import java.lang.reflect.*; -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; - - /** - * A reflection-based utility that enables atomic updates to -@@ -88,10 +90,12 @@ - * @throws RuntimeException with a nested reflection-based - * exception if the class does not hold field or is the wrong type. - */ -+ @CallerSensitive - public static <U, W> AtomicReferenceFieldUpdater<U,W> newUpdater(Class<U> tclass, Class<W> vclass, String fieldName) { - return new AtomicReferenceFieldUpdaterImpl<U,W>(tclass, - vclass, -- fieldName); -+ fieldName, -+ Reflection.getCallerClass()); - } - - /** -@@ -199,14 +203,13 @@ - - AtomicReferenceFieldUpdaterImpl(Class<T> tclass, - Class<V> vclass, -- String fieldName) { -+ String fieldName, -+ Class<?> caller) { - Field field = null; - Class fieldClass = null; -- Class caller = null; - int modifiers = 0; - try { - field = tclass.getDeclaredField(fieldName); -- caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); - sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); ---- openjdk/jdk/src/share/classes/java/util/logging/Logger.java -+++ openjdk/jdk/src/share/classes/java/util/logging/Logger.java -@@ -303,13 +305,10 @@ - } - } - -- private static Logger demandLogger(String name, String resourceBundleName) { -+ private static Logger demandLogger(String name, String resourceBundleName, Class<?> caller) { - LogManager manager = LogManager.getLogManager(); - SecurityManager sm = System.getSecurityManager(); - if (sm != null && !SystemLoggerHelper.disableCallerCheck) { -- // 0: Reflection 1: Logger.getLoggerContext 2: Logger.getLogger 3: caller -- final int SKIP_FRAMES = 3; -- Class<?> caller = sun.reflect.Reflection.getCallerClass(SKIP_FRAMES); - if (caller.getClassLoader() == null) { - return manager.demandSystemLogger(name, resourceBundleName); - } -@@ -347,7 +346,8 @@ - * @throws NullPointerException if the name is null. - */ -+ @CallerSensitive - public static synchronized Logger getLogger(String name) { -- return demandLogger(name, null); -+ return demandLogger(name, null, Reflection.getCallerClass()); - } - - /** -@@ -404,7 +404,8 @@ - * @throws NullPointerException if the name is null. - */ -+ @CallerSensitive - public static synchronized Logger getLogger(String name, String resourceBundleName) { -- Logger result = demandLogger(name, resourceBundleName); -+ Logger result = demandLogger(name, resourceBundleName, Reflection.getCallerClass()); - if (result.resourceBundleName == null) { - // Note: we may get a MissingResourceException here. - result.setupResourceInfo(resourceBundleName); ---- openjdk/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java -+++ openjdk/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java -@@ -28,7 +28,9 @@ - import java.io.*; - import java.util.Map; - import java.lang.reflect.*; - import javax.sql.rowset.RowSetWarning; -+import sun.reflect.CallerSensitive; -+import sun.reflect.misc.ReflectUtil; - - /** - * A serializable mapping in the Java programming language of an SQL -@@ -123,7 +125,8 @@ - * @throws SerialException if an error is encountered accesssing - * the serialized object - */ -+ @CallerSensitive - public Field[] getFields() throws SerialException { - if (fields != null) { - Class c = this.obj.getClass(); - return sun.reflect.misc.FieldUtil.getFields(c); ---- openjdk/jdk/src/share/classes/sun/misc/Unsafe.java -+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java -@@ -28,6 +28,9 @@ - import java.security.*; - import java.lang.reflect.*; - -+import sun.reflect.CallerSensitive; -+import sun.reflect.Reflection; -+ - - /** - * A collection of methods for performing low-level, unsafe operations. -@@ -80,8 +83,9 @@ - * <code>checkPropertiesAccess</code> method doesn't allow - * access to the system properties. - */ -+ @CallerSensitive - public static Unsafe getUnsafe() { -- Class cc = sun.reflect.Reflection.getCallerClass(2); -+ Class cc = Reflection.getCallerClass(); - if (cc.getClassLoader() != null) - throw new SecurityException("Unsafe"); - return theUnsafe; -@@ -809,6 +813,12 @@ - ClassLoader loader, - ProtectionDomain protectionDomain); - -+ /** -+ * @deprecated Use defineClass(String, byte[], int, int, ClassLoader, ProtectionDomain) -+ * instead. This method will be removed in JDK 8. -+ */ -+ @Deprecated -+ @CallerSensitive - public native Class defineClass(String name, byte[] b, int off, int len); - - /** -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/src/share/classes/sun/reflect/CallerSensitive.java -@@ -0,0 +1,41 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package sun.reflect; -+ -+import java.lang.annotation.*; -+import static java.lang.annotation.ElementType.*; -+ -+/** -+ * A method annotated @CallerSensitive is sensitive to its calling class, -+ * via {@link sun.reflect.Reflection#getCallerClass Reflection.getCallerClass}, -+ * or via some equivalent. -+ * -+ * @author John R. Rose -+ */ -+@Retention(RetentionPolicy.RUNTIME) -+@Target({METHOD}) -+public @interface CallerSensitive { -+} ---- openjdk/jdk/src/share/classes/sun/reflect/Reflection.java -+++ openjdk/jdk/src/share/classes/sun/reflect/Reflection.java -@@ -52,16 +52,11 @@ - methodFilterMap = new HashMap<Class,String[]>(); - } - -- /** Returns the class of the method <code>realFramesToSkip</code> -- frames up the stack (zero-based), ignoring frames associated -- with java.lang.reflect.Method.invoke() and its implementation. -- The first frame is that associated with this method, so -- <code>getCallerClass(0)</code> returns the Class object for -- sun.reflect.Reflection. Frames associated with -- java.lang.reflect.Method.invoke() and its implementation are -- completely ignored and do not count toward the number of "real" -- frames skipped. */ -- public static native Class getCallerClass(int realFramesToSkip); -+ /** Returns the class of the caller of the method calling this method, -+ ignoring frames associated with java.lang.reflect.Method.invoke() -+ and its implementation. */ -+ @CallerSensitive -+ public static native Class getCallerClass(); - - /** Retrieves the access flags written to the class file. For - inner classes these flags may differ from those returned by -@@ -322,4 +317,27 @@ - } - return newMembers; - } -+ -+ /** -+ * Tests if the given method is caller-sensitive and the declaring class -+ * is defined by either the bootstrap class loader or extension class loader. -+ */ -+ public static boolean isCallerSensitive(Method m) { -+ final ClassLoader loader = m.getDeclaringClass().getClassLoader(); -+ if (loader == null || isExtClassLoader(loader)) { -+ return m.isAnnotationPresent(CallerSensitive.class); -+ } -+ return false; -+ } -+ -+ private static boolean isExtClassLoader(ClassLoader loader) { -+ ClassLoader cl = ClassLoader.getSystemClassLoader(); -+ while (cl != null) { -+ if (cl.getParent() == null && cl == loader) { -+ return true; -+ } -+ cl = cl.getParent(); -+ } -+ return false; -+ } - } ---- openjdk/jdk/src/share/native/java/lang/SecurityManager.c -+++ openjdk/jdk/src/share/native/java/lang/SecurityManager.c -@@ -29,7 +29,6 @@ - - #include "java_lang_SecurityManager.h" - #include "java_lang_ClassLoader.h" --#include "java_util_ResourceBundle.h" - - /* - * Make sure a security manager instance is initialized. ---- openjdk/jdk/src/share/native/sun/reflect/Reflection.c -+++ openjdk/jdk/src/share/native/sun/reflect/Reflection.c -@@ -27,9 +27,11 @@ - #include "sun_reflect_Reflection.h" - - JNIEXPORT jclass JNICALL Java_sun_reflect_Reflection_getCallerClass --(JNIEnv *env, jclass unused, jint depth) -+(JNIEnv *env, jclass unused) - { -- return JVM_GetCallerClass(env, depth); -+ // Until there is hotspot @CallerSensitive support, -+ // depth must always be 2 to get the immediate caller -+ return JVM_GetCallerClass(env, 2); - } - - JNIEXPORT jint JNICALL Java_sun_reflect_Reflection_getClassAccessFlags ---- openjdk/jdk/test/Makefile -+++ openjdk/jdk/test/Makefile -@@ -459,7 +459,7 @@ - - # Stable samevm testruns (minus items from PROBLEM_LIST) - JDK_ALL_TARGETS += jdk_lang --jdk_lang: java/lang -+jdk_lang: java/lang sun/reflect - $(call RunSamevmBatch) - - # Stable othervm testruns (minus items from PROBLEM_LIST) -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java -@@ -0,0 +1,248 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+import com.sun.tools.classfile.*; -+import static com.sun.tools.classfile.ConstantPool.*; -+import java.io.File; -+import java.io.IOException; -+import java.lang.reflect.InvocationTargetException; -+import java.nio.file.FileVisitResult; -+import java.nio.file.Files; -+import java.nio.file.Path; -+import java.nio.file.Paths; -+import java.nio.file.SimpleFileVisitor; -+import java.nio.file.attribute.BasicFileAttributes; -+import java.util.ArrayList; -+import java.util.List; -+import java.util.Set; -+import java.util.concurrent.Callable; -+import java.util.concurrent.ExecutionException; -+import java.util.concurrent.ExecutorService; -+import java.util.concurrent.Executors; -+import java.util.concurrent.FutureTask; -+ -+/* -+ * @test -+ * @bug 8010117 -+ * @summary Verify if CallerSensitive methods are annotated with -+ * sun.reflect.CallerSensitive annotation -+ * @build CallerSensitiveFinder MethodFinder ClassFileReader -+ * @run main/othervm/timeout=900 -mx800m CallerSensitiveFinder -+ */ -+public class CallerSensitiveFinder extends MethodFinder { -+ private static int numThreads = 3; -+ private static boolean verbose = false; -+ public static void main(String[] args) throws Exception { -+ List<Path> classes = new ArrayList<>(); -+ String testclasses = System.getProperty("test.classes", "."); -+ int i = 0; -+ while (i < args.length) { -+ String arg = args[i++]; -+ if (arg.equals("-v")) { -+ verbose = true; -+ } else { -+ Path p = Paths.get(testclasses, arg); -+ if (!p.toFile().exists()) { -+ throw new IllegalArgumentException(arg + " does not exist"); -+ } -+ classes.add(p); -+ } -+ } -+ if (classes.isEmpty()) { -+ classes.addAll(PlatformClassPath.getJREClasses()); -+ } -+ final String method = "sun/reflect/Reflection.getCallerClass"; -+ CallerSensitiveFinder csfinder = new CallerSensitiveFinder(method); -+ -+ List<String> errors = csfinder.run(classes); -+ if (!errors.isEmpty()) { -+ throw new RuntimeException(errors.size() + -+ " caller-sensitive methods are missing @CallerSensitive annotation"); -+ } -+ } -+ -+ private final List<String> csMethodsMissingAnnotation = new ArrayList<>(); -+ private final java.lang.reflect.Method mhnCallerSensitiveMethod; -+ public CallerSensitiveFinder(String... methods) throws Exception { -+ super(methods); -+ this.mhnCallerSensitiveMethod = getIsCallerSensitiveMethod(); -+ } -+ -+ static java.lang.reflect.Method getIsCallerSensitiveMethod() -+ throws ClassNotFoundException, NoSuchMethodException -+ { -+ Class<?> cls = Class.forName("java.lang.invoke.MethodHandleNatives"); -+ java.lang.reflect.Method m = cls.getDeclaredMethod("isCallerSensitiveMethod", Class.class, String.class); -+ m.setAccessible(true); -+ return m; -+ } -+ -+ boolean inMethodHandlesList(String classname, String method) { -+ Class<?> cls; -+ try { -+ cls = Class.forName(classname.replace('/', '.'), -+ false, -+ ClassLoader.getSystemClassLoader()); -+ return (Boolean) mhnCallerSensitiveMethod.invoke(null, cls, method); -+ } catch (ClassNotFoundException|IllegalAccessException e) { -+ throw new RuntimeException(e); -+ } catch (InvocationTargetException e) { -+ throw new RuntimeException(e.getCause()); -+ } -+ } -+ -+ public List<String> run(List<Path> classes) throws IOException, InterruptedException, -+ ExecutionException, ConstantPoolException -+ { -+ ExecutorService pool = Executors.newFixedThreadPool(numThreads); -+ for (Path path : classes) { -+ ClassFileReader reader = ClassFileReader.newInstance(path.toFile()); -+ for (ClassFile cf : reader.getClassFiles()) { -+ String classFileName = cf.getName(); -+ // for each ClassFile -+ // parse constant pool to find matching method refs -+ // parse each method (caller) -+ // - visit and find method references matching the given method name -+ pool.submit(getTask(cf)); -+ } -+ } -+ waitForCompletion(); -+ pool.shutdown(); -+ return csMethodsMissingAnnotation; -+ } -+ -+ private static final String CALLER_SENSITIVE_ANNOTATION = "Lsun/reflect/CallerSensitive;"; -+ private static boolean isCallerSensitive(Method m, ConstantPool cp) -+ throws ConstantPoolException -+ { -+ RuntimeAnnotations_attribute attr = -+ (RuntimeAnnotations_attribute)m.attributes.get(Attribute.RuntimeVisibleAnnotations); -+ int index = 0; -+ if (attr != null) { -+ for (int i = 0; i < attr.annotations.length; i++) { -+ Annotation ann = attr.annotations[i]; -+ String annType = cp.getUTF8Value(ann.type_index); -+ if (CALLER_SENSITIVE_ANNOTATION.equals(annType)) { -+ return true; -+ } -+ } -+ } -+ return false; -+ } -+ -+ public void referenceFound(ClassFile cf, Method m, Set<Integer> refs) -+ throws ConstantPoolException -+ { -+ String name = String.format("%s#%s %s", cf.getName(), -+ m.getName(cf.constant_pool), -+ m.descriptor.getValue(cf.constant_pool)); -+ if (!CallerSensitiveFinder.isCallerSensitive(m, cf.constant_pool)) { -+ csMethodsMissingAnnotation.add(name); -+ System.err.println(" Missing @CallerSensitive: " + name); -+ } else if (verbose) { -+ System.out.format("Caller found: %s%n", name); -+ } -+ if (m.access_flags.is(AccessFlags.ACC_PUBLIC)) { -+ if (!inMethodHandlesList(cf.getName(), m.getName(cf.constant_pool))) { -+ csMethodsMissingAnnotation.add(name); -+ System.err.println(" Missing in MethodHandleNatives list: " + name); -+ } else if (verbose) { -+ System.out.format("Caller found in MethodHandleNatives list: %s%n", name); -+ -+ } -+ } -+ } -+ -+ private final List<FutureTask<String>> tasks = new ArrayList<FutureTask<String>>(); -+ private FutureTask<String> getTask(final ClassFile cf) { -+ FutureTask<String> task = new FutureTask<String>(new Callable<String>() { -+ public String call() throws Exception { -+ return parse(cf); -+ } -+ }); -+ tasks.add(task); -+ return task; -+ } -+ -+ private void waitForCompletion() throws InterruptedException, ExecutionException { -+ for (FutureTask<String> t : tasks) { -+ String s = t.get(); -+ } -+ System.out.println("Parsed " + tasks.size() + " classfiles"); -+ } -+ -+ static class PlatformClassPath { -+ static List<Path> getJREClasses() throws IOException { -+ List<Path> result = new ArrayList<Path>(); -+ Path home = Paths.get(System.getProperty("java.home")); -+ -+ if (home.endsWith("jre")) { -+ // jar files in <javahome>/jre/lib -+ // skip <javahome>/lib -+ result.addAll(addJarFiles(home.resolve("lib"))); -+ } else if (home.resolve("lib").toFile().exists()) { -+ // either a JRE or a jdk build image -+ File classes = home.resolve("classes").toFile(); -+ if (classes.exists() && classes.isDirectory()) { -+ // jdk build outputdir -+ result.add(classes.toPath()); -+ } -+ // add other JAR files -+ result.addAll(addJarFiles(home.resolve("lib"))); -+ } else { -+ throw new RuntimeException("\"" + home + "\" not a JDK home"); -+ } -+ return result; -+ } -+ -+ static List<Path> addJarFiles(final Path root) throws IOException { -+ final List<Path> result = new ArrayList<Path>(); -+ final Path ext = root.resolve("ext"); -+ Files.walkFileTree(root, new SimpleFileVisitor<Path>() { -+ @Override -+ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) -+ throws IOException { -+ if (dir.equals(root) || dir.equals(ext)) { -+ return FileVisitResult.CONTINUE; -+ } else { -+ // skip other cobundled JAR files -+ return FileVisitResult.SKIP_SUBTREE; -+ } -+ } -+ -+ @Override -+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) -+ throws IOException { -+ File f = file.toFile(); -+ String fn = f.getName(); -+ // parse alt-rt.jar as well -+ if (fn.endsWith(".jar") && !fn.equals("jfxrt.jar")) { -+ result.add(file); -+ } -+ return FileVisitResult.CONTINUE; -+ } -+ }); -+ return result; -+ } -+ } -+} -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/sun/reflect/CallerSensitive/ClassFileReader.java -@@ -0,0 +1,338 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+import com.sun.tools.classfile.ClassFile; -+import com.sun.tools.classfile.ConstantPoolException; -+import java.io.*; -+import java.nio.file.FileVisitResult; -+import java.nio.file.Files; -+import java.nio.file.Path; -+import java.nio.file.SimpleFileVisitor; -+import java.nio.file.attribute.BasicFileAttributes; -+import java.util.*; -+import java.util.jar.JarEntry; -+import java.util.jar.JarFile; -+ -+/** -+ * ClassFileReader reads ClassFile(s) of a given path that can be -+ * a .class file, a directory, or a JAR file. -+ */ -+public class ClassFileReader { -+ /** -+ * Returns a ClassFileReader instance of a given path. -+ */ -+ public static ClassFileReader newInstance(File path) throws IOException { -+ if (!path.exists()) { -+ throw new FileNotFoundException(path.getAbsolutePath()); -+ } -+ -+ if (path.isDirectory()) { -+ return new DirectoryReader(path.toPath()); -+ } else if (path.getName().endsWith(".jar")) { -+ return new JarFileReader(path.toPath()); -+ } else { -+ return new ClassFileReader(path.toPath()); -+ } -+ } -+ -+ /** -+ * Returns a ClassFileReader instance of a given JarFile. -+ */ -+ public static ClassFileReader newInstance(Path path, JarFile jf) throws IOException { -+ return new JarFileReader(path, jf); -+ } -+ -+ protected final Path path; -+ protected final String baseFileName; -+ private ClassFileReader(Path path) { -+ this.path = path; -+ this.baseFileName = path.getFileName() != null -+ ? path.getFileName().toString() -+ : path.toString(); -+ } -+ -+ public String getFileName() { -+ return baseFileName; -+ } -+ -+ /** -+ * Returns the ClassFile matching the given binary name -+ * or a fully-qualified class name. -+ */ -+ public ClassFile getClassFile(String name) throws IOException { -+ if (name.indexOf('.') > 0) { -+ int i = name.lastIndexOf('.'); -+ String pathname = name.replace('.', File.separatorChar) + ".class"; -+ if (baseFileName.equals(pathname) || -+ baseFileName.equals(pathname.substring(0, i) + "$" + -+ pathname.substring(i+1, pathname.length()))) { -+ return readClassFile(path); -+ } -+ } else { -+ if (baseFileName.equals(name.replace('/', File.separatorChar) + ".class")) { -+ return readClassFile(path); -+ } -+ } -+ return null; -+ } -+ -+ public Iterable<ClassFile> getClassFiles() throws IOException { -+ return new Iterable<ClassFile>() { -+ public Iterator<ClassFile> iterator() { -+ return new FileIterator(); -+ } -+ }; -+ } -+ -+ protected ClassFile readClassFile(Path p) throws IOException { -+ InputStream is = null; -+ try { -+ is = Files.newInputStream(p); -+ return ClassFile.read(is); -+ } catch (ConstantPoolException e) { -+ throw new ClassFileError(e); -+ } finally { -+ if (is != null) { -+ is.close(); -+ } -+ } -+ } -+ -+ class FileIterator implements Iterator<ClassFile> { -+ int count; -+ FileIterator() { -+ this.count = 0; -+ } -+ public boolean hasNext() { -+ return count == 0 && baseFileName.endsWith(".class"); -+ } -+ -+ public ClassFile next() { -+ if (!hasNext()) { -+ throw new NoSuchElementException(); -+ } -+ try { -+ ClassFile cf = readClassFile(path); -+ count++; -+ return cf; -+ } catch (IOException e) { -+ throw new ClassFileError(e); -+ } -+ } -+ -+ public void remove() { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ } -+ -+ public String toString() { -+ return path.toString(); -+ } -+ -+ private static class DirectoryReader extends ClassFileReader { -+ DirectoryReader(Path path) throws IOException { -+ super(path); -+ } -+ -+ public ClassFile getClassFile(String name) throws IOException { -+ if (name.indexOf('.') > 0) { -+ int i = name.lastIndexOf('.'); -+ String pathname = name.replace('.', File.separatorChar) + ".class"; -+ Path p = path.resolve(pathname); -+ if (!p.toFile().exists()) { -+ p = path.resolve(pathname.substring(0, i) + "$" + -+ pathname.substring(i+1, pathname.length())); -+ } -+ if (p.toFile().exists()) { -+ return readClassFile(p); -+ } -+ } else { -+ Path p = path.resolve(name + ".class"); -+ if (p.toFile().exists()) { -+ return readClassFile(p); -+ } -+ } -+ return null; -+ } -+ -+ public Iterable<ClassFile> getClassFiles() throws IOException { -+ final Iterator<ClassFile> iter = new DirectoryIterator(); -+ return new Iterable<ClassFile>() { -+ public Iterator<ClassFile> iterator() { -+ return iter; -+ } -+ }; -+ } -+ -+ private List<Path> walkTree(Path dir) throws IOException { -+ final List<Path> files = new ArrayList<Path>(); -+ Files.walkFileTree(dir, new SimpleFileVisitor<Path>() { -+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) -+ throws IOException { -+ if (file.toFile().getName().endsWith(".class")) { -+ files.add(file); -+ } -+ return FileVisitResult.CONTINUE; -+ } -+ }); -+ return files; -+ } -+ -+ class DirectoryIterator implements Iterator<ClassFile> { -+ private List<Path> entries; -+ private int index = 0; -+ DirectoryIterator() throws IOException { -+ entries = walkTree(path); -+ index = 0; -+ } -+ -+ public boolean hasNext() { -+ return index != entries.size(); -+ } -+ -+ public ClassFile next() { -+ if (!hasNext()) { -+ throw new NoSuchElementException(); -+ } -+ Path path = entries.get(index++); -+ try { -+ return readClassFile(path); -+ } catch (IOException e) { -+ throw new ClassFileError(e); -+ } -+ } -+ -+ public void remove() { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ } -+ } -+ -+ private static class JarFileReader extends ClassFileReader { -+ final JarFile jarfile; -+ JarFileReader(Path path) throws IOException { -+ this(path, new JarFile(path.toFile())); -+ } -+ JarFileReader(Path path, JarFile jf) throws IOException { -+ super(path); -+ this.jarfile = jf; -+ } -+ -+ public ClassFile getClassFile(String name) throws IOException { -+ if (name.indexOf('.') > 0) { -+ int i = name.lastIndexOf('.'); -+ String entryName = name.replace('.', '/') + ".class"; -+ JarEntry e = jarfile.getJarEntry(entryName); -+ if (e == null) { -+ e = jarfile.getJarEntry(entryName.substring(0, i) + "$" -+ + entryName.substring(i + 1, entryName.length())); -+ } -+ if (e != null) { -+ return readClassFile(e); -+ } -+ } else { -+ JarEntry e = jarfile.getJarEntry(name + ".class"); -+ if (e != null) { -+ return readClassFile(e); -+ } -+ } -+ return null; -+ } -+ -+ private ClassFile readClassFile(JarEntry e) throws IOException { -+ InputStream is = null; -+ try { -+ is = jarfile.getInputStream(e); -+ return ClassFile.read(is); -+ } catch (ConstantPoolException ex) { -+ throw new IOException(ex); -+ } finally { -+ if (is != null) -+ is.close(); -+ } -+ } -+ -+ public Iterable<ClassFile> getClassFiles() throws IOException { -+ final Iterator<ClassFile> iter = new JarFileIterator(); -+ return new Iterable<ClassFile>() { -+ public Iterator<ClassFile> iterator() { -+ return iter; -+ } -+ }; -+ } -+ -+ class JarFileIterator implements Iterator<ClassFile> { -+ private Enumeration<JarEntry> entries; -+ private JarEntry nextEntry; -+ JarFileIterator() { -+ this.entries = jarfile.entries(); -+ while (entries.hasMoreElements()) { -+ JarEntry e = entries.nextElement(); -+ String name = e.getName(); -+ if (name.endsWith(".class")) { -+ this.nextEntry = e; -+ break; -+ } -+ } -+ } -+ -+ public boolean hasNext() { -+ return nextEntry != null; -+ } -+ -+ public ClassFile next() { -+ if (!hasNext()) { -+ throw new NoSuchElementException(); -+ } -+ -+ ClassFile cf; -+ try { -+ cf = readClassFile(nextEntry); -+ } catch (IOException e) { -+ throw new ClassFileError(e); -+ } -+ JarEntry entry = nextEntry; -+ nextEntry = null; -+ while (entries.hasMoreElements()) { -+ JarEntry e = entries.nextElement(); -+ String name = e.getName(); -+ if (name.endsWith(".class")) { -+ nextEntry = e; -+ break; -+ } -+ } -+ return cf; -+ } -+ -+ public void remove() { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ } -+ } -+ -+ public static class ClassFileError extends Error { -+ public ClassFileError(Throwable t) { -+ super(t); -+ } -+ } -+} -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/sun/reflect/CallerSensitive/MethodFinder.java -@@ -0,0 +1,201 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+import java.util.*; -+import com.sun.tools.classfile.*; -+import static com.sun.tools.classfile.ConstantPool.*; -+import com.sun.tools.classfile.Instruction.TypeKind; -+ -+/** -+ * MethodFinder utility class to find references to the given methods. -+ */ -+public abstract class MethodFinder { -+ final List<String> methods; -+ public MethodFinder(String... methods) { -+ this.methods = Arrays.asList(methods); -+ } -+ -+ /** -+ * A callback method will be invoked when a method referencing -+ * any of the lookup methods. -+ * -+ * @param cf ClassFile -+ * @param m Method -+ * @param refs Set of constant pool indices that reference the methods -+ * matching the given lookup method names -+ */ -+ public abstract void referenceFound(ClassFile cf, Method m, Set<Integer> refs) -+ throws ConstantPoolException; -+ -+ public String parse(ClassFile cf) throws ConstantPoolException { -+ List<Integer> cprefs = new ArrayList<Integer>(); -+ int index = 1; -+ for (ConstantPool.CPInfo cpInfo : cf.constant_pool.entries()) { -+ if (cpInfo.accept(cpVisitor, null)) { -+ cprefs.add(index); -+ } -+ index += cpInfo.size(); -+ } -+ -+ if (!cprefs.isEmpty()) { -+ for (Method m : cf.methods) { -+ Set<Integer> refs = new HashSet<Integer>(); -+ Code_attribute c_attr = (Code_attribute) m.attributes.get(Attribute.Code); -+ if (c_attr != null) { -+ for (Instruction instr : c_attr.getInstructions()) { -+ int idx = instr.accept(codeVisitor, cprefs); -+ if (idx > 0) { -+ refs.add(idx); -+ } -+ } -+ } -+ if (refs.size() > 0) { -+ referenceFound(cf, m, refs); -+ } -+ } -+ } -+ return cprefs.isEmpty() ? "" : cf.getName(); -+ } -+ -+ private ConstantPool.Visitor<Boolean,Void> cpVisitor = -+ new ConstantPool.Visitor<Boolean,Void>() -+ { -+ private boolean matches(CPRefInfo info) { -+ try { -+ CONSTANT_NameAndType_info nat = info.getNameAndTypeInfo(); -+ return matches(info.getClassName(), nat.getName(), nat.getType()); -+ } catch (ConstantPoolException ex) { -+ return false; -+ } -+ } -+ -+ private boolean matches(String cn, String name, String type) { -+ return methods.contains(cn + "." + name); -+ } -+ -+ public Boolean visitClass(CONSTANT_Class_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) { -+ return matches(info); -+ } -+ -+ public Boolean visitMethodref(CONSTANT_Methodref_info info, Void p) { -+ return matches(info); -+ } -+ -+ public Boolean visitDouble(CONSTANT_Double_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitFieldref(CONSTANT_Fieldref_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitFloat(CONSTANT_Float_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitInteger(CONSTANT_Integer_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitLong(CONSTANT_Long_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitNameAndType(CONSTANT_NameAndType_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitMethodType(CONSTANT_MethodType_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitString(CONSTANT_String_info info, Void p) { -+ return false; -+ } -+ -+ public Boolean visitUtf8(CONSTANT_Utf8_info info, Void p) { -+ return false; -+ } -+ }; -+ -+ private Instruction.KindVisitor<Integer, List<Integer>> codeVisitor = -+ new Instruction.KindVisitor<Integer, List<Integer>>() -+ { -+ public Integer visitNoOperands(Instruction instr, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitArrayType(Instruction instr, TypeKind kind, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitBranch(Instruction instr, int offset, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitConstantPoolRef(Instruction instr, int index, List<Integer> p) { -+ return p.contains(index) ? index : 0; -+ } -+ -+ public Integer visitConstantPoolRefAndValue(Instruction instr, int index, int value, List<Integer> p) { -+ return p.contains(index) ? index : 0; -+ } -+ -+ public Integer visitLocal(Instruction instr, int index, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitLocalAndValue(Instruction instr, int index, int value, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitLookupSwitch(Instruction instr, int default_, int npairs, int[] matches, int[] offsets, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitTableSwitch(Instruction instr, int default_, int low, int high, int[] offsets, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitValue(Instruction instr, int value, List<Integer> p) { -+ return 0; -+ } -+ -+ public Integer visitUnknown(Instruction instr, List<Integer> p) { -+ return 0; -+ } -+ }; -+} -+ -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java -@@ -0,0 +1,73 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+/* -+ * @test -+ * @bug 8010117 -+ * @summary Test CallerSensitiveFinder to find missing annotation -+ * @compile -XDignore.symbol.file MissingCallerSensitive.java -+ * @build CallerSensitiveFinder MethodFinder ClassFileReader -+ * @run main/othervm MissingCallerSensitive -+ */ -+ -+import java.nio.file.Path; -+import java.nio.file.Paths; -+import java.util.*; -+public class MissingCallerSensitive { -+ public static void main(String[] args) throws Exception { -+ String testclasses = System.getProperty("test.classes", "."); -+ List<Path> classes = new ArrayList<>(); -+ classes.add(Paths.get(testclasses, "MissingCallerSensitive.class")); -+ -+ final String method = "sun/reflect/Reflection.getCallerClass"; -+ CallerSensitiveFinder csfinder = new CallerSensitiveFinder(method); -+ List<String> errors = csfinder.run(classes); -+ /* -+ * Expected 1 method missing @CallerSenitive and 2 methods not in -+ * the MethodHandleNatives CS list -+ */ -+ if (errors.size() != 3) { -+ throw new RuntimeException("Unexpected number of methods found: " + errors.size()); -+ } -+ int count=0; -+ for (String e : errors) { -+ if (e.startsWith("MissingCallerSensitive#missingCallerSensitiveAnnotation ")) { -+ count++; -+ } -+ } -+ if (count != 2) { -+ throw new RuntimeException("Error: expected 1 method missing annotation & missing in the list"); -+ } -+ } -+ -+ @sun.reflect.CallerSensitive -+ public ClassLoader getCallerLoader() { -+ Class<?> c = sun.reflect.Reflection.getCallerClass(); -+ return c.getClassLoader(); -+ } -+ -+ public ClassLoader missingCallerSensitiveAnnotation() { -+ Class<?> c = sun.reflect.Reflection.getCallerClass(); -+ return c.getClassLoader(); -+ } -+}
--- a/patches/openjdk/8010213-set_socketoptions_windows.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# HG changeset patch -# User khazra -# Date 1363811996 25200 -# Node ID 7750666eaf166e523bf2bea826ef6ef1056ea252 -# Parent 05e5519ffbccc0a6cce2d7cffcd74778aba1378e -8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build -Summary: Eliminate fall-through while setting socket options on Windows -Reviewed-by: alanb, chegar - ---- openjdk/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java -+++ openjdk/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java -@@ -184,14 +184,15 @@ - int optionValue = 0; - - switch(opt) { -- case TCP_NODELAY : -- case SO_OOBINLINE : - case SO_REUSEADDR : - if (exclusiveBind) { - // SO_REUSEADDR emulated when using exclusive bind - isReuseAddress = on; - return; - } -+ // intentional fallthrough -+ case TCP_NODELAY : -+ case SO_OOBINLINE : - case SO_KEEPALIVE : - optionValue = on ? 1 : 0; - break;
--- a/patches/openjdk/8011139-revise_checking_getenclosingclass.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -changeset: 4968:2d3faf217561 -user: jfranck -date: Thu Apr 18 13:18:28 2013 +0200 -files: src/share/classes/java/lang/Class.java -description: -8011139: (reflect) Revise checking in getEnclosingClass -Reviewed-by: darcy, mchung, ahgross - - ---- openjdk/jdk/src/share/classes/java/lang/Class.java -+++ openjdk/jdk/src/share/classes/java/lang/Class.java -@@ -1134,13 +1134,9 @@ - enclosingCandidate = enclosingClass; - } - -- // be very careful not to change the stack depth of this -- // checkMemberAccess call for security reasons -- // see java.lang.SecurityManager.checkMemberAccess -- if (enclosingCandidate != null) { -- enclosingCandidate.checkMemberAccess(Member.DECLARED, -- Reflection.getCallerClass(), true); -- } -+ if (enclosingCandidate != null) -+ enclosingCandidate.checkPackageAccess( -+ ClassLoader.getClassLoader(Reflection.getCallerClass()), true); - return enclosingCandidate; - } - -@@ -2214,6 +2210,8 @@ - * Check if client is allowed to access members. If access is denied, - * throw a SecurityException. - * -+ * This method also enforces package access. -+ * - * <p> Default policy: allow all clients access with normal Java access - * control. - */ -@@ -2234,7 +2232,19 @@ - // checkMemberAccess of subclasses of SecurityManager as specified. - s.checkMemberAccess(this, which); - } -+ this.checkPackageAccess(ccl, checkProxyInterfaces); -+ } -+ } - -+ /* -+ * Checks if a client loaded in ClassLoader ccl is allowed to access this -+ * class under the current package access policy. If access is denied, -+ * throw a SecurityException. -+ */ -+ private void checkPackageAccess(final ClassLoader ccl, boolean checkProxyInterfaces) { -+ final SecurityManager s = System.getSecurityManager(); -+ if (s != null) { -+ final ClassLoader cl = getClassLoader0(); - if (ReflectUtil.needsPackageAccessCheck(ccl, cl)) { - String name = this.getName(); - int i = name.lastIndexOf('.'); -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8011154-awt_regression.patch Wed Jul 10 14:09:21 2013 +0100 @@ -0,0 +1,20 @@ +# HG changeset patch +# User anthony +# Date 1365494933 -14400 +# Node ID 5e190bcba6be48c41e68cb85ae7173c51cc931c0 +# Parent 2d3faf2175618b8b5596acbbcb69f163b9773db5 +8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows +Reviewed-by: art, yan + +diff --git openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp +--- openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp ++++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp +@@ -6125,7 +6125,7 @@ + + RGNDATA *pRgnData = (RGNDATA *) SAFE_SIZE_STRUCT_ALLOC(safe_Malloc, + sizeof(RGNDATAHEADER), sizeof(RECT_T), numrects); +- memcpy(pRgnData + sizeof(RGNDATAHEADER), pRect, sizeof(RECT_T) * numrects); ++ memcpy((BYTE*)pRgnData + sizeof(RGNDATAHEADER), pRect, sizeof(RECT_T) * numrects); + if (pRect != rects) { + free(pRect); + }
--- a/patches/openjdk/8011154-awt_regresssion.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# HG changeset patch -# User anthony -# Date 1365494933 -14400 -# Node ID 5e190bcba6be48c41e68cb85ae7173c51cc931c0 -# Parent 2d3faf2175618b8b5596acbbcb69f163b9773db5 -8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows -Reviewed-by: art, yan - -diff --git openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp ---- openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp -+++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp -@@ -6125,7 +6125,7 @@ - - RGNDATA *pRgnData = (RGNDATA *) SAFE_SIZE_STRUCT_ALLOC(safe_Malloc, - sizeof(RGNDATAHEADER), sizeof(RECT_T), numrects); -- memcpy(pRgnData + sizeof(RGNDATAHEADER), pRect, sizeof(RECT_T) * numrects); -+ memcpy((BYTE*)pRgnData + sizeof(RGNDATAHEADER), pRect, sizeof(RECT_T) * numrects); - if (pRect != rects) { - free(pRect); - }
--- a/patches/openjdk/8011313-OCSP_timeout_wrong_value.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1372303832 18000 -# Node ID c655aca607b16492caf7f89b3e2592c4b0c71e34 -# Parent 5e190bcba6be48c41e68cb85ae7173c51cc931c0 -8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined -Reviewed-by: vinnie - ---- openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java -+++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -81,10 +81,9 @@ - * value is negative, set the timeout length to the default. - */ - private static int initializeTimeout() { -- int tmp = java.security.AccessController.doPrivileged( -- new GetIntegerAction("com.sun.security.ocsp.timeout", -- DEFAULT_CONNECT_TIMEOUT)); -- if (tmp < 0) { -+ Integer tmp = java.security.AccessController.doPrivileged( -+ new GetIntegerAction("com.sun.security.ocsp.timeout")); -+ if (tmp == null || tmp < 0) { - tmp = DEFAULT_CONNECT_TIMEOUT; - } - // Convert to milliseconds, as the system property will be
--- a/patches/openjdk/8011990-logger_test_urls.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -# HG changeset patch -# User jgish -# Date 1366144454 14400 -# Node ID b9dc2f2b4c4daafb23b0cf76c71d88d8b2623fe0 -# Parent 108fe5a882a7bf5af5b38e963cef2729b41fa26e -8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows -Summary: Fix URL to reliably work on all platforms -Reviewed-by: duke - ---- openjdk/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java -+++ openjdk/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java -@@ -21,6 +21,7 @@ - * questions. - */ - -+import java.io.File; - import java.lang.reflect.InvocationTargetException; - import java.lang.reflect.Method; - import java.net.URL; -@@ -45,11 +46,13 @@ - String testClassesDir = System.getProperty("test.classes", - System.getProperty("user.dir")); - String sep = System.getProperty("file.separator"); -+ - URL[] urls = new URL[2]; - - // Allow for both jtreg and standalone cases here -- urls[0] = new URL("file://" + testDir + sep + "resources" + sep); -- urls[1] = new URL("file://" + testClassesDir + sep ); -+ urls[0] = new File( testDir + sep + "resources" + sep ).toURI().toURL(); -+ urls[1] = new File( testClassesDir + sep ).toURI().toURL(); -+ - System.out.println("INFO: urls[0] = " + urls[0]); - System.out.println("INFO: urls[1] = " + urls[1]); - ---- openjdk/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java -+++ openjdk/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java -@@ -29,6 +29,7 @@ - * @build ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp - * @run main ResourceBundleSearchTest - */ -+import java.io.File; - import java.net.URL; - import java.net.URLClassLoader; - import java.util.ArrayList; -@@ -70,7 +71,8 @@ - String sep = System.getProperty("file.separator"); - - URL[] urls = new URL[1]; -- urls[0] = new URL("file://" + testDir + sep + "resources" + sep); -+ -+ urls[0] = new File( testDir + sep + "resources" + sep ).toURI().toURL(); - URLClassLoader rbClassLoader = new URLClassLoader(urls); - - // Test 1 - can we find a Logger bundle from doing a stack search?
--- a/patches/openjdk/8012243-serial_regression.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -# HG changeset patch -# User dfuchs -# Date 1367362161 -7200 -# Node ID 7c75580b144fc3e7841e1b7fa7e4ae7efb67476e -# Parent 22decf80e0e833a8667f3e413da735b269d97fe6 -8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 -Reviewed-by: alanb, skoivu, smarks, mchung - ---- openjdk/jdk/src/share/classes/java/io/ObjectStreamClass.java -+++ openjdk/jdk/src/share/classes/java/io/ObjectStreamClass.java -@@ -266,9 +266,11 @@ - if (cl == null) { - return null; - } -- Class<?> caller = Reflection.getCallerClass(); -- if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) { -- ReflectUtil.checkPackageAccess(cl); -+ if (System.getSecurityManager() != null) { -+ Class<?> caller = Reflection.getCallerClass(); -+ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) { -+ ReflectUtil.checkPackageAccess(cl); -+ } - } - return cl; - } ---- openjdk/jdk/src/share/classes/java/io/ObjectStreamField.java -+++ openjdk/jdk/src/share/classes/java/io/ObjectStreamField.java -@@ -162,9 +162,11 @@ - */ - @CallerSensitive - public Class<?> getType() { -- Class<?> caller = Reflection.getCallerClass(); -- if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) { -- ReflectUtil.checkPackageAccess(type); -+ if (System.getSecurityManager() != null) { -+ Class<?> caller = Reflection.getCallerClass(); -+ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) { -+ ReflectUtil.checkPackageAccess(type); -+ } - } - return type; - }
--- a/patches/openjdk/8013380-handle_renames.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -This patch contains the rename that was part of S8013380 -diff -ruN openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp1.java openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp1.java ---- openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp1.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp1.java 2013-07-02 15:06:44.972433968 -0400 -@@ -0,0 +1,49 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+import java.util.logging.Logger; -+ -+/* -+ * This class is loaded onto the call stack when the getLogger methods are -+ * called and then the classes classloader can be used to find a bundle in -+ * the same directory as the class. However, Logger is not allowed -+ * to find the bundle by looking up the stack for this classloader. -+ * We verify that this cannot happen. -+ * -+ * @author Jim Gish -+ */ -+public class LoadItUp1 { -+ public Logger getAnonymousLogger(String rbName) throws Exception { -+ // we should not be able to find the resource in this directory via -+ // getLogger calls. The only way that would be possible given this setup -+ // is that if Logger.getLogger searched up the call stack -+ return Logger.getAnonymousLogger(rbName); -+ } -+ -+ public Logger getLogger(String loggerName) { -+ return Logger.getLogger(loggerName); -+ } -+ -+ public Logger getLogger(String loggerName,String bundleName) { -+ return Logger.getLogger(loggerName, bundleName); -+ } -+} -diff -ruN openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp.java openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp.java ---- openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp.java 2013-07-02 15:06:44.972433968 -0400 -+++ openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp.java 1969-12-31 19:00:00.000000000 -0500 -@@ -1,49 +0,0 @@ --/* -- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- * -- * This code is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. -- * -- * This code is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * version 2 for more details (a copy is included in the LICENSE file that -- * accompanied this code). -- * -- * You should have received a copy of the GNU General Public License version -- * 2 along with this work; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -- * or visit www.oracle.com if you need additional information or have any -- * questions. -- */ --import java.util.logging.Logger; -- --/* -- * This class is loaded onto the call stack when the getLogger methods are -- * called and then the classes classloader can be used to find a bundle in -- * the same directory as the class. However, Logger is not allowed -- * to find the bundle by looking up the stack for this classloader. -- * We verify that this cannot happen. -- * -- * @author Jim Gish -- */ --public class LoadItUp1 { -- public Logger getAnonymousLogger(String rbName) throws Exception { -- // we should not be able to find the resource in this directory via -- // getLogger calls. The only way that would be possible given this setup -- // is that if Logger.getLogger searched up the call stack -- return Logger.getAnonymousLogger(rbName); -- } -- -- public Logger getLogger(String loggerName) { -- return Logger.getLogger(loggerName); -- } -- -- public Logger getLogger(String loggerName,String bundleName) { -- return Logger.getLogger(loggerName, bundleName); -- } --}
--- a/patches/openjdk/8013380-logger_stack_walk_glassfish.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,936 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1372305047 18000 -# Node ID 8c2f91c4c4b80f8725786a3006ee6043d765af72 -# Parent b9dc2f2b4c4daafb23b0cf76c71d88d8b2623fe0 -8013380: Removal of stack walk to find resource bundle breaks Glassfish startup -Summary: Use caller's classloader to load resource as an alternative to thread context classloader and system classloader -Reviewed-by: mchung, alanb - ---- openjdk/jdk/src/share/classes/java/util/logging/LogManager.java -+++ openjdk/jdk/src/share/classes/java/util/logging/LogManager.java -@@ -389,11 +389,11 @@ - // add a new Logger or return the one that has been added previously - // as a LogManager subclass may override the addLogger, getLogger, - // readConfiguration, and other methods. -- Logger demandLogger(String name, String resourceBundleName) { -+ Logger demandLogger(String name, String resourceBundleName, Class<?> caller) { - Logger result = getLogger(name); - if (result == null) { - // only allocate the new logger once -- Logger newLogger = new Logger(name, resourceBundleName); -+ Logger newLogger = new Logger(name, resourceBundleName, caller); - do { - if (addLogger(newLogger)) { - // We successfully added the new Logger that we -@@ -475,7 +475,7 @@ - Logger demandLogger(String name, String resourceBundleName) { - // a LogManager subclass may have its own implementation to add and - // get a Logger. So delegate to the LogManager to do the work. -- return manager.demandLogger(name, resourceBundleName); -+ return manager.demandLogger(name, resourceBundleName, null); - } - - synchronized Logger findLogger(String name) { ---- openjdk/jdk/src/share/classes/java/util/logging/Logger.java -+++ openjdk/jdk/src/share/classes/java/util/logging/Logger.java -@@ -190,6 +190,7 @@ - private ArrayList<LogManager.LoggerWeakRef> kids; // WeakReferences to loggers that have us as parent - private Level levelObject; - private volatile int levelValue; // current effective level value -+ private WeakReference<ClassLoader> callersClassLoaderRef; - - /** - * GLOBAL_LOGGER_NAME is a name for the global logger. -@@ -250,15 +251,31 @@ - * no corresponding resource can be found. - */ - protected Logger(String name, String resourceBundleName) { -+ this(name, resourceBundleName, null); -+ } -+ -+ Logger(String name, String resourceBundleName, Class<?> caller) { - this.manager = LogManager.getLogManager(); -- if (resourceBundleName != null) { -- // Note: we may get a MissingResourceException here. -- setupResourceInfo(resourceBundleName); -- } -+ setupResourceInfo(resourceBundleName, caller); - this.name = name; - levelValue = Level.INFO.intValue(); - } - -+ private void setCallersClassLoaderRef(Class<?> caller) { -+ ClassLoader callersClassLoader = ((caller != null) -+ ? caller.getClassLoader() -+ : null); -+ if (callersClassLoader != null) { -+ this.callersClassLoaderRef = new WeakReference(callersClassLoader); -+ } -+ } -+ -+ private ClassLoader getCallersClassLoader() { -+ return (callersClassLoaderRef != null) -+ ? callersClassLoaderRef.get() -+ : null; -+ } -+ - // This constructor is used only to create the global Logger. - // It is needed to break a cyclic dependence between the LogManager - // and Logger static initializers causing deadlocks. -@@ -312,7 +329,9 @@ - return manager.demandSystemLogger(name, resourceBundleName); - } - } -- return manager.demandLogger(name, resourceBundleName); -+ return manager.demandLogger(name, resourceBundleName, caller); -+ // ends up calling new Logger(name, resourceBundleName, caller) -+ // iff the logger doesn't exist already - } - - /** -@@ -405,11 +424,24 @@ - // adding a new Logger object is handled by LogManager.addLogger(). - @CallerSensitive - public static synchronized Logger getLogger(String name, String resourceBundleName) { -- Logger result = demandLogger(name, resourceBundleName, Reflection.getCallerClass()); -+ Class<?> callerClass = Reflection.getCallerClass(); -+ Logger result = demandLogger(name, resourceBundleName, callerClass); -+ - if (result.resourceBundleName == null) { -+ // We haven't set a bundle name yet on the Logger, so it's ok to proceed. -+ -+ // We have to set the callers ClassLoader here in case demandLogger -+ // above found a previously created Logger. This can happen, for -+ // example, if Logger.getLogger(name) is called and subsequently -+ // Logger.getLogger(name, resourceBundleName) is called. In this case -+ // we won't necessarily have the correct classloader saved away, so -+ // we need to set it here, too. -+ - // Note: we may get a MissingResourceException here. -- result.setupResourceInfo(resourceBundleName); -+ result.setupResourceInfo(resourceBundleName, callerClass); - } else if (!result.resourceBundleName.equals(resourceBundleName)) { -+ // We already had a bundle name on the Logger and we're trying -+ // to change it here which is not allowed. - throw new IllegalArgumentException(result.resourceBundleName + - " != " + resourceBundleName); - } -@@ -479,10 +511,12 @@ - * @throws MissingResourceException if the named ResourceBundle cannot be found. - */ -+ @CallerSensitive - public static synchronized Logger getAnonymousLogger(String resourceBundleName) { - LogManager manager = LogManager.getLogManager(); - // cleanup some Loggers that have been GC'ed - manager.drainLoggerRefQueueBounded(); -- Logger result = new Logger(null, resourceBundleName); -+ Logger result = new Logger(null, resourceBundleName, -+ Reflection.getCallerClass()); - result.anonymous = true; - Logger root = manager.getLogger(""); - result.doSetParent(root); -@@ -499,7 +533,7 @@ - * @return localization bundle (may be null) - */ - public ResourceBundle getResourceBundle() { -- return findResourceBundle(getResourceBundleName()); -+ return findResourceBundle(getResourceBundleName(), true); - } - - /** -@@ -581,7 +615,7 @@ - String ebname = getEffectiveResourceBundleName(); - if (ebname != null && !ebname.equals(SYSTEM_LOGGER_RB_NAME)) { - lr.setResourceBundleName(ebname); -- lr.setResourceBundle(findResourceBundle(ebname)); -+ lr.setResourceBundle(findResourceBundle(ebname, true)); - } - log(lr); - } -@@ -798,7 +832,7 @@ - lr.setLoggerName(name); - if (rbname != null) { - lr.setResourceBundleName(rbname); -- lr.setResourceBundle(findResourceBundle(rbname)); -+ lr.setResourceBundle(findResourceBundle(rbname, false)); - } - log(lr); - } -@@ -822,7 +856,6 @@ - * can be null - * @param msg The string message (or a key in the message catalog) - */ -- - public void logrb(Level level, String sourceClass, String sourceMethod, - String bundleName, String msg) { - if (level.intValue() < levelValue || levelValue == offValue) { -@@ -1347,9 +1380,18 @@ - * there is no suitable previous cached value. - * - * @param name the ResourceBundle to locate -+ * @param userCallersClassLoader if true search using the caller's ClassLoader - * @return ResourceBundle specified by name or null if not found - */ -- private synchronized ResourceBundle findResourceBundle(String name) { -+ private synchronized ResourceBundle findResourceBundle(String name, -+ boolean useCallersClassLoader) { -+ // For all lookups, we first check the thread context class loader -+ // if it is set. If not, we use the system classloader. If we -+ // still haven't found it we use the callersClassLoaderRef if it -+ // is set and useCallersClassLoader is true. We set -+ // callersClassLoaderRef initially upon creating the logger with a -+ // non-null resource bundle name. -+ - // Return a null bundle for a null name. - if (name == null) { - return null; -@@ -1382,22 +1424,52 @@ - catalogLocale = currentLocale; - return catalog; - } catch (MissingResourceException ex) { -+ // We can't find the ResourceBundle in the default -+ // ClassLoader. Drop through. -+ } -+ -+ if (useCallersClassLoader) { -+ // Try with the caller's ClassLoader -+ ClassLoader callersClassLoader = getCallersClassLoader(); -+ -+ if (callersClassLoader == null || callersClassLoader == cl) { -+ return null; -+ } -+ -+ try { -+ catalog = ResourceBundle.getBundle(name, currentLocale, -+ callersClassLoader); -+ catalogName = name; -+ catalogLocale = currentLocale; -+ return catalog; -+ } catch (MissingResourceException ex) { -+ return null; // no luck -+ } -+ } else { - return null; - } - } - - // Private utility method to initialize our one entry -- // resource bundle cache. -+ // resource bundle name cache and the callers ClassLoader - // Note: for consistency reasons, we are careful to check - // that a suitable ResourceBundle exists before setting the -- // ResourceBundleName. -- private synchronized void setupResourceInfo(String name) { -+ // resourceBundleName field. -+ // Synchronized to prevent races in setting the fields. -+ private synchronized void setupResourceInfo(String name, -+ Class<?> callersClass) { - if (name == null) { - return; - } -- if (findResourceBundle(name) == null) { -+ -+ setCallersClassLoaderRef(callersClass); -+ if (findResourceBundle(name, true) == null) { - // We've failed to find an expected ResourceBundle. -- throw new MissingResourceException("Can't find " + name + " bundle", name, ""); -+ // unset the caller's ClassLoader since we were unable to find the -+ // the bundle using it -+ this.callersClassLoaderRef = null; -+ throw new MissingResourceException("Can't find " + name + " bundle", -+ name, ""); - } - resourceBundleName = name; - } ---- openjdk/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java -+++ openjdk/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java -@@ -21,43 +21,28 @@ - * questions. - */ - --import java.io.File; - import java.lang.reflect.InvocationTargetException; - import java.lang.reflect.Method; -+import java.net.MalformedURLException; - import java.net.URL; - import java.net.URLClassLoader; -+import java.nio.file.Paths; -+import java.util.logging.Logger; - - /** - * This class is used to ensure that a resource bundle loadable by a classloader -- * is on the caller's stack, but not on the classpath or TCCL to ensure that -- * Logger.getLogger() can't load the bundle via a stack search -+ * is on the caller's stack, but not on the classpath or TCCL. It tests that -+ * Logger.getLogger() can load the bundle via the immediate caller's classloader - * - * @author Jim Gish - */ - public class IndirectlyLoadABundle { - -- private final static String rbName = "StackSearchableResource"; -+ private final static String rbName = "CallerSearchableResource"; - - public boolean loadAndTest() throws Throwable { -- // Find out where we are running from so we can setup the URLClassLoader URLs -- // test.src and test.classes will be set if running in jtreg, but probably -- // not otherwise -- String testDir = System.getProperty("test.src", System.getProperty("user.dir")); -- String testClassesDir = System.getProperty("test.classes", -- System.getProperty("user.dir")); -- String sep = System.getProperty("file.separator"); -- -- URL[] urls = new URL[2]; -- -- // Allow for both jtreg and standalone cases here -- urls[0] = new File( testDir + sep + "resources" + sep ).toURI().toURL(); -- urls[1] = new File( testClassesDir + sep ).toURI().toURL(); -- -- System.out.println("INFO: urls[0] = " + urls[0]); -- System.out.println("INFO: urls[1] = " + urls[1]); -- - // Make sure we can find it via the URLClassLoader -- URLClassLoader yetAnotherResourceCL = new URLClassLoader(urls, null); -+ URLClassLoader yetAnotherResourceCL = new URLClassLoader(getURLs(), null); - if (!testForValidResourceSetup(yetAnotherResourceCL)) { - throw new Exception("Couldn't directly load bundle " + rbName - + " as expected. Test config problem"); -@@ -70,23 +55,109 @@ - + " able to. Test config problem"); - } - -- Class<?> loadItUpClazz = Class.forName("LoadItUp", true, yetAnotherResourceCL); -+ Class<?> loadItUpClazz = Class.forName("LoadItUp1", true, -+ yetAnotherResourceCL); - ClassLoader actual = loadItUpClazz.getClassLoader(); - if (actual != yetAnotherResourceCL) { -- throw new Exception("LoadItUp was loaded by an unexpected CL: " + actual); -+ throw new Exception("LoadItUp1 was loaded by an unexpected CL: " + actual); - } - Object loadItUp = loadItUpClazz.newInstance(); -- Method testMethod = loadItUpClazz.getMethod("test", String.class); -+ Method testMethod = loadItUpClazz.getMethod("getLogger", String.class, String.class); - try { -- return (Boolean) testMethod.invoke(loadItUp, rbName); -+ return (Logger)testMethod.invoke(loadItUp, "NestedLogger1", rbName) != null; - } catch (InvocationTargetException ex) { - throw ex.getTargetException(); - } - } - -+ public boolean testGetAnonymousLogger() throws Throwable { -+ // Test getAnonymousLogger() -+ URLClassLoader loadItUpCL = new URLClassLoader(getURLs(), null); -+ Class<?> loadItUpClazz = Class.forName("LoadItUp1", true, loadItUpCL); -+ ClassLoader actual = loadItUpClazz.getClassLoader(); -+ if (actual != loadItUpCL) { -+ throw new Exception("LoadItUp1 was loaded by an unexpected CL: " -+ + actual); -+ } -+ Object loadItUpAnon = loadItUpClazz.newInstance(); -+ Method testAnonMethod = loadItUpClazz.getMethod("getAnonymousLogger", -+ String.class); -+ try { -+ return (Logger)testAnonMethod.invoke(loadItUpAnon, rbName) != null; -+ } catch (InvocationTargetException ex) { -+ throw ex.getTargetException(); -+ } -+ } -+ -+ -+ public boolean testGetLoggerGetLoggerWithBundle() throws Throwable { -+ // test getLogger("NestedLogger2"); followed by -+ // getLogger("NestedLogger2", rbName) to see if the bundle is found -+ // -+ URL[] urls = getURLs(); -+ if (getLoggerWithNewCL(urls, "NestedLogger2", null)) { -+ return getLoggerWithNewCL(urls, "NestedLogger2", rbName); -+ -+ } else { -+ throw new Exception("TEST FAILED: first call to getLogger() failed " -+ + " in IndirectlyLoadABundle." -+ + "testGetLoggerGetLoggerWithBundle"); -+ } -+ } -+ -+ private URL[] getURLs() throws MalformedURLException { -+ // Find out where we are running from so we can setup the URLClassLoader URLs -+ // test.src and test.classes will be set if running in jtreg, but probably -+ // not otherwise -+ String testDir = System.getProperty("test.src", System.getProperty("user.dir")); -+ String testClassesDir = System.getProperty("test.classes", -+ System.getProperty("user.dir")); -+ URL[] urls = new URL[2]; -+ // Allow for both jtreg and standalone cases here -+ urls[0] = Paths.get(testDir, "resources").toUri().toURL(); -+ urls[1] = Paths.get(testClassesDir).toUri().toURL(); -+ -+ return urls; -+ } -+ -+ private boolean getLoggerWithNewCL(URL[] urls, String loggerName, -+ String bundleName) throws Throwable { -+ Logger result = null;; -+ // Test getLogger("foo"); getLogger("foo", "rbName"); -+ // First do the getLogger() call with no bundle name -+ URLClassLoader getLoggerCL = new URLClassLoader(urls, null); -+ Class<?> loadItUpClazz1 = Class.forName("LoadItUp1", true, getLoggerCL); -+ ClassLoader actual = loadItUpClazz1.getClassLoader(); -+ if (actual != getLoggerCL) { -+ throw new Exception("LoadItUp1 was loaded by an unexpected CL: " -+ + actual); -+ } -+ Object loadItUp1 = loadItUpClazz1.newInstance(); -+ if (bundleName != null) { -+ Method getLoggerMethod = loadItUpClazz1.getMethod("getLogger", -+ String.class, -+ String.class); -+ try { -+ result = (Logger) getLoggerMethod.invoke(loadItUp1, loggerName, -+ bundleName); -+ } catch (InvocationTargetException ex) { -+ throw ex.getTargetException(); -+ } -+ } else { -+ Method getLoggerMethod = loadItUpClazz1.getMethod("getLogger", -+ String.class); -+ try { -+ result = (Logger) getLoggerMethod.invoke(loadItUp1, loggerName); -+ } catch (InvocationTargetException ex) { -+ throw ex.getTargetException(); -+ } -+ } -+ return result != null; -+ } -+ - private boolean testForValidResourceSetup(ClassLoader cl) { -- // First make sure the test environment is setup properly and the bundle actually -- // exists -+ // First make sure the test environment is setup properly and the bundle -+ // actually exists - return ResourceBundleSearchTest.isOnClassPath(rbName, cl); - } - } -rename from test/java/util/logging/bundlesearch/LoadItUp.java -rename to test/java/util/logging/bundlesearch/LoadItUp1.java ---- openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp.java -+++ openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp1.java -@@ -20,43 +20,30 @@ - * or visit www.oracle.com if you need additional information or have any - * questions. - */ --import java.util.MissingResourceException; - import java.util.logging.Logger; - - /* -- * This class is loaded onto the call stack when the test method is called -- * and then its classloader can be used to find a property bundle in the same -- * directory as the class. However, Logger is not allowed -+ * This class is loaded onto the call stack when the getLogger methods are -+ * called and then the classes classloader can be used to find a bundle in -+ * the same directory as the class. However, Logger is not allowed - * to find the bundle by looking up the stack for this classloader. - * We verify that this cannot happen. - * - * @author Jim Gish - */ --public class LoadItUp { -- -- private final static boolean DEBUG = false; -- -- public Boolean test(String rbName) throws Exception { -+public class LoadItUp1 { -+ public Logger getAnonymousLogger(String rbName) throws Exception { - // we should not be able to find the resource in this directory via - // getLogger calls. The only way that would be possible given this setup - // is that if Logger.getLogger searched up the call stack -- return lookupBundle(rbName); -+ return Logger.getAnonymousLogger(rbName); - } - -- private boolean lookupBundle(String rbName) { -- // See if Logger.getLogger can find the resource in this directory -- try { -- Logger aLogger = Logger.getLogger("NestedLogger", rbName); -- } catch (MissingResourceException re) { -- if (DEBUG) { -- System.out.println( -- "As expected, LoadItUp.lookupBundle() did not find the bundle " -- + rbName); -- } -- return false; -- } -- System.out.println("FAILED: LoadItUp.lookupBundle() found the bundle " -- + rbName + " using a stack search."); -- return true; -+ public Logger getLogger(String loggerName) { -+ return Logger.getLogger(loggerName); -+ } -+ -+ public Logger getLogger(String loggerName,String bundleName) { -+ return Logger.getLogger(loggerName, bundleName); - } - } -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java -@@ -0,0 +1,62 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+import java.util.MissingResourceException; -+import java.util.logging.Logger; -+ -+/* -+ * This class is loaded onto the call stack by LoadItUp2Invoker from a separate -+ * classloader. LoadItUp2Invoker was loaded by a class loader that does have -+ * access to the bundle, but the class loader used to load this class does not. -+ * Thus the logging code should not be able to see the resource bundle unless -+ * it has more than a single level stack crawl, which is not allowed. -+ * -+ * @author Jim Gish -+ */ -+public class LoadItUp2 { -+ -+ private final static boolean DEBUG = false; -+ -+ public Boolean test(String rbName) throws Exception { -+ // we should not be able to find the resource in this directory via -+ // getLogger calls. The only way that would be possible given this setup -+ // is that if Logger.getLogger searched up the call stack -+ return lookupBundle(rbName); -+ } -+ -+ private boolean lookupBundle(String rbName) { -+ // See if Logger.getLogger can find the resource in this directory -+ try { -+ Logger aLogger = Logger.getLogger("NestedLogger2", rbName); -+ } catch (MissingResourceException re) { -+ if (DEBUG) { -+ System.out.println( -+ "As expected, LoadItUp2.lookupBundle() did not find the bundle " -+ + rbName); -+ } -+ return false; -+ } -+ System.out.println("FAILED: LoadItUp2.lookupBundle() found the bundle " -+ + rbName + " using a stack search."); -+ return true; -+ } -+} -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/LoadItUp2Invoker.java -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+import java.lang.reflect.InvocationTargetException; -+import java.lang.reflect.Method; -+import java.net.URL; -+import java.net.URLClassLoader; -+ -+/** -+ * This class is loaded by a class loader that can see the resource. It creates -+ * a new classloader for LoadItUp2 which cannot see the resource. So, 2 levels -+ * up the call chain we have a class/classloader that can see the resource, but -+ * 1 level up the class/classloader cannot. -+ * -+ * @author Jim Gish -+ */ -+public class LoadItUp2Invoker { -+ private URLClassLoader cl; -+ private String rbName; -+ private Object loadItUp2; -+ private Method testMethod; -+ -+ public void setup(URL[] urls, String rbName) throws -+ ReflectiveOperationException { -+ this.cl = new URLClassLoader(urls, null); -+ this.rbName = rbName; -+ // Using this new classloader, load the actual test class -+ // which is now two levels removed from the original caller -+ Class<?> loadItUp2Clazz = Class.forName("LoadItUp2", true , cl); -+ this.loadItUp2 = loadItUp2Clazz.newInstance(); -+ this.testMethod = loadItUp2Clazz.getMethod("test", String.class); -+ } -+ -+ public Boolean test() throws Throwable { -+ try { -+ return (Boolean) testMethod.invoke(loadItUp2, rbName); -+ } catch (InvocationTargetException ex) { -+ throw ex.getTargetException(); -+ } -+ } -+} ---- openjdk/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java -+++ openjdk/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java -@@ -23,15 +23,15 @@ - - /* - * @test -- * @bug 8010127 -+ * @bug 8010127 8013380 - * @summary Remove the stack search for a resource bundle Logger to use - * @author Jim Gish -- * @build ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp -- * @run main ResourceBundleSearchTest -+ * @build ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp1 LoadItUp2 TwiceIndirectlyLoadABundle LoadItUp2Invoker -+ * @run main/othervm ResourceBundleSearchTest - */ --import java.io.File; - import java.net.URL; - import java.net.URLClassLoader; -+import java.nio.file.Paths; - import java.util.ArrayList; - import java.util.List; - import java.util.Locale; -@@ -39,6 +39,12 @@ - import java.util.ResourceBundle; - import java.util.logging.Logger; - -+/** -+ * This class tests various scenarios of loading resource bundles from -+ * java.util.logging. Since jtreg uses the logging system, it is necessary to -+ * run these tests using othervm mode to ensure no interference from logging -+ * initialization by jtreg -+ */ - public class ResourceBundleSearchTest { - - private final static boolean DEBUG = false; -@@ -49,7 +55,7 @@ - - private static int numPass = 0; - private static int numFail = 0; -- private static List<String> msgs = new ArrayList<String>(); -+ private static List<String> msgs = new ArrayList<>(); - - public static void main(String[] args) throws Throwable { - ResourceBundleSearchTest test = new ResourceBundleSearchTest(); -@@ -60,47 +66,54 @@ - // ensure we are using en as the default Locale so we can find the resource - Locale.setDefault(Locale.ENGLISH); - -- String testClasses = System.getProperty("test.classes"); -- System.out.println( "test.classes = " + testClasses ); -- - ClassLoader myClassLoader = ClassLoader.getSystemClassLoader(); - - // Find out where we are running from so we can setup the URLClassLoader URL - String userDir = System.getProperty("user.dir"); - String testDir = System.getProperty("test.src", userDir); -- String sep = System.getProperty("file.separator"); - - URL[] urls = new URL[1]; - -- urls[0] = new File( testDir + sep + "resources" + sep ).toURI().toURL(); -+ urls[0] = Paths.get(testDir, "resources").toUri().toURL(); - URLClassLoader rbClassLoader = new URLClassLoader(urls); - - // Test 1 - can we find a Logger bundle from doing a stack search? - // We shouldn't be able to -- assertFalse(testGetBundleFromStackSearch(), "testGetBundleFromStackSearch"); -+ assertFalse(testGetBundleFromStackSearch(), "1-testGetBundleFromStackSearch"); - - // Test 2 - can we find a Logger bundle off of the Thread context class - // loader? We should be able to. -- assertTrue( -- testGetBundleFromTCCL(TCCL_TEST_BUNDLE, rbClassLoader), -- "testGetBundleFromTCCL"); -+ assertTrue(testGetBundleFromTCCL(TCCL_TEST_BUNDLE, rbClassLoader), -+ "2-testGetBundleFromTCCL"); - - // Test 3 - Can we find a Logger bundle from the classpath? We should be -- // able to, but .... -- // We check to see if the bundle is on the classpath or not so that this -- // will work standalone. In the case of jtreg/samevm, -- // the resource bundles are not on the classpath. Running standalone -- // (or othervm), they are -+ // able to. We'll first check to make sure the setup is correct and -+ // it actually is on the classpath before checking whether logging -+ // can see it there. - if (isOnClassPath(PROP_RB_NAME, myClassLoader)) { - debug("We should be able to see " + PROP_RB_NAME + " on the classpath"); - assertTrue(testGetBundleFromSystemClassLoader(PROP_RB_NAME), -- "testGetBundleFromSystemClassLoader"); -+ "3-testGetBundleFromSystemClassLoader"); - } else { -- debug("We should not be able to see " + PROP_RB_NAME + " on the classpath"); -- assertFalse(testGetBundleFromSystemClassLoader(PROP_RB_NAME), -- "testGetBundleFromSystemClassLoader"); -+ throw new Exception("TEST SETUP FAILURE: Cannot see " + PROP_RB_NAME -+ + " on the classpath"); - } - -+ // Test 4 - we should be able to find a bundle from the caller's -+ // classloader, but only one level up. -+ assertTrue(testGetBundleFromCallersClassLoader(), -+ "4-testGetBundleFromCallersClassLoader"); -+ -+ // Test 5 - this ensures that getAnonymousLogger(String rbName) -+ // can find the bundle from the caller's classloader -+ assertTrue(testGetAnonymousLogger(), "5-testGetAnonymousLogger"); -+ -+ // Test 6 - first call getLogger("myLogger"). -+ // Then call getLogger("myLogger","bundleName") from a different ClassLoader -+ // Make sure we find the bundle -+ assertTrue(testGetBundleFromSecondCallersClassLoader(), -+ "6-testGetBundleFromSecondCallersClassLoader"); -+ - report(); - } - -@@ -112,7 +125,7 @@ - System.out.println(msg); - } - throw new Exception(numFail + " out of " + (numPass + numFail) -- + " tests failed."); -+ + " tests failed."); - } - } - -@@ -122,7 +135,7 @@ - } else { - numFail++; - System.out.println("FAILED: " + testName -- + " was supposed to return true but did NOT!"); -+ + " was supposed to return true but did NOT!"); - } - } - -@@ -132,13 +145,20 @@ - } else { - numFail++; - System.out.println("FAILED: " + testName -- + " was supposed to return false but did NOT!"); -+ + " was supposed to return false but did NOT!"); - } - } - - public boolean testGetBundleFromStackSearch() throws Throwable { - // This should fail. This was the old functionality to search up the - // caller's call stack -+ TwiceIndirectlyLoadABundle indirectLoader = new TwiceIndirectlyLoadABundle(); -+ return indirectLoader.loadAndTest(); -+ } -+ -+ public boolean testGetBundleFromCallersClassLoader() throws Throwable { -+ // This should pass. This exercises getting the bundle using the -+ // class loader of the caller (one level up) - IndirectlyLoadABundle indirectLoader = new IndirectlyLoadABundle(); - return indirectLoader.loadAndTest(); - } -@@ -193,14 +213,29 @@ - bundleName); - } catch (MissingResourceException re) { - msgs.add("INFO: testGetBundleFromSystemClassLoader() did not find bundle " -- + bundleName); -+ + bundleName); - return false; - } - msgs.add("INFO: testGetBundleFromSystemClassLoader() found the bundle " -- + bundleName); -+ + bundleName); - return true; - } - -+ private boolean testGetAnonymousLogger() throws Throwable { -+ // This should pass. This exercises getting the bundle using the -+ // class loader of the caller (one level up) when calling -+ // Logger.getAnonymousLogger(String rbName) -+ IndirectlyLoadABundle indirectLoader = new IndirectlyLoadABundle(); -+ return indirectLoader.testGetAnonymousLogger(); -+ } -+ -+ private boolean testGetBundleFromSecondCallersClassLoader() throws Throwable { -+ // This should pass. This exercises getting the bundle using the -+ // class loader of the caller (one level up) -+ IndirectlyLoadABundle indirectLoader = new IndirectlyLoadABundle(); -+ return indirectLoader.testGetLoggerGetLoggerWithBundle(); -+ } -+ - public static class LoggingThread extends Thread { - - boolean foundBundle = false; -@@ -227,13 +262,13 @@ - // this should succeed if the bundle is on the system classpath. - try { - Logger aLogger = Logger.getLogger(ResourceBundleSearchTest.newLoggerName(), -- bundleName); -- msg = "INFO: LoggingRunnable() found the bundle " + bundleName -- + (setTCCL ? " with " : " without ") + "setting the TCCL"; -+ bundleName); -+ msg = "INFO: LoggingThread.run() found the bundle " + bundleName -+ + (setTCCL ? " with " : " without ") + "setting the TCCL"; - foundBundle = true; - } catch (MissingResourceException re) { -- msg = "INFO: LoggingRunnable() did not find the bundle " + bundleName -- + (setTCCL ? " with " : " without ") + "setting the TCCL"; -+ msg = "INFO: LoggingThread.run() did not find the bundle " + bundleName -+ + (setTCCL ? " with " : " without ") + "setting the TCCL"; - foundBundle = false; - } - } catch (Throwable e) { -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java -@@ -0,0 +1,91 @@ -+/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+import java.lang.reflect.InvocationTargetException; -+import java.lang.reflect.Method; -+import java.net.URL; -+import java.net.URLClassLoader; -+import java.nio.file.Paths; -+ -+/** -+ * This class constructs a scenario where a bundle is accessible on the call -+ * stack two levels up from the call to getLogger(), but not on the immediate -+ * caller. This tests that getLogger() isn't doing a stack crawl more than one -+ * level up to find a bundle. -+ * -+ * @author Jim Gish -+ */ -+public class TwiceIndirectlyLoadABundle { -+ -+ private final static String rbName = "StackSearchableResource"; -+ -+ public boolean loadAndTest() throws Throwable { -+ // Find out where we are running from so we can setup the URLClassLoader URLs -+ // test.src and test.classes will be set if running in jtreg, but probably -+ // not otherwise -+ String testDir = System.getProperty("test.src", System.getProperty("user.dir")); -+ String testClassesDir = System.getProperty("test.classes", -+ System.getProperty("user.dir")); -+ URL[] urls = new URL[2]; -+ -+ // Allow for both jtreg and standalone cases here -+ // Unlike the 1-level test where we can get the bundle from the caller's -+ // class loader, for this one we don't want to expose the resource directory -+ // to the next class. That way we're invoking the LoadItUp2Invoker class -+ // from this class that does have access to the resources (two levels -+ // up the call stack), but the Invoker itself won't have access to resource -+ urls[0] = Paths.get(testDir,"resources").toUri().toURL(); -+ urls[1] = Paths.get(testClassesDir).toUri().toURL(); -+ -+ // Make sure we can find it via the URLClassLoader -+ URLClassLoader yetAnotherResourceCL = new URLClassLoader(urls, null); -+ Class<?> loadItUp2InvokerClazz = Class.forName("LoadItUp2Invoker", true, -+ yetAnotherResourceCL); -+ ClassLoader actual = loadItUp2InvokerClazz.getClassLoader(); -+ if (actual != yetAnotherResourceCL) { -+ throw new Exception("LoadItUp2Invoker was loaded by an unexpected CL: " -+ + actual); -+ } -+ Object loadItUp2Invoker = loadItUp2InvokerClazz.newInstance(); -+ -+ Method setupMethod = loadItUp2InvokerClazz.getMethod("setup", -+ urls.getClass(), String.class); -+ try { -+ // For the next class loader we create, we want to leave off -+ // the resources. That way loadItUp2Invoker will have access to -+ // them, but the next class won't. -+ URL[] noResourceUrl = new URL[1]; -+ noResourceUrl[0] = urls[1]; // from above -- just the test classes -+ setupMethod.invoke(loadItUp2Invoker, noResourceUrl, rbName); -+ } catch (InvocationTargetException ex) { -+ throw ex.getTargetException(); -+ } -+ -+ Method testMethod = loadItUp2InvokerClazz.getMethod("test"); -+ try { -+ return (Boolean) testMethod.invoke(loadItUp2Invoker); -+ } catch (InvocationTargetException ex) { -+ throw ex.getTargetException(); -+ } -+ } -+} -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties -@@ -0,0 +1,25 @@ -+# -+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+sample1=translation #4 for sample1 -+sample2=translation #4 for sample2 -+supports-test=ResourceBundleSearchTest
--- a/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +0,0 @@ -# HG changeset patch -# User bae -# Date 1368792434 -14400 -# Node ID 683f472433103a1aaee0bbee21814328fecd91a6 -# Parent 8c2f91c4c4b80f8725786a3006ee6043d765af72 -8014205: Most of the Swing dialogs are blank on one win7 MUI -Reviewed-by: prr, vadim - ---- openjdk/jdk/src/share/classes/java/awt/image/BufferedImage.java -+++ openjdk/jdk/src/share/classes/java/awt/image/BufferedImage.java -@@ -35,6 +35,8 @@ - import java.awt.geom.Point2D; - import java.awt.Point; - import java.awt.Rectangle; -+import java.security.AccessController; -+import java.security.PrivilegedAction; - import java.util.Hashtable; - import java.util.Vector; - -@@ -643,6 +645,7 @@ - this.properties = properties; - int numBands = raster.getNumBands(); - boolean isAlphaPre = cm.isAlphaPremultiplied(); -+ final boolean isStandard = isStandard(cm, raster); - ColorSpace cs; - - // Force the raster data alpha state to match the premultiplied -@@ -653,20 +656,19 @@ - cs = cm.getColorSpace(); - int csType = cs.getType(); - if (csType != ColorSpace.TYPE_RGB) { -- if (csType == ColorSpace.TYPE_GRAY -- && ComponentColorModel.class.equals(cm.getClass())) { -+ if (csType == ColorSpace.TYPE_GRAY && -+ isStandard && -+ cm instanceof ComponentColorModel) { - // Check if this might be a child raster (fix for bug 4240596) - if (sm instanceof ComponentSampleModel && - ((ComponentSampleModel)sm).getPixelStride() != numBands) { - imageType = TYPE_CUSTOM; - } else if (raster instanceof ByteComponentRaster && -- PixelInterleavedSampleModel.class.equals(sm.getClass()) && - raster.getNumBands() == 1 && - cm.getComponentSize(0) == 8 && - ((ByteComponentRaster)raster).getPixelStride() == 1) { - imageType = TYPE_BYTE_GRAY; - } else if (raster instanceof ShortComponentRaster && -- PixelInterleavedSampleModel.class.equals(sm.getClass()) && - raster.getNumBands() == 1 && - cm.getComponentSize(0) == 16 && - ((ShortComponentRaster)raster).getPixelStride() == 1) { -@@ -686,8 +688,8 @@ - // are correct - int pixSize = cm.getPixelSize(); - if (iraster.getPixelStride() == 1 && -- DirectColorModel.class.equals(cm.getClass()) && -- SinglePixelPackedSampleModel.class.equals(sm.getClass()) && -+ isStandard && -+ cm instanceof DirectColorModel && - (pixSize == 32 || pixSize == 24)) - { - // Now check on the DirectColorModel params -@@ -718,21 +720,17 @@ - } // if (rmask == DCM_BGR_RED_MASK && - } // if (iraster.getPixelStride() == 1 - } // ((raster instanceof IntegerComponentRaster) && -- else if ((IndexColorModel.class.equals(cm.getClass())) && -- (numBands == 1) && -+ else if ((cm instanceof IndexColorModel) && (numBands == 1) && -+ isStandard && - (!cm.hasAlpha() || !isAlphaPre)) - { - IndexColorModel icm = (IndexColorModel) cm; - int pixSize = icm.getPixelSize(); - -- if (raster instanceof BytePackedRaster && -- MultiPixelPackedSampleModel.class.equals(sm.getClass())) -- { -+ if (raster instanceof BytePackedRaster) { - imageType = TYPE_BYTE_BINARY; - } // if (raster instanceof BytePackedRaster) -- else if (raster instanceof ByteComponentRaster && -- PixelInterleavedSampleModel.class.equals(sm.getClass())) -- { -+ else if (raster instanceof ByteComponentRaster) { - ByteComponentRaster braster = (ByteComponentRaster) raster; - if (braster.getPixelStride() == 1 && pixSize <= 8) { - imageType = TYPE_BYTE_INDEXED; -@@ -740,8 +738,8 @@ - } - } // else if (cm instanceof IndexColorModel) && (numBands == 1)) - else if ((raster instanceof ShortComponentRaster) -- && (DirectColorModel.class.equals(cm.getClass())) -- && (SinglePixelPackedSampleModel.class.equals(sm.getClass())) -+ && (cm instanceof DirectColorModel) -+ && isStandard - && (numBands == 3) - && !cm.hasAlpha()) - { -@@ -761,6 +759,7 @@ - } // else if ((cm instanceof IndexColorModel) && (numBands == 1)) - else if ((raster instanceof ByteComponentRaster) - && (cm instanceof ComponentColorModel) -+ && isStandard - && (raster.getSampleModel() instanceof PixelInterleavedSampleModel) - && (numBands == 3 || numBands == 4)) - { -@@ -788,9 +787,7 @@ - braster.getPixelStride() == numBands && - offs[0] == numBands-1 && - offs[1] == numBands-2 && -- offs[2] == numBands-3 && -- ComponentColorModel.class.equals(ccm.getClass()) && -- PixelInterleavedSampleModel.class.equals(csm.getClass())) -+ offs[2] == numBands-3) - { - if (numBands == 3 && !ccm.hasAlpha()) { - imageType = TYPE_3BYTE_BGR; -@@ -804,6 +801,27 @@ - } // else if ((raster instanceof ByteComponentRaster) && - } - -+ private static boolean isStandard(ColorModel cm, WritableRaster wr) { -+ final Class<? extends ColorModel> cmClass = cm.getClass(); -+ final Class<? extends WritableRaster> wrClass = wr.getClass(); -+ final Class<? extends SampleModel> smClass = wr.getSampleModel().getClass(); -+ -+ final PrivilegedAction<Boolean> checkClassLoadersAction = -+ new PrivilegedAction<Boolean>() -+ { -+ -+ @Override -+ public Boolean run() { -+ final ClassLoader std = System.class.getClassLoader(); -+ -+ return (cmClass.getClassLoader() == std) && -+ (smClass.getClassLoader() == std) && -+ (wrClass.getClassLoader() == std); -+ } -+ }; -+ return AccessController.doPrivileged(checkClassLoadersAction); -+ } -+ - /** - * Returns the image type. If it is not one of the known types, - * TYPE_CUSTOM is returned.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8014427-raster_regression.patch Wed Jul 10 14:09:21 2013 +0100 @@ -0,0 +1,20 @@ +# HG changeset patch +# User bae +# Date 1368551120 -14400 +# Node ID 9c9dc3220f0a857385242ad77a10f0b5caa3f861 +# Parent 683f472433103a1aaee0bbee21814328fecd91a6 +8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 +Reviewed-by: prr, vadim + +--- openjdk/jdk/src/share/classes/java/awt/image/Raster.java ++++ openjdk/jdk/src/share/classes/java/awt/image/Raster.java +@@ -392,7 +392,8 @@ + } + } + int banks = maxBank + 1; +- int size = scanlineStride * (h - 1) + // fisrt (h - 1) scans ++ int size = maxBandOff + ++ scanlineStride * (h - 1) + // fisrt (h - 1) scans + w; // last scan + + switch(dataType) {
--- a/patches/openjdk/8014427-raster_regresssion.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# HG changeset patch -# User bae -# Date 1368551120 -14400 -# Node ID 9c9dc3220f0a857385242ad77a10f0b5caa3f861 -# Parent 683f472433103a1aaee0bbee21814328fecd91a6 -8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 -Reviewed-by: prr, vadim - ---- openjdk/jdk/src/share/classes/java/awt/image/Raster.java -+++ openjdk/jdk/src/share/classes/java/awt/image/Raster.java -@@ -392,7 +392,8 @@ - } - } - int banks = maxBank + 1; -- int size = scanlineStride * (h - 1) + // fisrt (h - 1) scans -+ int size = maxBandOff + -+ scanlineStride * (h - 1) + // fisrt (h - 1) scans - w; // last scan - - switch(dataType) {
--- a/patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,149 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371046686 -3600 -# Node ID 27e8f5644011928af792f6b99cc11308f21f5c32 -# Parent b56b4751faf02f4c3fcb0588e5d76a53d391e099 -8014618: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement -Reviewed-by: xuelei -Contributed-by: Pasi Eronen <pe@iki.fi> - ---- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java -+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -407,8 +407,9 @@ - } - return skey; - } else if (algorithm.equals("TlsPremasterSecret")) { -- // return entire secret -- return new SecretKeySpec(secret, "TlsPremasterSecret"); -+ // remove leading zero bytes per RFC 5246 Section 8.1.2 -+ return new SecretKeySpec( -+ KeyUtil.trimZeroes(secret), "TlsPremasterSecret"); - } else { - throw new NoSuchAlgorithmException("Unsupported secret key " - + "algorithm: "+ algorithm); ---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -208,7 +208,7 @@ - byte[] secret = attributes[0].getByteArray(); - token.p11.C_DestroyObject(session.id(), keyID); - // trim leading 0x00 bytes per JCE convention -- return P11Util.trimZeroes(secret); -+ return KeyUtil.trimZeroes(secret); - } catch (PKCS11Exception e) { - throw new ProviderException("Could not derive key", e); - } finally { -@@ -316,7 +316,7 @@ - // as here we always retrieve the CKA_VALUE even for tokens - // that do not have that bug. - byte[] keyBytes = key.getEncoded(); -- byte[] newBytes = P11Util.trimZeroes(keyBytes); -+ byte[] newBytes = KeyUtil.trimZeroes(keyBytes); - if (keyBytes != newBytes) { - key = new SecretKeySpec(newBytes, algorithm); - } ---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -41,6 +41,7 @@ - - import sun.security.pkcs11.wrapper.*; - import static sun.security.pkcs11.wrapper.PKCS11Constants.*; -+import sun.security.util.KeyUtil; - - /** - * Signature implementation class. This class currently supports the -@@ -687,8 +688,8 @@ - BigInteger r = values[0].getPositiveBigInteger(); - BigInteger s = values[1].getPositiveBigInteger(); - // trim leading zeroes -- byte[] br = P11Util.trimZeroes(r.toByteArray()); -- byte[] bs = P11Util.trimZeroes(s.toByteArray()); -+ byte[] br = KeyUtil.trimZeroes(r.toByteArray()); -+ byte[] bs = KeyUtil.trimZeroes(s.toByteArray()); - int k = Math.max(br.length, bs.length); - // r and s each occupy half the array - byte[] res = new byte[k << 1]; ---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Util.java -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Util.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -131,20 +131,6 @@ - return b; - } - -- // trim leading (most significant) zeroes from the result -- static byte[] trimZeroes(byte[] b) { -- int i = 0; -- while ((i < b.length - 1) && (b[i] == 0)) { -- i++; -- } -- if (i == 0) { -- return b; -- } -- byte[] t = new byte[b.length - i]; -- System.arraycopy(b, i, t, 0, t.length); -- return t; -- } -- - public static byte[] getMagnitude(BigInteger bi) { - byte[] b = bi.toByteArray(); - if ((b.length > 1) && (b[0] == 0)) { ---- openjdk/jdk/src/share/classes/sun/security/util/KeyUtil.java -+++ openjdk/jdk/src/share/classes/sun/security/util/KeyUtil.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -200,5 +200,24 @@ - - // Don't bother to check against the y^q mod p if safe primes are used. - } -+ -+ /** -+ * Trim leading (most significant) zeroes from the result. -+ * -+ * @throws NullPointerException if {@code b} is null -+ */ -+ public static byte[] trimZeroes(byte[] b) { -+ int i = 0; -+ while ((i < b.length - 1) && (b[i] == 0)) { -+ i++; -+ } -+ if (i == 0) { -+ return b; -+ } -+ byte[] t = new byte[b.length - i]; -+ System.arraycopy(b, i, t, 0, t.length); -+ return t; -+ } -+ - } -
--- a/patches/openjdk/8014676-javadebugger_space_in_paths.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -# HG changeset patch -# User dmeetry -# Date 1368806389 -14400 -# Node ID 529e737ece0c08c9de2aa4f3faa1a5e3887ee51e -# Parent 9c9dc3220f0a857385242ad77a10f0b5caa3f861 -8014676: Java debugger may fail to run -Summary: The problem is observed when the binaries for windows are placed under a path which contains a space -Reviewed-by: alanb -Contributed-by: ivan.gerasimov@oracle.com - ---- openjdk/jdk/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java -+++ openjdk/jdk/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java -@@ -142,7 +142,7 @@ - * This class simply provides a context for a single launch and - * accept. It provides instance fields that can be used by - * all threads involved. This stuff can't be in the Connector proper -- * because the connector is is a singleton and not specific to any -+ * because the connector is a singleton and is not specific to any - * one launch. - */ - private class Helper { ---- openjdk/jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java -+++ openjdk/jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java -@@ -213,7 +213,7 @@ - exePath = exe; - } - // Quote only if necessary in case the quote arg value is bogus -- if (hasWhitespace(exe)) { -+ if (hasWhitespace(exePath)) { - exePath = quote + exePath + quote; - } -
--- a/patches/openjdk/8014745-logger_stack_walk_switch.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,199 +0,0 @@ -# HG changeset patch -# User mchung -# Date 1368826191 25200 -# Node ID 1e74b61253eb8c0d8d70512ab84ba16366e02c68 -# Parent d2a1f8885e65ed180240b4d1c298260dd328340e -8014745: Provide a switch to allow stack walk search of resource bundle -Reviewed-by: alanb, jgish - ---- openjdk/jdk/make/java/java/mapfile-vers -+++ openjdk/jdk/make/java/java/mapfile-vers -@@ -266,6 +266,7 @@ - Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0; - Java_sun_reflect_NativeMethodAccessorImpl_invoke0; - Java_sun_reflect_Reflection_getCallerClass; -+ Java_sun_reflect_Reflection_getCallerClass0; - Java_sun_reflect_Reflection_getClassAccessFlags; - Java_sun_misc_Version_getJdkVersionInfo; - Java_sun_misc_Version_getJdkSpecialVersion; ---- openjdk/jdk/src/share/classes/java/util/logging/Logger.java -+++ openjdk/jdk/src/share/classes/java/util/logging/Logger.java -@@ -309,8 +309,13 @@ - // null, we assume it's a system logger and add it to the system context. - // These system loggers only set the resource bundle to the given - // resource bundle name (rather than the default system resource bundle). -- private static class SystemLoggerHelper { -- static boolean disableCallerCheck = getBooleanProperty("sun.util.logging.disableCallerCheck"); -+ private static class LoggerHelper { -+ static boolean disableCallerCheck = -+ getBooleanProperty("sun.util.logging.disableCallerCheck"); -+ -+ // workaround to turn on the old behavior for resource bundle search -+ static boolean allowStackWalkSearch = -+ getBooleanProperty("jdk.logging.allowStackWalkSearch"); - private static boolean getBooleanProperty(final String key) { - String s = AccessController.doPrivileged(new PrivilegedAction<String>() { - public String run() { -@@ -324,7 +329,7 @@ - private static Logger demandLogger(String name, String resourceBundleName, Class<?> caller) { - LogManager manager = LogManager.getLogManager(); - SecurityManager sm = System.getSecurityManager(); -- if (sm != null && !SystemLoggerHelper.disableCallerCheck) { -+ if (sm != null && !LoggerHelper.disableCallerCheck) { - if (caller.getClassLoader() == null) { - return manager.demandSystemLogger(name, resourceBundleName); - } -@@ -1431,25 +1436,61 @@ - if (useCallersClassLoader) { - // Try with the caller's ClassLoader - ClassLoader callersClassLoader = getCallersClassLoader(); -+ if (callersClassLoader != null && callersClassLoader != cl) { -+ try { -+ catalog = ResourceBundle.getBundle(name, currentLocale, -+ callersClassLoader); -+ catalogName = name; -+ catalogLocale = currentLocale; -+ return catalog; -+ } catch (MissingResourceException ex) { -+ } -+ } -+ } - -- if (callersClassLoader == null || callersClassLoader == cl) { -- return null; -- } -- -- try { -- catalog = ResourceBundle.getBundle(name, currentLocale, -- callersClassLoader); -- catalogName = name; -- catalogLocale = currentLocale; -- return catalog; -- } catch (MissingResourceException ex) { -- return null; // no luck -- } -+ // If -Djdk.logging.allowStackWalkSearch=true is set, -+ // does stack walk to search for the resource bundle -+ if (LoggerHelper.allowStackWalkSearch) { -+ return findResourceBundleFromStack(name, currentLocale, cl); - } else { - return null; - } - } - -+ /** -+ * This method will fail when running with a VM that enforces caller-sensitive -+ * methods and only allows to get the immediate caller. -+ */ -+ @CallerSensitive -+ private synchronized ResourceBundle findResourceBundleFromStack(String name, -+ Locale locale, -+ ClassLoader cl) -+ { -+ for (int ix = 0; ; ix++) { -+ Class<?> clz = sun.reflect.Reflection.getCallerClass(ix); -+ if (clz == null) { -+ break; -+ } -+ ClassLoader cl2 = clz.getClassLoader(); -+ if (cl2 == null) { -+ cl2 = ClassLoader.getSystemClassLoader(); -+ } -+ if (cl == cl2) { -+ // We've already checked this classloader. -+ continue; -+ } -+ cl = cl2; -+ try { -+ catalog = ResourceBundle.getBundle(name, locale, cl); -+ catalogName = name; -+ catalogLocale = locale; -+ return catalog; -+ } catch (MissingResourceException ex) { -+ } -+ } -+ return null; -+ } -+ - // Private utility method to initialize our one entry - // resource bundle name cache and the callers ClassLoader - // Note: for consistency reasons, we are careful to check ---- openjdk/jdk/src/share/classes/sun/reflect/Reflection.java -+++ openjdk/jdk/src/share/classes/sun/reflect/Reflection.java -@@ -58,6 +58,21 @@ - @CallerSensitive - public static native Class getCallerClass(); - -+ /** -+ * @deprecated No replacement. This method will be removed in the next -+ * JDK 7 update release. -+ */ -+ @Deprecated -+ @CallerSensitive -+ public static Class getCallerClass(int depth) { -+ return getCallerClass0(depth); -+ } -+ -+ // If the VM enforces getting caller class with @CallerSensitive, -+ // this will fail anyway. -+ @CallerSensitive -+ private static native Class getCallerClass0(int depth); -+ - /** Retrieves the access flags written to the class file. For - inner classes these flags may differ from those returned by - Class.getModifiers(), which searches the InnerClasses ---- openjdk/jdk/src/share/native/sun/reflect/Reflection.c -+++ openjdk/jdk/src/share/native/sun/reflect/Reflection.c -@@ -34,6 +34,12 @@ - return JVM_GetCallerClass(env, 2); - } - -+JNIEXPORT jclass JNICALL Java_sun_reflect_Reflection_getCallerClass0 -+(JNIEnv *env, jclass unused, jint depth) -+{ -+ return JVM_GetCallerClass(env, depth); -+} -+ - JNIEXPORT jint JNICALL Java_sun_reflect_Reflection_getClassAccessFlags - (JNIEnv *env, jclass unused, jclass cls) - { ---- openjdk/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java -+++ openjdk/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java -@@ -28,6 +28,7 @@ - * @author Jim Gish - * @build ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp1 LoadItUp2 TwiceIndirectlyLoadABundle LoadItUp2Invoker - * @run main/othervm ResourceBundleSearchTest -+ * @run main/othervm -Djdk.logging.allowStackWalkSearch=true ResourceBundleSearchTest - */ - import java.net.URL; - import java.net.URLClassLoader; -@@ -79,7 +80,15 @@ - - // Test 1 - can we find a Logger bundle from doing a stack search? - // We shouldn't be able to -- assertFalse(testGetBundleFromStackSearch(), "1-testGetBundleFromStackSearch"); -+ // unless -Djdk.logging.allowStackWalkSearch=true is set -+ -+ boolean allowStackWalkSearch = Boolean.getBoolean("jdk.logging.allowStackWalkSearch"); -+ if (allowStackWalkSearch) { -+ assertTrue(testGetBundleFromStackSearch(), "1-testGetBundleFromStackSearch"); -+ } else { -+ // default behavior -+ assertFalse(testGetBundleFromStackSearch(), "1-testGetBundleFromStackSearch"); -+ } - - // Test 2 - can we find a Logger bundle off of the Thread context class - // loader? We should be able to. -@@ -111,8 +120,10 @@ - // Test 6 - first call getLogger("myLogger"). - // Then call getLogger("myLogger","bundleName") from a different ClassLoader - // Make sure we find the bundle -- assertTrue(testGetBundleFromSecondCallersClassLoader(), -- "6-testGetBundleFromSecondCallersClassLoader"); -+ if (!allowStackWalkSearch) { -+ assertTrue(testGetBundleFromSecondCallersClassLoader(), -+ "6-testGetBundleFromSecondCallersClassLoader"); -+ } - - report(); - }
--- a/patches/openjdk/8014968-OCSP_timeout_default.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -# HG changeset patch -# User ngthomas -# Date 1369157140 25200 -# Node ID 66420635ccfc7338d509979aee871b85d085529e -# Parent c655aca607b16492caf7f89b3e2592c4b0c71e34 -8014968: OCSP and CRL connection timeout is set to four hours by default -Reviewed-by: mullan - ---- openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java -+++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java -@@ -84,7 +84,7 @@ - Integer tmp = java.security.AccessController.doPrivileged( - new GetIntegerAction("com.sun.security.ocsp.timeout")); - if (tmp == null || tmp < 0) { -- tmp = DEFAULT_CONNECT_TIMEOUT; -+ return DEFAULT_CONNECT_TIMEOUT; - } - // Convert to milliseconds, as the system property will be - // specified in seconds
--- a/patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,743 +0,0 @@ -*** openjdk/hotspot/src/share/vm/memory/allocation.cpp 2011-11-14 17:07:35.000000000 -0500 ---- openjdk/hotspot/src/share/vm/memory/allocation.cpp 2013-06-25 14:55:54.749915166 -0400 -*************** -*** 1,5 **** - /* -! * 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 ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 199,205 **** - ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } - - // Allocate a new chunk from the pool (might expand the pool) -! void* allocate(size_t bytes) { - assert(bytes == _size, "bad size"); - void* p = NULL; - { ThreadCritical tc; ---- 199,205 ---- - ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } - - // Allocate a new chunk from the pool (might expand the pool) -! void* allocate(size_t bytes, AllocFailType alloc_failmode) { - assert(bytes == _size, "bad size"); - void* p = NULL; - { ThreadCritical tc; -*************** -*** 207,215 **** - p = get_first(); - if (p == NULL) p = os::malloc(bytes); - } -! if (p == NULL) - vm_exit_out_of_memory(bytes, "ChunkPool::allocate"); -! - return p; - } - ---- 207,215 ---- - p = get_first(); - if (p == NULL) p = os::malloc(bytes); - } -! if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { - vm_exit_out_of_memory(bytes, "ChunkPool::allocate"); -! } - return p; - } - -*************** -*** 300,306 **** - //-------------------------------------------------------------------------------------- - // Chunk implementation - -! void* Chunk::operator new(size_t requested_size, size_t length) { - // requested_size is equal to sizeof(Chunk) but in order for the arena - // allocations to come out aligned as expected the size must be aligned - // to expected arean alignment. ---- 300,306 ---- - //-------------------------------------------------------------------------------------- - // Chunk implementation - -! void* Chunk::operator new(size_t requested_size, AllocFailType alloc_failmode, size_t length) { - // requested_size is equal to sizeof(Chunk) but in order for the arena - // allocations to come out aligned as expected the size must be aligned - // to expected arean alignment. -*************** -*** 308,320 **** - assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); - size_t bytes = ARENA_ALIGN(requested_size) + length; - switch (length) { -! case Chunk::size: return ChunkPool::large_pool()->allocate(bytes); -! case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes); -! case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes); - default: { -! void *p = os::malloc(bytes); -! if (p == NULL) - vm_exit_out_of_memory(bytes, "Chunk::new"); - return p; - } - } ---- 308,321 ---- - assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); - size_t bytes = ARENA_ALIGN(requested_size) + length; - switch (length) { -! case Chunk::size: return ChunkPool::large_pool()->allocate(bytes, alloc_failmode); -! case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes, alloc_failmode); -! case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes, alloc_failmode); - default: { -! void* p = os::malloc(bytes); -! if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { - vm_exit_out_of_memory(bytes, "Chunk::new"); -+ } - return p; - } - } -*************** -*** 367,380 **** - Arena::Arena(size_t init_size) { - size_t round_size = (sizeof (char *)) - 1; - init_size = (init_size+round_size) & ~round_size; -! _first = _chunk = new (init_size) Chunk(init_size); - _hwm = _chunk->bottom(); // Save the cached hwm, max - _max = _chunk->top(); - set_size_in_bytes(init_size); - } - - Arena::Arena() { -! _first = _chunk = new (Chunk::init_size) Chunk(Chunk::init_size); - _hwm = _chunk->bottom(); // Save the cached hwm, max - _max = _chunk->top(); - set_size_in_bytes(Chunk::init_size); ---- 368,381 ---- - Arena::Arena(size_t init_size) { - size_t round_size = (sizeof (char *)) - 1; - init_size = (init_size+round_size) & ~round_size; -! _first = _chunk = new (AllocFailStrategy::EXIT_OOM, init_size) Chunk(init_size); - _hwm = _chunk->bottom(); // Save the cached hwm, max - _max = _chunk->top(); - set_size_in_bytes(init_size); - } - - Arena::Arena() { -! _first = _chunk = new (AllocFailStrategy::EXIT_OOM, Chunk::init_size) Chunk(Chunk::init_size); - _hwm = _chunk->bottom(); // Save the cached hwm, max - _max = _chunk->top(); - set_size_in_bytes(Chunk::init_size); -*************** -*** 427,441 **** - } - - // Grow a new Chunk -! void* Arena::grow( size_t x ) { - // Get minimal required size. Either real big, or even bigger for giant objs - size_t len = MAX2(x, (size_t) Chunk::size); - - Chunk *k = _chunk; // Get filled-up chunk address -! _chunk = new (len) Chunk(len); - - if (_chunk == NULL) { -! signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow"); - } - - if (k) k->set_next(_chunk); // Append new chunk to end of linked list ---- 428,442 ---- - } - - // Grow a new Chunk -! void* Arena::grow(size_t x, AllocFailType alloc_failmode) { - // Get minimal required size. Either real big, or even bigger for giant objs - size_t len = MAX2(x, (size_t) Chunk::size); - - Chunk *k = _chunk; // Get filled-up chunk address -! _chunk = new (alloc_failmode, len) Chunk(len); - - if (_chunk == NULL) { -! return NULL; - } - - if (k) k->set_next(_chunk); // Append new chunk to end of linked list -*************** -*** 451,463 **** - - - // Reallocate storage in Arena. -! void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size) { - assert(new_size >= 0, "bad size"); - if (new_size == 0) return NULL; - #ifdef ASSERT - if (UseMallocOnly) { - // always allocate a new object (otherwise we'll free this one twice) -! char* copy = (char*)Amalloc(new_size); - size_t n = MIN2(old_size, new_size); - if (n > 0) memcpy(copy, old_ptr, n); - Afree(old_ptr,old_size); // Mostly done to keep stats accurate ---- 452,467 ---- - - - // Reallocate storage in Arena. -! void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size, AllocFailType alloc_failmode) { - assert(new_size >= 0, "bad size"); - if (new_size == 0) return NULL; - #ifdef ASSERT - if (UseMallocOnly) { - // always allocate a new object (otherwise we'll free this one twice) -! char* copy = (char*)Amalloc(new_size, alloc_failmode); -! if (copy == NULL) { -! return NULL; -! } - size_t n = MIN2(old_size, new_size); - if (n > 0) memcpy(copy, old_ptr, n); - Afree(old_ptr,old_size); // Mostly done to keep stats accurate -*************** -*** 483,489 **** - } - - // Oops, got to relocate guts -! void *new_ptr = Amalloc(new_size); - memcpy( new_ptr, c_old, old_size ); - Afree(c_old,old_size); // Mostly done to keep stats accurate - return new_ptr; ---- 487,496 ---- - } - - // Oops, got to relocate guts -! void *new_ptr = Amalloc(new_size, alloc_failmode); -! if (new_ptr == NULL) { -! return NULL; -! } - memcpy( new_ptr, c_old, old_size ); - Afree(c_old,old_size); // Mostly done to keep stats accurate - return new_ptr; -*** openjdk/hotspot/src/share/vm/memory/allocation.hpp 2011-11-14 17:07:35.000000000 -0500 ---- openjdk/hotspot/src/share/vm/memory/allocation.hpp 2013-06-25 15:13:06.325141250 -0400 -*************** -*** 1,5 **** - /* -! * 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 ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 34,43 **** ---- 34,51 ---- - #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) - -+ class AllocFailStrategy { -+ public: -+ enum AllocFailEnum { EXIT_OOM, RETURN_NULL }; -+ }; -+ typedef AllocFailStrategy::AllocFailEnum AllocFailType; -+ - // All classes in the virtual machine must be subclassed - // by one of the following allocation classes: - // -*************** -*** 152,158 **** - Chunk* _next; // Next Chunk in list - const size_t _len; // Size of this Chunk - public: -! void* operator new(size_t size, size_t length); - void operator delete(void* p); - Chunk(size_t length); - ---- 160,166 ---- - Chunk* _next; // Next Chunk in list - const size_t _len; // Size of this Chunk - public: -! void* operator new(size_t size, AllocFailType alloc_failmode, size_t length); - void operator delete(void* p); - Chunk(size_t length); - -*************** -*** 200,206 **** - Chunk *_first; // First chunk - Chunk *_chunk; // current chunk - char *_hwm, *_max; // High water mark and max in current chunk -! void* grow(size_t x); // Get a new Chunk of at least size x - NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) - NOT_PRODUCT(static size_t _bytes_allocated;) // total #bytes allocated since start - friend class AllocStats; ---- 208,215 ---- - Chunk *_first; // First chunk - Chunk *_chunk; // current chunk - char *_hwm, *_max; // High water mark and max in current chunk -! // Get a new Chunk of at least size x -! void* grow(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); - NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) - NOT_PRODUCT(static size_t _bytes_allocated;) // total #bytes allocated since start - friend class AllocStats; -*************** -*** 209,218 **** - - void signal_out_of_memory(size_t request, const char* whence) const; - -! void check_for_overflow(size_t request, const char* whence) const { - if (UINTPTR_MAX - request < (uintptr_t)_hwm) { - signal_out_of_memory(request, whence); - } - } - - public: ---- 218,232 ---- - - void signal_out_of_memory(size_t request, const char* whence) const; - -! bool check_for_overflow(size_t request, const char* whence, -! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) const { - if (UINTPTR_MAX - request < (uintptr_t)_hwm) { -+ if (alloc_failmode == AllocFailStrategy::RETURN_NULL) { -+ return false; -+ } - signal_out_of_memory(request, whence); - } -+ return true; - } - - public: -*************** -*** 224,237 **** - char* hwm() const { return _hwm; } - - // Fast allocate in the arena. Common case is: pointer test + increment. -! void* Amalloc(size_t x) { - assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2"); - x = ARENA_ALIGN(x); - debug_only(if (UseMallocOnly) return malloc(x);) -! check_for_overflow(x, "Arena::Amalloc"); - NOT_PRODUCT(_bytes_allocated += x); - if (_hwm + x > _max) { -! return grow(x); - } else { - char *old = _hwm; - _hwm += x; ---- 238,252 ---- - char* hwm() const { return _hwm; } - - // Fast allocate in the arena. Common case is: pointer test + increment. -! void* Amalloc(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { - assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2"); - x = ARENA_ALIGN(x); - debug_only(if (UseMallocOnly) return malloc(x);) -! if (!check_for_overflow(x, "Arena::Amalloc", alloc_failmode)) -! return NULL; - NOT_PRODUCT(_bytes_allocated += x); - if (_hwm + x > _max) { -! return grow(x, alloc_failmode); - } else { - char *old = _hwm; - _hwm += x; -*************** -*** 239,251 **** - } - } - // Further assume size is padded out to words -! void *Amalloc_4(size_t x) { - assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); - debug_only(if (UseMallocOnly) return malloc(x);) -! check_for_overflow(x, "Arena::Amalloc_4"); - NOT_PRODUCT(_bytes_allocated += x); - if (_hwm + x > _max) { -! return grow(x); - } else { - char *old = _hwm; - _hwm += x; ---- 254,267 ---- - } - } - // Further assume size is padded out to words -! void *Amalloc_4(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { - assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); - debug_only(if (UseMallocOnly) return malloc(x);) -! if (!check_for_overflow(x, "Arena::Amalloc_4", alloc_failmode)) -! return NULL; - NOT_PRODUCT(_bytes_allocated += x); - if (_hwm + x > _max) { -! return grow(x, alloc_failmode); - } else { - char *old = _hwm; - _hwm += x; -*************** -*** 255,261 **** - - // Allocate with 'double' alignment. It is 8 bytes on sparc. - // In other cases Amalloc_D() should be the same as Amalloc_4(). -! void* Amalloc_D(size_t x) { - assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); - debug_only(if (UseMallocOnly) return malloc(x);) - #if defined(SPARC) && !defined(_LP64) ---- 271,277 ---- - - // Allocate with 'double' alignment. It is 8 bytes on sparc. - // In other cases Amalloc_D() should be the same as Amalloc_4(). -! void* Amalloc_D(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { - assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); - debug_only(if (UseMallocOnly) return malloc(x);) - #if defined(SPARC) && !defined(_LP64) -*************** -*** 263,272 **** - size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; - x += delta; - #endif -! check_for_overflow(x, "Arena::Amalloc_D"); - NOT_PRODUCT(_bytes_allocated += x); - if (_hwm + x > _max) { -! return grow(x); // grow() returns a result aligned >= 8 bytes. - } else { - char *old = _hwm; - _hwm += x; ---- 279,289 ---- - size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; - x += delta; - #endif -! if (!check_for_overflow(x, "Arena::Amalloc_D", alloc_failmode)) -! return NULL; - NOT_PRODUCT(_bytes_allocated += x); - if (_hwm + x > _max) { -! return grow(x, alloc_failmode); // grow() returns a result aligned >= 8 bytes. - } else { - char *old = _hwm; - _hwm += x; -*************** -*** 286,292 **** - if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; - } - -! void *Arealloc( void *old_ptr, size_t old_size, size_t new_size ); - - // Move contents of this arena into an empty arena - Arena *move_contents(Arena *empty_arena); ---- 303,310 ---- - if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; - } - -! void *Arealloc( void *old_ptr, size_t old_size, size_t new_size, -! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); - - // Move contents of this arena into an empty arena - Arena *move_contents(Arena *empty_arena); -*************** -*** 328,336 **** - - - //%note allocation_1 -! extern char* resource_allocate_bytes(size_t size); -! extern char* resource_allocate_bytes(Thread* thread, size_t size); -! extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size); - extern void resource_free_bytes( char *old, size_t size ); - - //---------------------------------------------------------------------- ---- 346,357 ---- - - - //%note allocation_1 -! extern char* resource_allocate_bytes(size_t size, -! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); -! extern char* resource_allocate_bytes(Thread* thread, size_t size, -! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); -! extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size, -! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); - extern void resource_free_bytes( char *old, size_t size ); - - //---------------------------------------------------------------------- -*************** -*** 376,381 **** ---- 397,409 ---- - DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);) - return res; - } -+ -+ void* operator new(size_t size, const std::nothrow_t& nothrow_constant) { -+ address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL); -+ DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);) -+ return res; -+ } -+ - void operator delete(void* p); - }; - -*************** -*** 386,391 **** ---- 414,422 ---- - #define NEW_RESOURCE_ARRAY(type, size)\ - (type*) resource_allocate_bytes((size) * sizeof(type)) - -+ #define NEW_RESOURCE_ARRAY_RETURN_NULL(type, size)\ -+ (type*) resource_allocate_bytes((size) * sizeof(type), AllocFailStrategy::RETURN_NULL) -+ - #define NEW_RESOURCE_ARRAY_IN_THREAD(thread, type, size)\ - (type*) resource_allocate_bytes(thread, (size) * sizeof(type)) - -*** openjdk/hotspot/src/share/vm/memory/allocation.inline.hpp 2011-11-14 17:07:35.000000000 -0500 ---- openjdk/hotspot/src/share/vm/memory/allocation.inline.hpp 2013-06-25 14:55:54.751915115 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 34,58 **** - - - // allocate using malloc; will fail if no memory available -! inline char* AllocateHeap(size_t size, const char* name = NULL) { - char* p = (char*) os::malloc(size); - #ifdef ASSERT - if (PrintMallocFree) trace_heap_malloc(size, name, p); - #else - Unused_Variable(name); - #endif -! if (p == NULL) vm_exit_out_of_memory(size, name); - return p; - } - -! inline char* ReallocateHeap(char *old, size_t size, const char* name = NULL) { - char* p = (char*) os::realloc(old,size); - #ifdef ASSERT - if (PrintMallocFree) trace_heap_malloc(size, name, p); - #else - Unused_Variable(name); - #endif -! if (p == NULL) vm_exit_out_of_memory(size, name); - return p; - } - ---- 34,62 ---- - - - // allocate using malloc; will fail if no memory available -! inline char* AllocateHeap(size_t size, const char* name = NULL, -! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { - char* p = (char*) os::malloc(size); - #ifdef ASSERT - if (PrintMallocFree) trace_heap_malloc(size, name, p); - #else - Unused_Variable(name); - #endif -! if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) -! vm_exit_out_of_memory(size, "AllocateHeap"); - return p; - } - -! inline char* ReallocateHeap(char *old, size_t size, const char* name = NULL, -! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { - char* p = (char*) os::realloc(old,size); - #ifdef ASSERT - if (PrintMallocFree) trace_heap_malloc(size, name, p); - #else - Unused_Variable(name); - #endif -! if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) -! vm_exit_out_of_memory(size, "ReallocateHeap"); - return p; - } - -*** openjdk/hotspot/src/share/vm/memory/resourceArea.cpp 2011-11-14 17:07:36.000000000 -0500 ---- openjdk/hotspot/src/share/vm/memory/resourceArea.cpp 2013-06-25 14:55:54.787914183 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 42,56 **** - // The following routines are declared in allocation.hpp and used everywhere: - - // Allocation in thread-local resource area -! extern char* resource_allocate_bytes(size_t size) { -! return Thread::current()->resource_area()->allocate_bytes(size); - } -! extern char* resource_allocate_bytes(Thread* thread, size_t size) { -! return thread->resource_area()->allocate_bytes(size); - } - -! extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size){ -! return (char*)Thread::current()->resource_area()->Arealloc(old, old_size, new_size); - } - - extern void resource_free_bytes( char *old, size_t size ) { ---- 42,57 ---- - // The following routines are declared in allocation.hpp and used everywhere: - - // Allocation in thread-local resource area -! extern char* resource_allocate_bytes(size_t size, AllocFailType alloc_failmode) { -! return Thread::current()->resource_area()->allocate_bytes(size, alloc_failmode); - } -! extern char* resource_allocate_bytes(Thread* thread, size_t size, AllocFailType alloc_failmode) { -! return thread->resource_area()->allocate_bytes(size, alloc_failmode); - } - -! extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size, -! AllocFailType alloc_failmode){ -! return (char*)Thread::current()->resource_area()->Arealloc(old, old_size, new_size, alloc_failmode); - } - - extern void resource_free_bytes( char *old, size_t size ) { -*** openjdk/hotspot/src/share/vm/memory/resourceArea.hpp 2011-11-14 17:07:36.000000000 -0500 ---- openjdk/hotspot/src/share/vm/memory/resourceArea.hpp 2013-06-25 14:55:54.789914131 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 64,70 **** - debug_only(_nesting = 0;); - } - -! char* allocate_bytes(size_t size) { - #ifdef ASSERT - if (_nesting < 1 && !_warned++) - fatal("memory leak: allocating without ResourceMark"); ---- 64,70 ---- - debug_only(_nesting = 0;); - } - -! char* allocate_bytes(size_t size, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { - #ifdef ASSERT - if (_nesting < 1 && !_warned++) - fatal("memory leak: allocating without ResourceMark"); -*************** -*** 74,80 **** - return (*save = (char*)os::malloc(size)); - } - #endif -! return (char*)Amalloc(size); - } - - debug_only(int nesting() const { return _nesting; }); ---- 74,80 ---- - return (*save = (char*)os::malloc(size)); - } - #endif -! return (char*)Amalloc(size, alloc_failmode); - } - - debug_only(int nesting() const { return _nesting; }); -*** openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp 2011-11-14 17:07:36.000000000 -0500 ---- openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp 2013-06-25 14:55:54.790914103 -0400 -*************** -*** 1,5 **** - /* -! * 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 ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 643,653 **** - // CellType handling methods - // - - void GenerateOopMap::init_state() { - _state_len = _max_locals + _max_stack + _max_monitors; -! _state = NEW_RESOURCE_ARRAY(CellTypeState, _state_len); - memset(_state, 0, _state_len * sizeof(CellTypeState)); -! _state_vec_buf = NEW_RESOURCE_ARRAY(char, MAX3(_max_locals, _max_stack, _max_monitors) + 1/*for null terminator char */); - } - - void GenerateOopMap::make_context_uninitialized() { ---- 643,662 ---- - // CellType handling methods - // - -+ // Allocate memory and throw LinkageError if failure. -+ #define ALLOC_RESOURCE_ARRAY(var, type, count) \ -+ var = NEW_RESOURCE_ARRAY_RETURN_NULL(type, count); \ -+ if (var == NULL) { \ -+ report_error("Cannot reserve enough memory to analyze this method"); \ -+ return; \ -+ } -+ - void GenerateOopMap::init_state() { - _state_len = _max_locals + _max_stack + _max_monitors; -! ALLOC_RESOURCE_ARRAY(_state, CellTypeState, _state_len); - memset(_state, 0, _state_len * sizeof(CellTypeState)); -! int count = MAX3(_max_locals, _max_stack, _max_monitors) + 1/*for null terminator char */; -! ALLOC_RESOURCE_ARRAY(_state_vec_buf, char, count) - } - - void GenerateOopMap::make_context_uninitialized() { -*************** -*** 905,911 **** - // But cumbersome since we don't know the stack heights yet. (Nor the - // monitor stack heights...) - -! _basic_blocks = NEW_RESOURCE_ARRAY(BasicBlock, _bb_count); - - // Make a pass through the bytecodes. Count the number of monitorenters. - // This can be used an upper bound on the monitor stack depth in programs ---- 914,920 ---- - // But cumbersome since we don't know the stack heights yet. (Nor the - // monitor stack heights...) - -! ALLOC_RESOURCE_ARRAY(_basic_blocks, BasicBlock, _bb_count); - - // Make a pass through the bytecodes. Count the number of monitorenters. - // This can be used an upper bound on the monitor stack depth in programs -*************** -*** 976,983 **** - return; - } - -! CellTypeState *basicBlockState = -! NEW_RESOURCE_ARRAY(CellTypeState, bbNo * _state_len); - memset(basicBlockState, 0, bbNo * _state_len * sizeof(CellTypeState)); - - // Make a pass over the basicblocks and assign their state vectors. ---- 985,992 ---- - return; - } - -! CellTypeState *basicBlockState; -! ALLOC_RESOURCE_ARRAY(basicBlockState, CellTypeState, bbNo * _state_len); - memset(basicBlockState, 0, bbNo * _state_len * sizeof(CellTypeState)); - - // Make a pass over the basicblocks and assign their state vectors.
--- a/patches/security/20130618/7158805-nested_subroutine_rewriting.patch Wed Jul 03 23:28:46 2013 -0400 +++ b/patches/security/20130618/7158805-nested_subroutine_rewriting.patch Wed Jul 10 14:09:21 2013 +0100 @@ -1,14 +1,20 @@ # HG changeset patch -# User andrew -# Date 1371562757 18000 -# Node ID 684f0c17ce15a3e012e9b73d618af1462f8c2d64 -# Parent f5eac6fae49e04b673a8307058ce3b22750da0a9 +# User chrisphi +# Date 1373377939 -3600 +# Node ID 2df643057b3d5f75d287a352cadf6fc0501a1682 +# Parent 694e7185c7d959055f6edd878a0e8ff16c5461ba 7158805: Better rewriting of nested subroutine calls -Reviewed-by: mschoene, coleenp diff --git a/src/share/vm/memory/allocation.cpp b/src/share/vm/memory/allocation.cpp --- openjdk/hotspot/src/share/vm/memory/allocation.cpp +++ openjdk/hotspot/src/share/vm/memory/allocation.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it @@ -199,7 +199,7 @@ ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } @@ -129,6 +135,20 @@ diff --git a/src/share/vm/memory/allocation.hpp b/src/share/vm/memory/allocation.hpp --- openjdk/hotspot/src/share/vm/memory/allocation.hpp +++ openjdk/hotspot/src/share/vm/memory/allocation.hpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -34,10 +34,18 @@ + #include "opto/c2_globals.hpp" + #endif + ++#include <new> ++ + #define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1) @@ -38,6 +38,12 @@ #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1)) #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK) @@ -142,7 +162,7 @@ // All classes in the virtual machine must be subclassed // by one of the following allocation classes: // -@@ -152,7 +158,7 @@ +@@ -152,7 +160,7 @@ Chunk* _next; // Next Chunk in list const size_t _len; // Size of this Chunk public: @@ -151,7 +171,7 @@ void operator delete(void* p); Chunk(size_t length); -@@ -200,7 +206,8 @@ +@@ -200,7 +208,8 @@ Chunk *_first; // First chunk Chunk *_chunk; // current chunk char *_hwm, *_max; // High water mark and max in current chunk @@ -161,7 +181,7 @@ NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) NOT_PRODUCT(static size_t _bytes_allocated;) // total #bytes allocated since start friend class AllocStats; -@@ -209,10 +216,15 @@ +@@ -209,10 +218,15 @@ void signal_out_of_memory(size_t request, const char* whence) const; @@ -178,7 +198,7 @@ } public: -@@ -224,14 +236,15 @@ +@@ -224,14 +238,15 @@ char* hwm() const { return _hwm; } // Fast allocate in the arena. Common case is: pointer test + increment. @@ -197,7 +217,7 @@ } else { char *old = _hwm; _hwm += x; -@@ -239,13 +252,14 @@ +@@ -239,13 +254,14 @@ } } // Further assume size is padded out to words @@ -215,7 +235,7 @@ } else { char *old = _hwm; _hwm += x; -@@ -255,7 +269,7 @@ +@@ -255,7 +271,7 @@ // Allocate with 'double' alignment. It is 8 bytes on sparc. // In other cases Amalloc_D() should be the same as Amalloc_4(). @@ -224,7 +244,7 @@ assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); debug_only(if (UseMallocOnly) return malloc(x);) #if defined(SPARC) && !defined(_LP64) -@@ -263,10 +277,11 @@ +@@ -263,10 +279,11 @@ size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; x += delta; #endif @@ -238,7 +258,7 @@ } else { char *old = _hwm; _hwm += x; -@@ -286,7 +301,8 @@ +@@ -286,7 +303,8 @@ if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; } @@ -248,7 +268,7 @@ // Move contents of this arena into an empty arena Arena *move_contents(Arena *empty_arena); -@@ -328,9 +344,12 @@ +@@ -328,9 +346,12 @@ //%note allocation_1 @@ -264,7 +284,7 @@ extern void resource_free_bytes( char *old, size_t size ); //---------------------------------------------------------------------- -@@ -376,6 +395,13 @@ +@@ -376,6 +397,13 @@ DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);) return res; } @@ -278,7 +298,7 @@ void operator delete(void* p); }; -@@ -386,6 +412,9 @@ +@@ -386,6 +414,9 @@ #define NEW_RESOURCE_ARRAY(type, size)\ (type*) resource_allocate_bytes((size) * sizeof(type))
--- a/patches/security/20130618/8001330-checking_order_improvement-it6.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,500 +0,0 @@ -*** openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp 2013-06-26 09:52:56.103661791 -0400 ---- openjdk--/hotspot/src/share/vm/classfile/javaClasses.cpp 2013-06-25 15:28:43.225907956 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 2559,2564 **** ---- 2559,2565 ---- - int java_security_AccessControlContext::_context_offset = 0; - int java_security_AccessControlContext::_privilegedContext_offset = 0; - int java_security_AccessControlContext::_isPrivileged_offset = 0; -+ int java_security_AccessControlContext::_isAuthorized_offset = -1; - - void java_security_AccessControlContext::compute_offsets() { - assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); -*************** -*** 2579,2587 **** ---- 2580,2599 ---- - fatal("Invalid layout of java.security.AccessControlContext"); - } - _isPrivileged_offset = fd.offset(); -+ -+ // The offset may not be present for bootstrapping with older JDK. -+ if (ik->find_local_field(vmSymbols::isAuthorized_name(), vmSymbols::bool_signature(), &fd)) { -+ _isAuthorized_offset = fd.offset(); -+ } - } - - -+ bool java_security_AccessControlContext::is_authorized(Handle context) { -+ assert(context.not_null() && context->klass() == SystemDictionary::AccessControlContext_klass(), "Invalid type"); -+ assert(_isAuthorized_offset != -1, "should be set"); -+ return context->bool_field(_isAuthorized_offset) != 0; -+ } -+ - oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { - assert(_isPrivileged_offset != 0, "offsets should have been initialized"); - // Ensure klass is initialized -*************** -*** 2592,2597 **** ---- 2604,2611 ---- - result->obj_field_put(_context_offset, context()); - result->obj_field_put(_privilegedContext_offset, privileged_context()); - result->bool_field_put(_isPrivileged_offset, isPrivileged); -+ // whitelist AccessControlContexts created by the JVM. -+ result->bool_field_put(_isAuthorized_offset, true); - return result; - } - -*************** -*** 2656,2661 **** ---- 2670,2684 ---- - } - - -+ bool java_lang_System::has_security_manager() { -+ instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass()); -+ address addr = ik->static_field_addr(static_security_offset); -+ if (UseCompressedOops) { -+ return oopDesc::load_decode_heap_oop((narrowOop *)addr) != NULL; -+ } else { -+ return oopDesc::load_decode_heap_oop((oop*)addr) != NULL; -+ } -+ } - - int java_lang_String::value_offset; - int java_lang_String::offset_offset; -*************** -*** 2712,2717 **** ---- 2735,2741 ---- - int java_lang_System::static_in_offset; - int java_lang_System::static_out_offset; - int java_lang_System::static_err_offset; -+ int java_lang_System::static_security_offset; - int java_lang_StackTraceElement::declaringClass_offset; - int java_lang_StackTraceElement::methodName_offset; - int java_lang_StackTraceElement::fileName_offset; -*************** -*** 2866,2871 **** ---- 2890,2896 ---- - java_lang_System::static_in_offset = java_lang_System::hc_static_in_offset * x; - java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x; - java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x; -+ java_lang_System::static_security_offset = java_lang_System::hc_static_security_offset * x; - - // java_lang_StackTraceElement - java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset * x + header; -*************** -*** 3067,3072 **** ---- 3092,3098 ---- - CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, in, "Ljava/io/InputStream;"); - CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, out, "Ljava/io/PrintStream;"); - CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;"); -+ CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, security, "Ljava/lang/SecurityManager;"); - - // java.lang.StackTraceElement - -*** openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp 2013-06-26 09:52:56.106661711 -0400 ---- openjdk--/hotspot/src/share/vm/classfile/javaClasses.hpp 2013-06-25 15:28:43.226907930 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 1146,1156 **** ---- 1146,1159 ---- - static int _context_offset; - static int _privilegedContext_offset; - static int _isPrivileged_offset; -+ static int _isAuthorized_offset; - - static void compute_offsets(); - public: - static oop create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS); - -+ static bool is_authorized(Handle context); -+ - // Debugging/initialization - friend class JavaClasses; - }; -*************** -*** 1186,1198 **** - enum { - hc_static_in_offset = 0, - hc_static_out_offset = 1, -! hc_static_err_offset = 2 - }; - - static int offset_of_static_fields; - static int static_in_offset; - static int static_out_offset; - static int static_err_offset; - - static void compute_offsets(); - ---- 1189,1203 ---- - enum { - hc_static_in_offset = 0, - hc_static_out_offset = 1, -! hc_static_err_offset = 2, -! hc_static_security_offset = 3 - }; - - static int offset_of_static_fields; - static int static_in_offset; - static int static_out_offset; - static int static_err_offset; -+ static int static_security_offset; - - static void compute_offsets(); - -*************** -*** 1201,1206 **** ---- 1206,1213 ---- - static int out_offset_in_bytes(); - static int err_offset_in_bytes(); - -+ static bool has_security_manager(); -+ - // Debugging - friend class JavaClasses; - }; -*** openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp 2011-11-14 17:07:34.000000000 -0500 ---- openjdk--/hotspot/src/share/vm/classfile/vmSymbols.hpp 2013-06-25 15:28:43.227907903 -0400 -*************** -*** 1,5 **** - /* -! * 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 ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 93,98 **** ---- 93,99 ---- - template(java_lang_CharSequence, "java/lang/CharSequence") \ - template(java_security_AccessControlContext, "java/security/AccessControlContext") \ - template(java_security_ProtectionDomain, "java/security/ProtectionDomain") \ -+ template(impliesCreateAccessControlContext_name, "impliesCreateAccessControlContext") \ - template(java_io_OutputStream, "java/io/OutputStream") \ - template(java_io_Reader, "java/io/Reader") \ - template(java_io_BufferedReader, "java/io/BufferedReader") \ -*************** -*** 315,320 **** ---- 316,322 ---- - template(contextClassLoader_name, "contextClassLoader") \ - template(inheritedAccessControlContext_name, "inheritedAccessControlContext") \ - template(isPrivileged_name, "isPrivileged") \ -+ template(isAuthorized_name, "isAuthorized") \ - template(wait_name, "wait") \ - template(checkPackageAccess_name, "checkPackageAccess") \ - template(stackSize_name, "stackSize") \ -*** openjdk/hotspot/src/share/vm/memory/universe.cpp 2011-11-14 17:07:36.000000000 -0500 ---- openjdk--/hotspot/src/share/vm/memory/universe.cpp 2013-06-25 15:28:43.267906879 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 143,148 **** ---- 143,149 ---- - oop Universe::_the_min_jint_string = NULL; - LatestMethodOopCache* Universe::_finalizer_register_cache = NULL; - LatestMethodOopCache* Universe::_loader_addClass_cache = NULL; -+ LatestMethodOopCache* Universe::_pd_implies_cache = NULL; - ActiveMethodOopsCache* Universe::_reflect_invoke_cache = NULL; - oop Universe::_out_of_memory_error_java_heap = NULL; - oop Universe::_out_of_memory_error_perm_gen = NULL; -*************** -*** 265,270 **** ---- 266,272 ---- - f->do_oop((oop*)&_the_min_jint_string); - _finalizer_register_cache->oops_do(f); - _loader_addClass_cache->oops_do(f); -+ _pd_implies_cache->oops_do(f); - _reflect_invoke_cache->oops_do(f); - f->do_oop((oop*)&_out_of_memory_error_java_heap); - f->do_oop((oop*)&_out_of_memory_error_perm_gen); -*************** -*** 787,792 **** ---- 789,795 ---- - // CompactingPermGenGen::initialize_oops() tries to populate them. - Universe::_finalizer_register_cache = new LatestMethodOopCache(); - Universe::_loader_addClass_cache = new LatestMethodOopCache(); -+ Universe::_pd_implies_cache = new LatestMethodOopCache(); - Universe::_reflect_invoke_cache = new ActiveMethodOopsCache(); - - if (UseSharedSpaces) { -*************** -*** 1137,1142 **** ---- 1140,1162 ---- - Universe::_loader_addClass_cache->init( - SystemDictionary::ClassLoader_klass(), m, CHECK_false); - -+ // Setup method for checking protection domain -+ instanceKlass::cast(SystemDictionary::ProtectionDomain_klass())->link_class(CHECK_false); -+ m = instanceKlass::cast(SystemDictionary::ProtectionDomain_klass())-> -+ find_method(vmSymbols::impliesCreateAccessControlContext_name(), -+ vmSymbols::void_boolean_signature()); -+ // Allow NULL which should only happen with bootstrapping. -+ if (m != NULL) { -+ if (m->is_static()) { -+ // NoSuchMethodException doesn't actually work because it tries to run the -+ // <init> function before java_lang_Class is linked. Print error and exit. -+ tty->print_cr("ProtectionDomain.impliesCreateAccessControlContext() has the wrong linkage"); -+ return false; // initialization failed -+ } -+ Universe::_pd_implies_cache->init( -+ SystemDictionary::ProtectionDomain_klass(), m, CHECK_false);; -+ } -+ - // The folowing is initializing converter functions for serialization in - // JVM.cpp. If we clean up the StrictMath code above we may want to find - // a better solution for this as well. -*************** -*** 1570,1575 **** ---- 1590,1596 ---- - - - methodOop LatestMethodOopCache::get_methodOop() { -+ if (klass() == NULL) return NULL; - instanceKlass* ik = instanceKlass::cast(klass()); - methodOop m = ik->method_with_idnum(method_idnum()); - assert(m != NULL, "sanity check"); -*** openjdk/hotspot/src/share/vm/memory/universe.hpp 2011-11-14 17:07:36.000000000 -0500 ---- openjdk--/hotspot/src/share/vm/memory/universe.hpp 2013-06-25 15:28:43.269906816 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 179,184 **** ---- 179,185 ---- - static oop _the_min_jint_string; // A cache of "-2147483648" as a Java string - static LatestMethodOopCache* _finalizer_register_cache; // static method for registering finalizable objects - static LatestMethodOopCache* _loader_addClass_cache; // method for registering loaded classes in class loader vector -+ static LatestMethodOopCache* _pd_implies_cache; // method for checking protection domain attributes - static ActiveMethodOopsCache* _reflect_invoke_cache; // method for security checks - static oop _out_of_memory_error_java_heap; // preallocated error object (no backtrace) - static oop _out_of_memory_error_perm_gen; // preallocated error object (no backtrace) -*************** -*** 322,327 **** ---- 323,329 ---- - static oop the_min_jint_string() { return _the_min_jint_string; } - static methodOop finalizer_register_method() { return _finalizer_register_cache->get_methodOop(); } - static methodOop loader_addClass_method() { return _loader_addClass_cache->get_methodOop(); } -+ static methodOop protection_domain_implies_method() { return _pd_implies_cache->get_methodOop(); } - static ActiveMethodOopsCache* reflect_invoke_cache() { return _reflect_invoke_cache; } - static oop null_ptr_exception_instance() { return _null_ptr_exception_instance; } - static oop arithmetic_exception_instance() { return _arithmetic_exception_instance; } -*** openjdk/hotspot/src/share/vm/prims/jvm.cpp 2011-11-14 17:07:37.000000000 -0500 ---- openjdk--/hotspot/src/share/vm/prims/jvm.cpp 2013-06-25 15:28:43.324905405 -0400 -*************** -*** 1,5 **** - /* -! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it ---- 1,5 ---- - /* -! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -*************** -*** 1101,1106 **** ---- 1101,1156 ---- - } - JVM_END - -+ static bool is_authorized(Handle context, instanceKlassHandle klass, TRAPS) { -+ // If there is a security manager and protection domain, check the access -+ // in the protection domain, otherwise it is authorized. -+ if (java_lang_System::has_security_manager()) { -+ -+ // For bootstrapping, if pd implies method isn't in the JDK, allow -+ // this context to revert to older behavior. -+ // In this case the isAuthorized field in AccessControlContext is also not -+ // present. -+ if (Universe::protection_domain_implies_method() == NULL) { -+ return true; -+ } -+ -+ // Whitelist certain access control contexts -+ if (java_security_AccessControlContext::is_authorized(context)) { -+ return true; -+ } -+ -+ oop prot = klass->protection_domain(); -+ if (prot != NULL) { -+ // Call pd.implies(new SecurityPermission("createAccessControlContext")) -+ // in the new wrapper. -+ methodHandle m(THREAD, Universe::protection_domain_implies_method()); -+ Handle h_prot(THREAD, prot); -+ JavaValue result(T_BOOLEAN); -+ JavaCallArguments args(h_prot); -+ JavaCalls::call(&result, m, &args, CHECK_false); -+ return (result.get_jboolean() != 0); -+ } -+ } -+ return true; -+ } -+ -+ // Create an AccessControlContext with a protection domain with null codesource -+ // and null permissions - which gives no permissions. -+ oop create_dummy_access_control_context(TRAPS) { -+ instanceKlassHandle pd_klass (THREAD, SystemDictionary::ProtectionDomain_klass()); -+ // new ProtectionDomain(null,null); -+ oop null_protection_domain = pd_klass->allocate_instance(CHECK_NULL); -+ Handle null_pd(THREAD, null_protection_domain); -+ -+ // new ProtectionDomain[] {pd}; -+ objArrayOop context = oopFactory::new_objArray(pd_klass(), 1, CHECK_NULL); -+ context->obj_at_put(0, null_pd()); -+ -+ // new AccessControlContext(new ProtectionDomain[] {pd}) -+ objArrayHandle h_context(THREAD, context); -+ oop result = java_security_AccessControlContext::create(h_context, false, Handle(), CHECK_NULL); -+ return result; -+ } - - JVM_ENTRY(jobject, JVM_DoPrivileged(JNIEnv *env, jclass cls, jobject action, jobject context, jboolean wrapException)) - JVMWrapper("JVM_DoPrivileged"); -*************** -*** 1109,1116 **** - THROW_MSG_0(vmSymbols::java_lang_NullPointerException(), "Null action"); - } - -! // Stack allocated list of privileged stack elements -! PrivilegedElement pi; - - // Check that action object understands "Object run()" - Handle object (THREAD, JNIHandles::resolve(action)); ---- 1159,1187 ---- - THROW_MSG_0(vmSymbols::java_lang_NullPointerException(), "Null action"); - } - -! // Compute the frame initiating the do privileged operation and setup the privileged stack -! vframeStream vfst(thread); -! vfst.security_get_caller_frame(1); -! -! if (vfst.at_end()) { -! THROW_MSG_0(vmSymbols::java_lang_InternalError(), "no caller?"); -! } -! -! methodOop method = vfst.method(); -! instanceKlassHandle klass (THREAD, method->method_holder()); -! -! // Check that action object understands "Object run()" -! Handle h_context; -! if (context != NULL) { -! h_context = Handle(THREAD, JNIHandles::resolve(context)); -! bool authorized = is_authorized(h_context, klass, CHECK_NULL); -! if (!authorized) { -! // Create an unprivileged access control object and call it's run function -! // instead. -! oop noprivs = create_dummy_access_control_context(CHECK_NULL); -! h_context = Handle(THREAD, noprivs); -! } -! } - - // Check that action object understands "Object run()" - Handle object (THREAD, JNIHandles::resolve(action)); -*************** -*** 1124,1135 **** - THROW_MSG_0(vmSymbols::java_lang_InternalError(), "No run method"); - } - -! // Compute the frame initiating the do privileged operation and setup the privileged stack -! vframeStream vfst(thread); -! vfst.security_get_caller_frame(1); -! - if (!vfst.at_end()) { -! pi.initialize(&vfst, JNIHandles::resolve(context), thread->privileged_stack_top(), CHECK_NULL); - thread->set_privileged_stack_top(&pi); - } - ---- 1195,1204 ---- - THROW_MSG_0(vmSymbols::java_lang_InternalError(), "No run method"); - } - -! // Stack allocated list of privileged stack elements -! PrivilegedElement pi; - if (!vfst.at_end()) { -! pi.initialize(&vfst, h_context(), thread->privileged_stack_top(), CHECK_NULL); - thread->set_privileged_stack_top(&pi); - } - -*** openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp 2011-11-14 17:07:36.000000000 -0500 ---- openjdk--/hotspot/src/share/vm/oops/instanceKlass.hpp 2013-06-25 15:40:20.707898471 -0400 -*************** -*** 675,680 **** ---- 675,682 ---- - - intptr_t* end_of_itable() const { return start_of_itable() + itable_length(); } - -+ address static_field_addr(int offset); -+ - int offset_of_static_fields() const { - return (intptr_t)start_of_static_fields() - (intptr_t)as_klassOop(); - } -*** openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp 2011-11-14 17:07:36.000000000 -0500 ---- openjdk--/hotspot/src/share/vm/oops/instanceKlass.cpp 2013-06-26 09:20:09.412156641 -0400 -*************** -*** 1992,1997 **** ---- 1992,2002 ---- - } - } - -+ address instanceKlass::static_field_addr(int offset) { -+ return (address)(offset + instanceKlass::offset_of_static_fields() + (intptr_t)java_mirror()); -+ } -+ -+ - const char* instanceKlass::signature_name() const { - const char* src = (const char*) (name()->as_C_string()); - const int src_length = (int)strlen(src);
--- a/patches/security/20130618/8001330-checking_order_improvement.patch Wed Jul 03 23:28:46 2013 -0400 +++ b/patches/security/20130618/8001330-checking_order_improvement.patch Wed Jul 10 14:09:21 2013 +0100 @@ -1,10 +1,10 @@ # HG changeset patch -# User andrew -# Date 1371562887 18000 -# Node ID d521fcfccc58dce20f41178374292f2b8430686c -# Parent 684f0c17ce15a3e012e9b73d618af1462f8c2d64 +# User chrisphi +# Date 1373378000 -3600 +# Node ID d913c85a5297ea80a71b2f6a1174237cb2fbbbad +# Parent 2df643057b3d5f75d287a352cadf6fc0501a1682 8001330: Improve on checking order -Reviewed-by: acorn, hawtin +8011896: Add check for invalid offset for new AccessControlContext isAuthorized field diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp --- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp @@ -263,6 +263,33 @@ static ActiveMethodOopsCache* reflect_invoke_cache() { return _reflect_invoke_cache; } static oop null_ptr_exception_instance() { return _null_ptr_exception_instance; } static oop arithmetic_exception_instance() { return _arithmetic_exception_instance; } +diff --git a/src/share/vm/oops/instanceKlass.cpp b/src/share/vm/oops/instanceKlass.cpp +--- openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp ++++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp +@@ -1992,6 +1992,11 @@ + } + } + ++address instanceKlass::static_field_addr(int offset) { ++ return (address)(offset + instanceKlass::offset_of_static_fields() + (intptr_t)java_mirror()); ++} ++ ++ + const char* instanceKlass::signature_name() const { + const char* src = (const char*) (name()->as_C_string()); + const int src_length = (int)strlen(src); +diff --git a/src/share/vm/oops/instanceKlass.hpp b/src/share/vm/oops/instanceKlass.hpp +--- openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp ++++ openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp +@@ -675,6 +675,8 @@ + + intptr_t* end_of_itable() const { return start_of_itable() + itable_length(); } + ++ address static_field_addr(int offset); ++ + int offset_of_static_fields() const { + return (intptr_t)start_of_static_fields() - (intptr_t)as_klassOop(); + } diff --git a/src/share/vm/prims/jvm.cpp b/src/share/vm/prims/jvm.cpp --- openjdk/hotspot/src/share/vm/prims/jvm.cpp +++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
--- a/patches/security/20130618/hs_merge-01.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,284 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371815475 18000 -# Node ID 4215483da6f258a04b3a8ce6015d57ecbc296eac -# Parent f105c2b7da46999930ae40ac8661a56d6ce1c5cd -Fix merge issues - -diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp ---- openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp -@@ -2638,54 +2638,6 @@ - } - - --static void initialize_static_field(fieldDescriptor* fd, TRAPS) { -- KlassHandle h_k (THREAD, fd->field_holder()); -- assert(h_k.not_null() && fd->is_static(), "just checking"); -- if (fd->has_initial_value()) { -- BasicType t = fd->field_type(); -- switch (t) { -- case T_BYTE: -- h_k()->byte_field_put(fd->offset(), fd->int_initial_value()); -- break; -- case T_BOOLEAN: -- h_k()->bool_field_put(fd->offset(), fd->int_initial_value()); -- break; -- case T_CHAR: -- h_k()->char_field_put(fd->offset(), fd->int_initial_value()); -- break; -- case T_SHORT: -- h_k()->short_field_put(fd->offset(), fd->int_initial_value()); -- break; -- case T_INT: -- h_k()->int_field_put(fd->offset(), fd->int_initial_value()); -- break; -- case T_FLOAT: -- h_k()->float_field_put(fd->offset(), fd->float_initial_value()); -- break; -- case T_DOUBLE: -- h_k()->double_field_put(fd->offset(), fd->double_initial_value()); -- break; -- case T_LONG: -- h_k()->long_field_put(fd->offset(), fd->long_initial_value()); -- break; -- case T_OBJECT: -- { -- #ifdef ASSERT -- TempNewSymbol sym = SymbolTable::new_symbol("Ljava/lang/String;", CHECK); -- assert(fd->signature() == sym, "just checking"); -- #endif -- oop string = fd->string_initial_value(CHECK); -- h_k()->obj_field_put(fd->offset(), string); -- } -- break; -- default: -- THROW_MSG(vmSymbols::java_lang_ClassFormatError(), -- "Illegal ConstantValue attribute in class file"); -- } -- } --} -- -- - instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, - Handle class_loader, - Handle protection_domain, -diff --git a/src/share/vm/classfile/symbolTable.cpp b/src/share/vm/classfile/symbolTable.cpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -40,6 +40,7 @@ - - SymbolTable* SymbolTable::_the_table = NULL; - bool SymbolTable::_needs_rehashing = false; -+jint SymbolTable::_seed = 0; - - Symbol* SymbolTable::allocate_symbol(const u1* name, int len, TRAPS) { - // Don't allow symbols to be created which cannot fit in a Symbol*. -@@ -121,17 +122,25 @@ - } - } - -+unsigned int SymbolTable::new_hash(Symbol* sym) { -+ ResourceMark rm; -+ // Use alternate hashing algorithm on this symbol. -+ return AltHashing::murmur3_32(seed(), (const jbyte*)sym->as_C_string(), sym->utf8_length()); -+} - - // Create a new table and using alternate hash code, populate the new table - // with the existing strings. Set flag to use the alternate hash code afterwards. - void SymbolTable::rehash_table() { - - assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); -- // This should never happen with -Xshare:dump but it might in testing mode. -- if (DumpSharedSpaces) return; -+ assert(!DumpSharedSpaces, "this should never happen with -Xshare:dump"); - // Create a new symbol table - SymbolTable* new_table = new SymbolTable(); - -+ // Initialize the global seed for hashing. -+ _seed = AltHashing::compute_seed(); -+ assert(seed() != 0, "shouldn't be zero"); -+ - the_table()->move_to(new_table); - - // Delete the table and buckets (entries are reused in new table). -diff --git a/src/share/vm/classfile/symbolTable.hpp b/src/share/vm/classfile/symbolTable.hpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp -@@ -88,6 +88,7 @@ - - // Set if one bucket is out of balance due to hash algorithm deficiency - static bool _needs_rehashing; -+ static jint _seed; - - // Adding elements - Symbol* basic_add(int index, u1* name, int len, -@@ -120,6 +121,10 @@ - : Hashtable<Symbol*>(symbol_table_size, sizeof (HashtableEntry<Symbol*>), t, - number_of_entries) {} - -+ static bool use_alternate_hashcode() { return _seed != 0; } -+ static jint seed() { return _seed; } -+ -+ unsigned int new_hash(Symbol* sym); - public: - enum { - symbol_alloc_batch_size = 8 -@@ -225,6 +230,7 @@ - - // Set if one bucket is out of balance due to hash algorithm deficiency - static bool _needs_rehashing; -+ static jint _seed; - - static oop intern(Handle string_or_null, jchar* chars, int length, TRAPS); - oop basic_add(int index, Handle string_or_null, jchar* name, int len, -@@ -243,6 +249,10 @@ - : Hashtable<oop>(string_table_size, sizeof (HashtableEntry<oop>), t, - number_of_entries) {} - -+ static bool use_alternate_hashcode() { return _seed != 0; } -+ static jint seed() { return _seed; } -+ -+ unsigned int new_hash(oop s); - public: - // The string table - static StringTable* the_table() { return _the_table; } -diff --git a/src/share/vm/oops/instanceKlassKlass.cpp b/src/share/vm/oops/instanceKlassKlass.cpp ---- openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp -@@ -347,35 +347,6 @@ - return ik->object_size(); - } - --int instanceKlassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj, -- HeapWord* beg_addr, -- HeapWord* end_addr) { -- assert(obj->is_klass(),"must be a klass"); -- assert(klassOop(obj)->klass_part()->oop_is_instance_slow(), -- "must be instance klass"); -- -- instanceKlass* ik = instanceKlass::cast(klassOop(obj)); -- ik->update_static_fields(beg_addr, end_addr); -- ik->vtable()->oop_update_pointers(cm, beg_addr, end_addr); -- ik->itable()->oop_update_pointers(cm, beg_addr, end_addr); -- -- oop* const beg_oop = MAX2((oop*)beg_addr, ik->oop_block_beg()); -- oop* const end_oop = MIN2((oop*)end_addr, ik->oop_block_end()); -- for (oop* cur_oop = beg_oop; cur_oop < end_oop; ++cur_oop) { -- PSParallelCompact::adjust_pointer(cur_oop); -- } -- -- // The oop_map_cache, jni_ids and jni_id_map are allocated from the C heap, -- // and so don't lie within any 'Chunk' boundaries. Update them when the -- // lowest addressed oop in the instanceKlass 'oop_block' is updated. -- if (beg_oop == ik->oop_block_beg()) { -- OopClosure* closure = PSParallelCompact::adjust_root_pointer_closure(); -- iterate_c_heap_oops(ik, closure); -- } -- -- klassKlass::oop_update_pointers(cm, obj, beg_addr, end_addr); -- return ik->object_size(); --} - #endif // SERIALGC - - klassOop -diff --git a/src/share/vm/prims/methodHandles.cpp b/src/share/vm/prims/methodHandles.cpp ---- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp -+++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp -@@ -646,7 +646,7 @@ - } - } - } -- assert(java_lang_invoke_MethodTypeForm::vmslots(mtform()) == argument_slot_count(mtype()), "must agree"); -+ assert(java_dyn_MethodTypeForm::vmslots(mtform()) == argument_slot_count(mtype()), "must agree"); - } - - // Conversely, a member name which is only initialized from JVM internals -diff --git a/src/share/vm/utilities/hashtable.cpp b/src/share/vm/utilities/hashtable.cpp ---- openjdk/hotspot/src/share/vm/utilities/hashtable.cpp -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.cpp -@@ -1,4 +1,5 @@ --/* * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. -+/* -+* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -96,38 +97,18 @@ - return false; - } - --unsigned int Hashtable::new_hash(oop string) { -- ResourceMark rm; -- int length; -- if (java_lang_String::is_instance(string)) { -- jchar* chars = java_lang_String::as_unicode_string(string, length); -- // Use alternate hashing algorithm on the string -- return AltHashing::murmur3_32(seed(), chars, length); -- } else { -- // Use alternate hashing algorithm on this symbol. -- symbolOop symOop = (symbolOop) string; -- return AltHashing::murmur3_32(seed(), (const jbyte*)symOop->bytes(), symOop->utf8_length()); -- } --} -- - // Create a new table and using alternate hash code, populate the new table - // with the existing elements. This can be used to change the hash code - // and could in the future change the size of the table. - --void Hashtable::move_to(Hashtable* new_table) { -- // Initialize the global seed for hashing. -- assert(new_table->seed() == 0, "should be zero"); -- _seed = AltHashing::compute_seed(); -- assert(seed() != 0, "shouldn't be zero"); -- new_table->set_seed(_seed); -- -+template <class T> void Hashtable<T>::move_to(Hashtable<T>* new_table) { - int saved_entry_count = this->number_of_entries(); - - // Iterate through the table and create a new entry for the new table - for (int i = 0; i < new_table->table_size(); ++i) { -- for (HashtableEntry* p = bucket(i); p != NULL; ) { -- HashtableEntry* next = p->next(); -- oop string = p->literal(); -+ for (HashtableEntry<T>* p = bucket(i); p != NULL; ) { -+ HashtableEntry<T>* next = p->next(); -+ T string = p->literal(); - // Use alternate hashing algorithm on the symbol in the first table - unsigned int hashValue = new_hash(string); - // Get a new index relative to the new table (can also change size) -diff --git a/src/share/vm/utilities/hashtable.hpp b/src/share/vm/utilities/hashtable.hpp ---- openjdk/hotspot/src/share/vm/utilities/hashtable.hpp -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.hpp -@@ -240,11 +240,11 @@ - - public: - Hashtable(int table_size, int entry_size) -- : BasicHashtable(table_size, entry_size), _seed(0) { } -+ : BasicHashtable(table_size, entry_size) { } - - Hashtable(int table_size, int entry_size, - HashtableBucket* buckets, int number_of_entries) -- : BasicHashtable(table_size, entry_size, buckets, number_of_entries), _seed(0) { } -+ : BasicHashtable(table_size, entry_size, buckets, number_of_entries) { } - - // Debugging - void print() PRODUCT_RETURN; -@@ -279,15 +279,8 @@ - } - - // Function to move these elements into the new table. -- void move_to(Hashtable* new_table); -- bool use_alternate_hashcode() { return _seed != 0; } -- jint seed() { return _seed; } -- void set_seed(jint seed) { _seed = seed; } -- -- private: -- jint _seed; -- -- unsigned int new_hash(oop string); -+ void move_to(Hashtable<T>* new_table); -+ virtual unsigned int new_hash(T) { ShouldNotReachHere(); return 0; } // should be overridden - }; - -
--- a/patches/security/20130618/hs_merge-02.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,155 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371820239 18000 -# Node ID f97b2cef7f861a3eb6d78e70cdb2cef1517bb968 -# Parent 4215483da6f258a04b3a8ce6015d57ecbc296eac -Fix JSR292 - -diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -@@ -2324,7 +2324,6 @@ - int java_dyn_MethodHandle::_type_offset; - int java_dyn_MethodHandle::_vmtarget_offset; - int java_dyn_MethodHandle::_vmentry_offset; --int java_dyn_MethodHandle::_vmslots_offset; - - int sun_dyn_MemberName::_clazz_offset; - int sun_dyn_MemberName::_name_offset; -@@ -2345,11 +2344,6 @@ - if (k != NULL && EnableMethodHandles) { - compute_offset(_type_offset, k, vmSymbols::type_name(), vmSymbols::java_dyn_MethodType_signature(), true); - compute_offset(_vmtarget_offset, k, vmSymbols::vmtarget_name(), vmSymbols::object_signature(), true); -- compute_offset(_vmentry_offset, k, vmSymbols::vmentry_name(), vmSymbols::machine_word_signature(), true); -- -- // Note: MH.vmslots (if it is present) is a hoisted copy of MH.type.form.vmslots. -- // It is optional pending experiments to keep or toss. -- compute_optional_offset(_vmslots_offset, k, vmSymbols::vmslots_name(), vmSymbols::int_signature(), true); - } - } - -@@ -2395,31 +2389,9 @@ - mh->obj_field_put(_type_offset, mtype); - } - --int java_dyn_MethodHandle::vmslots(oop mh) { -- int vmslots_offset = _vmslots_offset; -- if (vmslots_offset != 0) { --#ifdef ASSERT -- int x = mh->int_field(vmslots_offset); -- int y = compute_vmslots(mh); -- assert(x == y, "correct hoisted value"); --#endif -- return mh->int_field(vmslots_offset); -- } else { -- return compute_vmslots(mh); -- } --} -- --// if MH.vmslots exists, hoist into it the value of type.form.vmslots --void java_dyn_MethodHandle::init_vmslots(oop mh) { -- int vmslots_offset = _vmslots_offset; -- if (vmslots_offset != 0) { -- mh->int_field_put(vmslots_offset, compute_vmslots(mh)); -- } --} -- - // fetch type.form.vmslots, which is the number of JVM stack slots - // required to carry the arguments of this MH --int java_dyn_MethodHandle::compute_vmslots(oop mh) { -+int java_dyn_MethodHandle::vmslots(oop mh) { - oop mtype = type(mh); - if (mtype == NULL) return 0; // Java code would get NPE - oop form = java_dyn_MethodType::form(mtype); -@@ -2648,16 +2620,12 @@ - // Support for java_dyn_CallSite - - int java_dyn_CallSite::_target_offset; --int java_dyn_CallSite::_caller_method_offset; --int java_dyn_CallSite::_caller_bci_offset; - - void java_dyn_CallSite::compute_offsets() { - if (!EnableInvokeDynamic) return; - klassOop k = SystemDictionary::CallSite_klass(); - if (k != NULL) { - compute_offset(_target_offset, k, vmSymbols::target_name(), vmSymbols::java_dyn_MethodHandle_signature()); -- compute_offset(_caller_method_offset, k, vmSymbols::vmmethod_name(), vmSymbols::sun_dyn_MemberName_signature()); -- compute_offset(_caller_bci_offset, k, vmSymbols::vmindex_name(), vmSymbols::int_signature()); - } - } - -@@ -2669,23 +2637,6 @@ - site->obj_field_put(_target_offset, target); - } - --oop java_dyn_CallSite::caller_method(oop site) { -- return site->obj_field(_caller_method_offset); --} -- --void java_dyn_CallSite::set_caller_method(oop site, oop ref) { -- site->obj_field_put(_caller_method_offset, ref); --} -- --jint java_dyn_CallSite::caller_bci(oop site) { -- return site->int_field(_caller_bci_offset); --} -- --void java_dyn_CallSite::set_caller_bci(oop site, jint bci) { -- site->int_field_put(_caller_bci_offset, bci); --} -- -- - // Support for java_security_AccessControlContext - - int java_security_AccessControlContext::_context_offset = 0; -diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -@@ -872,7 +872,7 @@ - }; - - #define DIRECTMETHODHANDLE_INJECTED_FIELDS(macro) \ -- macro(java_dyn_DirectMethodHandle, vmindex, int_signature, true) -+ macro(sun_dyn_DirectMethodHandle, vmindex, int_signature, true) - - class sun_dyn_DirectMethodHandle: public java_dyn_MethodHandle { - friend class JavaClasses; -@@ -1090,8 +1090,7 @@ - }; - - #define METHODTYPEFORM_INJECTED_FIELDS(macro) \ -- macro(java_dyn_MethodTypeForm, vmslots, int_signature, true) \ -- macro(java_dyn_MethodTypeForm, vmlayout, object_signature, true) -+ macro(java_dyn_MethodTypeForm, vmslots, int_signature, true) - - class java_dyn_MethodTypeForm: AllStatic { - friend class JavaClasses; -diff --git a/src/share/vm/classfile/symbolTable.cpp b/src/share/vm/classfile/symbolTable.cpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -291,7 +291,6 @@ - if (!added) { - // do it the hard way - for (int i=0; i<names_count; i++) { -- assert(!Universe::heap()->is_in_reserved(names[i]) || GC_locker::is_active(), - int index = table->hash_to_index(hashValues[i]); - Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], - hashValues[i], CHECK); -@@ -300,7 +299,7 @@ - } - } - --Symbol* SymbolTable::basic_add(int index, u1 *name, int len, -+Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, - unsigned int hashValue_arg, TRAPS) { - assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), - "proposed name of symbol must be stable"); -@@ -591,7 +590,7 @@ - } - - --oop StringTable::basic_add(int index, Handle string_or_null, jchar* name, -+oop StringTable::basic_add(int index_arg, Handle string_or_null, jchar* name, - int len, unsigned int hashValue_arg, TRAPS) { - debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); - assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(),
--- a/patches/security/20130618/hs_merge-03.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371822495 18000 -# Node ID cdce92891bfbc17372d8e5d5d2cccf319cf73589 -# Parent f97b2cef7f861a3eb6d78e70cdb2cef1517bb968 -Add missing _seed variable - -diff --git a/src/share/vm/classfile/symbolTable.cpp b/src/share/vm/classfile/symbolTable.cpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -564,6 +564,7 @@ - StringTable* StringTable::_the_table = NULL; - - bool StringTable::_needs_rehashing = false; -+jint StringTable::_seed = 0; - - // Pick hashing algorithm - unsigned int StringTable::hash_string(const jchar* s, int len) {
--- a/patches/security/20130618/hs_merge-04.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371823968 18000 -# Node ID 23feb1f1b3033e87b9bad1f88f663ec3e1ac5ca9 -# Parent 81575d3cbd95714395c022a7f7ca622bab432b2b -Hashing cleanup - -diff --git a/src/share/vm/classfile/symbolTable.cpp b/src/share/vm/classfile/symbolTable.cpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -176,8 +176,8 @@ - - // Pick hashing algorithm. - unsigned int SymbolTable::hash_symbol(const char* s, int len) { -- return the_table()->use_alternate_hashcode() ? -- AltHashing::murmur3_32(the_table()->seed(), (const jbyte*)s, len) : -+ return use_alternate_hashcode() ? -+ AltHashing::murmur3_32(seed(), (const jbyte*)s, len) : - java_lang_String::to_hash(s, len); - } - -@@ -568,7 +568,7 @@ - - // Pick hashing algorithm - unsigned int StringTable::hash_string(const jchar* s, int len) { -- return the_table()->use_alternate_hashcode() ? AltHashing::murmur3_32(the_table()->seed(), s, len) : -+ return use_alternate_hashcode() ? AltHashing::murmur3_32(seed(), s, len) : - java_lang_String::to_hash(s, len); - } - -@@ -770,6 +770,13 @@ - st->print_cr("Maximum bucket size : %7.0f", summary.maximum()); - } - -+unsigned int StringTable::new_hash(oop string) { -+ ResourceMark rm; -+ int length; -+ jchar* chars = java_lang_String::as_unicode_string(string, length); -+ // Use alternate hashing algorithm on the string -+ return AltHashing::murmur3_32(seed(), chars, length); -+} - - // Create a new table and using alternate hash code, populate the new table - // with the existing strings. Set flag to use the alternate hash code afterwards.
--- a/patches/sparc.patch Wed Jul 03 23:28:46 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1808 +0,0 @@ - -# HG changeset patch -# User phh -# Date 1209064077 14400 -# Node ID 435e6450501506326c95d3374eb08b3406fa420c -# Parent ec73d88d5b43153e083db1fc57971def1e828ab3 -6693457: Open-source hotspot linux-sparc support -Summary: Move os_cpu/linux_sparc from closed to open -Reviewed-by: kamg - -#--- a/src/share/vm/oops/oop.inline.hpp Wed Apr 23 06:35:28 2008 -0400 -#+++ openjdk/hotspot/src/share/vm/oops/oop.inline.hpp Thu Apr 24 15:07:57 2008 -0400 -#@@ -135,7 +135,7 @@ inline narrowOop oopDesc::encode_heap_oo -# assert(!is_null(v), "oop value can never be zero"); -# address heap_base = Universe::heap_base(); -# uint64_t result = (uint64_t)(pointer_delta((void*)v, (void*)heap_base, 1) >> LogMinObjAlignmentInBytes); -#- assert((result & 0xffffffff00000000L) == 0, "narrow oop overflow"); -#+ assert((result & 0xffffffff00000000ULL) == 0, "narrow oop overflow"); -# return (narrowOop)result; -# } -# ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/make/linux/platform_sparcv9 Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,15 @@ -+os_family = linux -+ -+arch = sparc -+ -+arch_model = sparc -+ -+os_arch = linux_sparc -+ -+os_arch_model = linux_sparc -+ -+lib_arch = sparcv9 -+ -+compiler = gcc -+ -+sysdefs = -DLINUX -D_GNU_SOURCE -DSPARC ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,51 @@ -+/* -+ * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+#include "incls/_precompiled.incl" -+#include "incls/_assembler_linux_sparc.cpp.incl" -+ -+#include <asm-sparc/traps.h> -+ -+bool MacroAssembler::needs_explicit_null_check(intptr_t offset) { -+ // Since the linux kernel resides at the low end of -+ // user address space, no null pointer check is needed. -+ return offset < 0 || offset >= 0x100000; -+} -+ -+void MacroAssembler::read_ccr_trap(Register ccr_save) { -+ // No implementation -+ breakpoint_trap(); -+} -+ -+void MacroAssembler::write_ccr_trap(Register ccr_save, Register scratch1, Register scratch2) { -+ // No implementation -+ breakpoint_trap(); -+} -+ -+void MacroAssembler::flush_windows_trap() { trap(SP_TRAP_FWIN); } -+void MacroAssembler::clean_windows_trap() { trap(SP_TRAP_CWIN); } -+ -+// Use software breakpoint trap until we figure out how to do this on Linux -+void MacroAssembler::get_psr_trap() { trap(SP_TRAP_SBPT); } -+void MacroAssembler::set_psr_trap() { trap(SP_TRAP_SBPT); } ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,206 @@ -+/* -+ * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+// Implementation of class atomic -+ -+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; } -+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; } -+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; } -+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; } -+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; } -+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; } -+ -+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; } -+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; } -+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; } -+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; } -+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; } -+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; } -+ -+inline void Atomic::inc (volatile jint* dest) { (void)add (1, dest); } -+inline void Atomic::inc_ptr(volatile intptr_t* dest) { (void)add_ptr(1, dest); } -+inline void Atomic::inc_ptr(volatile void* dest) { (void)add_ptr(1, dest); } -+ -+inline void Atomic::dec (volatile jint* dest) { (void)add (-1, dest); } -+inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); } -+inline void Atomic::dec_ptr(volatile void* dest) { (void)add_ptr(-1, dest); } -+ -+inline jint Atomic::add (jint add_value, volatile jint* dest) { -+ intptr_t rv; -+ __asm__ volatile( -+ "1: \n\t" -+ " ld [%2], %%o2\n\t" -+ " add %1, %%o2, %%o3\n\t" -+ " cas [%2], %%o2, %%o3\n\t" -+ " cmp %%o2, %%o3\n\t" -+ " bne 1b\n\t" -+ " nop\n\t" -+ " add %1, %%o2, %0\n\t" -+ : "=r" (rv) -+ : "r" (add_value), "r" (dest) -+ : "memory", "o2", "o3"); -+ return rv; -+} -+ -+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { -+ intptr_t rv; -+#ifdef _LP64 -+ __asm__ volatile( -+ "1: \n\t" -+ " ldx [%2], %%o2\n\t" -+ " add %0, %%o2, %%o3\n\t" -+ " casx [%2], %%o2, %%o3\n\t" -+ " cmp %%o2, %%o3\n\t" -+ " bne %%xcc, 1b\n\t" -+ " nop\n\t" -+ " add %0, %%o2, %0\n\t" -+ : "=r" (rv) -+ : "r" (add_value), "r" (dest) -+ : "memory", "o2", "o3"); -+#else -+ __asm__ volatile( -+ "1: \n\t" -+ " ld [%2], %%o2\n\t" -+ " add %1, %%o2, %%o3\n\t" -+ " cas [%2], %%o2, %%o3\n\t" -+ " cmp %%o2, %%o3\n\t" -+ " bne 1b\n\t" -+ " nop\n\t" -+ " add %1, %%o2, %0\n\t" -+ : "=r" (rv) -+ : "r" (add_value), "r" (dest) -+ : "memory", "o2", "o3"); -+#endif // _LP64 -+ return rv; -+} -+ -+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) { -+ return (void*)add_ptr((intptr_t)add_value, (volatile intptr_t*)dest); -+} -+ -+ -+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { -+ intptr_t rv = exchange_value; -+ __asm__ volatile( -+ " swap [%2],%1\n\t" -+ : "=r" (rv) -+ : "0" (exchange_value) /* we use same register as for return value */, "r" (dest) -+ : "memory"); -+ return rv; -+} -+ -+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { -+ intptr_t rv = exchange_value; -+#ifdef _LP64 -+ __asm__ volatile( -+ "1:\n\t" -+ " mov %1, %%o3\n\t" -+ " ldx [%2], %%o2\n\t" -+ " casx [%2], %%o2, %%o3\n\t" -+ " cmp %%o2, %%o3\n\t" -+ " bne %%xcc, 1b\n\t" -+ " nop\n\t" -+ " mov %%o2, %0\n\t" -+ : "=r" (rv) -+ : "r" (exchange_value), "r" (dest) -+ : "memory", "o2", "o3"); -+#else -+ __asm__ volatile( -+ "swap [%2],%1\n\t" -+ : "=r" (rv) -+ : "0" (exchange_value) /* we use same register as for return value */, "r" (dest) -+ : "memory"); -+#endif // _LP64 -+ return rv; -+} -+ -+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) { -+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest); -+} -+ -+ -+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value) { -+ jint rv; -+ __asm__ volatile( -+ " cas [%2], %3, %0" -+ : "=r" (rv) -+ : "0" (exchange_value), "r" (dest), "r" (compare_value) -+ : "memory"); -+ return rv; -+} -+ -+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) { -+#ifdef _LP64 -+ jlong rv; -+ __asm__ volatile( -+ " casx [%2], %3, %0" -+ : "=r" (rv) -+ : "0" (exchange_value), "r" (dest), "r" (compare_value) -+ : "memory"); -+ return rv; -+#else -+ assert(VM_Version::v9_instructions_work(), "cas only supported on v9"); -+ volatile jlong_accessor evl, cvl, rv; -+ evl.long_value = exchange_value; -+ cvl.long_value = compare_value; -+ -+ __asm__ volatile( -+ " sllx %2, 32, %2\n\t" -+ " srl %3, 0, %3\n\t" -+ " or %2, %3, %2\n\t" -+ " sllx %5, 32, %5\n\t" -+ " srl %6, 0, %6\n\t" -+ " or %5, %6, %5\n\t" -+ " casx [%4], %5, %2\n\t" -+ " srl %2, 0, %1\n\t" -+ " srlx %2, 32, %0\n\t" -+ : "=r" (rv.words[0]), "=r" (rv.words[1]) -+ : "r" (evl.words[0]), "r" (evl.words[1]), "r" (dest), "r" (cvl.words[0]), "r" (cvl.words[1]) -+ : "memory"); -+ -+ return rv.long_value; -+#endif -+} -+ -+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) { -+ intptr_t rv; -+#ifdef _LP64 -+ __asm__ volatile( -+ " casx [%2], %3, %0" -+ : "=r" (rv) -+ : "0" (exchange_value), "r" (dest), "r" (compare_value) -+ : "memory"); -+#else -+ __asm__ volatile( -+ " cas [%2], %3, %0" -+ : "=r" (rv) -+ : "0" (exchange_value), "r" (dest), "r" (compare_value) -+ : "memory"); -+#endif // _LP64 -+ return rv; -+} -+ -+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) { -+ return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value); -+} ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,34 @@ -+/* -+ * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+// -+// Sets the default values for platform dependent flags used by the -+// runtime system. (see globals.hpp) -+// -+ -+define_pd_global(uintx, JVMInvokeMethodSlack, 12288); -+define_pd_global(intx, CompilerThreadStackSize, 0); -+ -+// Only used on 64 bit Windows platforms -+define_pd_global(bool, UseVectoredExceptions, false); ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.ad Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,27 @@ -+// -+// Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. -+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+// -+// This code is free software; you can redistribute it and/or modify it -+// under the terms of the GNU General Public License version 2 only, as -+// published by the Free Software Foundation. -+// -+// This code is distributed in the hope that it will be useful, but WITHOUT -+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+// version 2 for more details (a copy is included in the LICENSE file that -+// accompanied this code). -+// -+// You should have received a copy of the GNU General Public License version -+// 2 along with this work; if not, write to the Free Software Foundation, -+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+// -+// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+// CA 95054 USA or visit www.sun.com if you need additional information or -+// have any questions. -+// -+ -+// -+// -+ -+// SPARC Linux Architecture Description File ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.s Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,105 @@ -+# -+# Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+ -+ # Prototype: int SafeFetch32 (int * adr, int ErrValue) -+ # The "ld" at Fetch32 is potentially faulting instruction. -+ # If the instruction traps the trap handler will arrange -+ # for control to resume at Fetch32Resume. -+ # By convention with the trap handler we ensure there is a non-CTI -+ # instruction in the trap shadow. -+ -+ -+ .globl SafeFetch32, Fetch32PFI, Fetch32Resume -+ .globl SafeFetchN -+ .align 32 -+ .type SafeFetch32,@function -+SafeFetch32: -+ mov %o0, %g1 -+ mov %o1, %o0 -+Fetch32PFI: -+ # <-- Potentially faulting instruction -+ ld [%g1], %o0 -+Fetch32Resume: -+ nop -+ retl -+ nop -+ -+ .globl SafeFetchN, FetchNPFI, FetchNResume -+ .type SafeFetchN,@function -+ .align 32 -+SafeFetchN: -+ mov %o0, %g1 -+ mov %o1, %o0 -+FetchNPFI: -+ ldn [%g1], %o0 -+FetchNResume: -+ nop -+ retl -+ nop -+ -+ # Possibilities: -+ # -- membar -+ # -- CAS (SP + BIAS, G0, G0) -+ # -- wr %g0, %asi -+ -+ .globl SpinPause -+ .type SpinPause,@function -+ .align 32 -+SpinPause: -+ retl -+ mov %g0, %o0 -+ -+ .globl _Copy_conjoint_jlongs_atomic -+ .type _Copy_conjoint_jlongs_atomic,@function -+_Copy_conjoint_jlongs_atomic: -+ cmp %o0, %o1 -+ bleu 4f -+ sll %o2, 3, %o4 -+ ba 2f -+ 1: -+ subcc %o4, 8, %o4 -+ std %o2, [%o1] -+ add %o0, 8, %o0 -+ add %o1, 8, %o1 -+ 2: -+ bge,a 1b -+ ldd [%o0], %o2 -+ ba 5f -+ nop -+ 3: -+ std %o2, [%o1+%o4] -+ 4: -+ subcc %o4, 8, %o4 -+ bge,a 3b -+ ldd [%o0+%o4], %o2 -+ 5: -+ retl -+ nop -+ -+ -+ .globl _flush_reg_windows -+ .align 32 -+ _flush_reg_windows: -+ ta 0x03 -+ retl -+ mov %fp, %o0 ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,102 @@ -+/* -+ * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+// Implementation of class OrderAccess. -+ -+// Assume TSO. -+ -+inline void OrderAccess::loadload() { acquire(); } -+inline void OrderAccess::storestore() { release(); } -+inline void OrderAccess::loadstore() { acquire(); } -+inline void OrderAccess::storeload() { fence(); } -+ -+inline void OrderAccess::acquire() { -+ __asm__ volatile ("nop" : : :); -+} -+ -+inline void OrderAccess::release() { -+ jint* dummy = (jint*)&dummy; -+ __asm__ volatile("stw %%g0, [%0]" : : "r" (dummy) : "memory"); -+} -+ -+inline void OrderAccess::fence() { -+ __asm__ volatile ("membar #StoreLoad" : : :); -+} -+ -+inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { return *p; } -+inline jshort OrderAccess::load_acquire(volatile jshort* p) { return *p; } -+inline jint OrderAccess::load_acquire(volatile jint* p) { return *p; } -+inline jlong OrderAccess::load_acquire(volatile jlong* p) { return *p; } -+inline jubyte OrderAccess::load_acquire(volatile jubyte* p) { return *p; } -+inline jushort OrderAccess::load_acquire(volatile jushort* p) { return *p; } -+inline juint OrderAccess::load_acquire(volatile juint* p) { return *p; } -+inline julong OrderAccess::load_acquire(volatile julong* p) { return *p; } -+inline jfloat OrderAccess::load_acquire(volatile jfloat* p) { return *p; } -+inline jdouble OrderAccess::load_acquire(volatile jdouble* p) { return *p; } -+ -+inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) { return *p; } -+inline void* OrderAccess::load_ptr_acquire(volatile void* p) { return *(void* volatile *)p; } -+inline void* OrderAccess::load_ptr_acquire(const volatile void* p) { return *(void* const volatile *)p; } -+ -+inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { *p = v; } -+inline void OrderAccess::release_store(volatile jshort* p, jshort v) { *p = v; } -+inline void OrderAccess::release_store(volatile jint* p, jint v) { *p = v; } -+inline void OrderAccess::release_store(volatile jlong* p, jlong v) { *p = v; } -+inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { *p = v; } -+inline void OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; } -+inline void OrderAccess::release_store(volatile juint* p, juint v) { *p = v; } -+inline void OrderAccess::release_store(volatile julong* p, julong v) { *p = v; } -+inline void OrderAccess::release_store(volatile jfloat* p, jfloat v) { *p = v; } -+inline void OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; } -+ -+inline void OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; } -+inline void OrderAccess::release_store_ptr(volatile void* p, void* v) { *(void* volatile *)p = v; } -+ -+inline void OrderAccess::store_fence(jbyte* p, jbyte v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(jshort* p, jshort v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(jint* p, jint v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(jlong* p, jlong v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(jubyte* p, jubyte v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(jushort* p, jushort v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(juint* p, juint v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(julong* p, julong v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(jfloat* p, jfloat v) { *p = v; fence(); } -+inline void OrderAccess::store_fence(jdouble* p, jdouble v) { *p = v; fence(); } -+ -+inline void OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) { *p = v; fence(); } -+inline void OrderAccess::store_ptr_fence(void** p, void* v) { *p = v; fence(); } -+ -+inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile jint* p, jint v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { *p = v; fence(); } -+inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); } -+ -+inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); } -+inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); } ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,658 @@ -+/* -+ * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+// do not include precompiled header file -+ -+#include "incls/_os_linux_sparc.cpp.incl" -+ -+// Linux/Sparc has rather obscure naming of registers in sigcontext -+// different between 32 and 64 bits -+#ifdef _LP64 -+#define SIG_PC(x) ((x)->sigc_regs.tpc) -+#define SIG_NPC(x) ((x)->sigc_regs.tnpc) -+#define SIG_REGS(x) ((x)->sigc_regs) -+#else -+#define SIG_PC(x) ((x)->si_regs.pc) -+#define SIG_NPC(x) ((x)->si_regs.npc) -+#define SIG_REGS(x) ((x)->si_regs) -+#endif -+ -+// those are to reference registers in sigcontext -+enum { -+ CON_G0 = 0, -+ CON_G1, -+ CON_G2, -+ CON_G3, -+ CON_G4, -+ CON_G5, -+ CON_G6, -+ CON_G7, -+ CON_O0, -+ CON_O1, -+ CON_O2, -+ CON_O3, -+ CON_O4, -+ CON_O5, -+ CON_O6, -+ CON_O7, -+}; -+ -+static inline void set_cont_address(sigcontext* ctx, address addr) { -+ SIG_PC(ctx) = (intptr_t)addr; -+ SIG_NPC(ctx) = (intptr_t)(addr+4); -+} -+ -+// For Forte Analyzer AsyncGetCallTrace profiling support - thread is -+// currently interrupted by SIGPROF. -+// os::Solaris::fetch_frame_from_ucontext() tries to skip nested -+// signal frames. Currently we don't do that on Linux, so it's the -+// same as os::fetch_frame_from_context(). -+ExtendedPC os::Linux::fetch_frame_from_ucontext(Thread* thread, -+ ucontext_t* uc, -+ intptr_t** ret_sp, -+ intptr_t** ret_fp) { -+ assert(thread != NULL, "just checking"); -+ assert(ret_sp != NULL, "just checking"); -+ assert(ret_fp != NULL, "just checking"); -+ -+ return os::fetch_frame_from_context(uc, ret_sp, ret_fp); -+} -+ -+ExtendedPC os::fetch_frame_from_context(void* ucVoid, -+ intptr_t** ret_sp, -+ intptr_t** ret_fp) { -+ ucontext_t* uc = (ucontext_t*) ucVoid; -+ ExtendedPC epc; -+ -+ if (uc != NULL) { -+ epc = ExtendedPC(os::Linux::ucontext_get_pc(uc)); -+ if (ret_sp) { -+ *ret_sp = os::Linux::ucontext_get_sp(uc); -+ } -+ if (ret_fp) { -+ *ret_fp = os::Linux::ucontext_get_fp(uc); -+ } -+ } else { -+ // construct empty ExtendedPC for return value checking -+ epc = ExtendedPC(NULL); -+ if (ret_sp) { -+ *ret_sp = (intptr_t*) NULL; -+ } -+ if (ret_fp) { -+ *ret_fp = (intptr_t*) NULL; -+ } -+ } -+ -+ return epc; -+} -+ -+frame os::fetch_frame_from_context(void* ucVoid) { -+ intptr_t* sp; -+ intptr_t* fp; -+ ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp); -+ return frame(sp, fp, epc.pc()); -+} -+ -+frame os::get_sender_for_C_frame(frame* fr) { -+ return frame(fr->sender_sp(), fr->link(), fr->sender_pc()); -+} -+ -+frame os::current_frame() { -+ fprintf(stderr, "current_frame()"); -+ -+ intptr_t* sp = StubRoutines::Sparc::flush_callers_register_windows_func()(); -+ frame myframe(sp, frame::unpatchable, -+ CAST_FROM_FN_PTR(address, os::current_frame)); -+ if (os::is_first_C_frame(&myframe)) { -+ // stack is not walkable -+ return frame(NULL, frame::unpatchable, NULL); -+ } else { -+ return os::get_sender_for_C_frame(&myframe); -+ } -+} -+ -+address os::current_stack_pointer() { -+ register void *sp __asm__ ("sp"); -+ return (address)sp; -+} -+ -+static void current_stack_region(address* bottom, size_t* size) { -+ if (os::Linux::is_initial_thread()) { -+ // initial thread needs special handling because pthread_getattr_np() -+ // may return bogus value. -+ *bottom = os::Linux::initial_thread_stack_bottom(); -+ *size = os::Linux::initial_thread_stack_size(); -+ } else { -+ pthread_attr_t attr; -+ -+ int rslt = pthread_getattr_np(pthread_self(), &attr); -+ -+ // JVM needs to know exact stack location, abort if it fails -+ if (rslt != 0) { -+ if (rslt == ENOMEM) { -+ vm_exit_out_of_memory(0, "pthread_getattr_np"); -+ } else { -+ fatal1("pthread_getattr_np failed with errno = %d", rslt); -+ } -+ } -+ -+ if (pthread_attr_getstack(&attr, (void**)bottom, size) != 0) { -+ fatal("Can not locate current stack attributes!"); -+ } -+ -+ pthread_attr_destroy(&attr); -+ } -+ assert(os::current_stack_pointer() >= *bottom && -+ os::current_stack_pointer() < *bottom + *size, "just checking"); -+} -+ -+address os::current_stack_base() { -+ address bottom; -+ size_t size; -+ current_stack_region(&bottom, &size); -+ return bottom + size; -+} -+ -+size_t os::current_stack_size() { -+ // stack size includes normal stack and HotSpot guard pages -+ address bottom; -+ size_t size; -+ current_stack_region(&bottom, &size); -+ return size; -+} -+ -+char* os::non_memory_address_word() { -+ // Must never look like an address returned by reserve_memory, -+ // even in its subfields (as defined by the CPU immediate fields, -+ // if the CPU splits constants across multiple instructions). -+ // On SPARC, 0 != %hi(any real address), because there is no -+ // allocation in the first 1Kb of the virtual address space. -+ return (char*) 0; -+} -+ -+void os::initialize_thread() {} -+ -+void os::print_context(outputStream *st, void *context) { -+ if (context == NULL) return; -+ -+ ucontext_t* uc = (ucontext_t*)context; -+ sigcontext* sc = (sigcontext*)context; -+ st->print_cr("Registers:"); -+ -+ st->print_cr(" O0=" INTPTR_FORMAT " O1=" INTPTR_FORMAT -+ " O2=" INTPTR_FORMAT " O3=" INTPTR_FORMAT, -+ SIG_REGS(sc).u_regs[CON_O0], -+ SIG_REGS(sc).u_regs[CON_O1], -+ SIG_REGS(sc).u_regs[CON_O2], -+ SIG_REGS(sc).u_regs[CON_O3]); -+ st->print_cr(" O4=" INTPTR_FORMAT " O5=" INTPTR_FORMAT -+ " O6=" INTPTR_FORMAT " O7=" INTPTR_FORMAT, -+ SIG_REGS(sc).u_regs[CON_O4], -+ SIG_REGS(sc).u_regs[CON_O5], -+ SIG_REGS(sc).u_regs[CON_O6], -+ SIG_REGS(sc).u_regs[CON_O7]); -+ -+ st->print_cr(" G1=" INTPTR_FORMAT " G2=" INTPTR_FORMAT -+ " G3=" INTPTR_FORMAT " G4=" INTPTR_FORMAT, -+ SIG_REGS(sc).u_regs[CON_G1], -+ SIG_REGS(sc).u_regs[CON_G2], -+ SIG_REGS(sc).u_regs[CON_G3], -+ SIG_REGS(sc).u_regs[CON_G4]); -+ st->print_cr(" G5=" INTPTR_FORMAT " G6=" INTPTR_FORMAT -+ " G7=" INTPTR_FORMAT " Y=" INTPTR_FORMAT, -+ SIG_REGS(sc).u_regs[CON_G5], -+ SIG_REGS(sc).u_regs[CON_G6], -+ SIG_REGS(sc).u_regs[CON_G7], -+ SIG_REGS(sc).y); -+ -+ st->print_cr(" PC=" INTPTR_FORMAT " nPC=" INTPTR_FORMAT, -+ SIG_PC(sc), -+ SIG_NPC(sc)); -+ st->cr(); -+ st->cr(); -+ -+ intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc); -+ st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", sp); -+ print_hex_dump(st, (address)sp, (address)(sp + 32), sizeof(intptr_t)); -+ st->cr(); -+ -+ // Note: it may be unsafe to inspect memory near pc. For example, pc may -+ // point to garbage if entry point in an nmethod is corrupted. Leave -+ // this at the end, and hope for the best. -+ address pc = os::Linux::ucontext_get_pc(uc); -+ st->print_cr("Instructions: (pc=" PTR_FORMAT ")", pc); -+ print_hex_dump(st, pc - 16, pc + 16, sizeof(char)); -+} -+ -+ -+address os::Linux::ucontext_get_pc(ucontext_t* uc) { -+ return (address) SIG_PC((sigcontext*)uc); -+} -+ -+intptr_t* os::Linux::ucontext_get_sp(ucontext_t *uc) { -+ return (intptr_t*) -+ ((intptr_t)SIG_REGS((sigcontext*)uc).u_regs[CON_O6] + STACK_BIAS); -+} -+ -+// not used on Sparc -+intptr_t* os::Linux::ucontext_get_fp(ucontext_t *uc) { -+ ShouldNotReachHere(); -+ return NULL; -+} -+ -+// Utility functions -+ -+julong os::allocatable_physical_memory(julong size) { -+ julong result = MIN2(size, (julong)3800*M); -+ if (!is_allocatable(result)) { -+ // See comments under solaris for alignment considerations -+ julong reasonable_size = (julong)2*G - 2 * os::vm_page_size(); -+ result = MIN2(size, reasonable_size); -+ } -+ return result; -+} -+ -+extern "C" void Fetch32PFI(); -+extern "C" void Fetch32Resume(); -+extern "C" void FetchNPFI(); -+extern "C" void FetchNResume(); -+ -+inline static bool checkPrefetch(sigcontext* uc, address pc) { -+ if (pc == (address) Fetch32PFI) { -+ set_cont_address(uc, address(Fetch32Resume)); -+ return true; -+ } -+ if (pc == (address) FetchNPFI) { -+ set_cont_address(uc, address(FetchNResume)); -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkOverflow(sigcontext* uc, -+ address pc, -+ address addr, -+ JavaThread* thread, -+ address* stub) { -+ // check if fault address is within thread stack -+ if (addr < thread->stack_base() && -+ addr >= thread->stack_base() - thread->stack_size()) { -+ // stack overflow -+ if (thread->in_stack_yellow_zone(addr)) { -+ thread->disable_stack_yellow_zone(); -+ if (thread->thread_state() == _thread_in_Java) { -+ // Throw a stack overflow exception. Guard pages will be reenabled -+ // while unwinding the stack. -+ *stub = -+ SharedRuntime::continuation_for_implicit_exception(thread, -+ pc, -+ SharedRuntime::STACK_OVERFLOW); -+ } else { -+ // Thread was in the vm or native code. Return and try to finish. -+ return true; -+ } -+ } else if (thread->in_stack_red_zone(addr)) { -+ // Fatal red zone violation. Disable the guard pages and fall through -+ // to handle_unexpected_exception way down below. -+ thread->disable_stack_red_zone(); -+ tty->print_raw_cr("An irrecoverable stack overflow has occurred."); -+ } else { -+ // Accessing stack address below sp may cause SEGV if current -+ // thread has MAP_GROWSDOWN stack. This should only happen when -+ // current thread was created by user code with MAP_GROWSDOWN flag -+ // and then attached to VM. See notes in os_linux.cpp. -+ if (thread->osthread()->expanding_stack() == 0) { -+ thread->osthread()->set_expanding_stack(); -+ if (os::Linux::manually_expand_stack(thread, addr)) { -+ thread->osthread()->clear_expanding_stack(); -+ return true; -+ } -+ thread->osthread()->clear_expanding_stack(); -+ } else { -+ fatal("recursive segv. expanding stack."); -+ } -+ } -+ } -+ return false; -+} -+ -+inline static bool checkPollingPage(address pc, address fault, address* stub) { -+ if (fault == os::get_polling_page()) { -+ *stub = SharedRuntime::get_poll_stub(pc); -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkByteBuffer(address pc, address* stub) { -+ // BugId 4454115: A read from a MappedByteBuffer can fault -+ // here if the underlying file has been truncated. -+ // Do not crash the VM in such a case. -+ CodeBlob* cb = CodeCache::find_blob_unsafe(pc); -+ nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL; -+ if (nm != NULL && nm->has_unsafe_access()) { -+ *stub = StubRoutines::handler_for_unsafe_access(); -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkVerifyOops(address pc, address fault, address* stub) { -+ if (pc >= MacroAssembler::_verify_oop_implicit_branch[0] -+ && pc < MacroAssembler::_verify_oop_implicit_branch[1] ) { -+ *stub = MacroAssembler::_verify_oop_implicit_branch[2]; -+ warning("fixed up memory fault in +VerifyOops at address " -+ INTPTR_FORMAT, fault); -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkFPFault(address pc, int code, -+ JavaThread* thread, address* stub) { -+ if (code == FPE_INTDIV || code == FPE_FLTDIV) { -+ *stub = -+ SharedRuntime:: -+ continuation_for_implicit_exception(thread, -+ pc, -+ SharedRuntime::IMPLICIT_DIVIDE_BY_ZERO); -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkNullPointer(address pc, intptr_t fault, -+ JavaThread* thread, address* stub) { -+ if (!MacroAssembler::needs_explicit_null_check(fault)) { -+ // Determination of interpreter/vtable stub/compiled code null -+ // exception -+ *stub = -+ SharedRuntime:: -+ continuation_for_implicit_exception(thread, pc, -+ SharedRuntime::IMPLICIT_NULL); -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkFastJNIAccess(address pc, address* stub) { -+ address addr = JNI_FastGetField::find_slowcase_pc(pc); -+ if (addr != (address)-1) { -+ *stub = addr; -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkSerializePage(JavaThread* thread, address addr) { -+ return os::is_memory_serialize_page(thread, addr); -+} -+ -+inline static bool checkZombie(sigcontext* uc, address* pc, address* stub) { -+ if (nativeInstruction_at(*pc)->is_zombie()) { -+ // zombie method (ld [%g0],%o7 instruction) -+ *stub = SharedRuntime::get_handle_wrong_method_stub(); -+ -+ // At the stub it needs to look like a call from the caller of this -+ // method (not a call from the segv site). -+ *pc = (address)SIG_REGS(uc).u_regs[CON_O7]; -+ return true; -+ } -+ return false; -+} -+ -+inline static bool checkICMiss(sigcontext* uc, address* pc, address* stub) { -+#ifdef COMPILER2 -+ if (nativeInstruction_at(*pc)->is_ic_miss_trap()) { -+#ifdef ASSERT -+#ifdef TIERED -+ CodeBlob* cb = CodeCache::find_blob_unsafe(pc); -+ assert(cb->is_compiled_by_c2(), "Wrong compiler"); -+#endif // TIERED -+#endif // ASSERT -+ // Inline cache missed and user trap "Tne G0+ST_RESERVED_FOR_USER_0+2" taken. -+ *stub = SharedRuntime::get_ic_miss_stub(); -+ // At the stub it needs to look like a call from the caller of this -+ // method (not a call from the segv site). -+ *pc = (address)SIG_REGS(uc).u_regs[CON_O7]; -+ return true; -+ } -+#endif // COMPILER2 -+ return false; -+} -+ -+extern "C" int -+JVM_handle_linux_signal(int sig, -+ siginfo_t* info, -+ void* ucVoid, -+ int abort_if_unrecognized) { -+ // in fact this isn't ucontext_t* at all, but struct sigcontext* -+ // but Linux porting layer uses ucontext_t, so to minimize code change -+ // we cast as needed -+ ucontext_t* ucFake = (ucontext_t*) ucVoid; -+ sigcontext* uc = (sigcontext*)ucVoid; -+ -+ Thread* t = ThreadLocalStorage::get_thread_slow(); -+ -+ SignalHandlerMark shm(t); -+ -+ // Note: it's not uncommon that JNI code uses signal/sigset to install -+ // then restore certain signal handler (e.g. to temporarily block SIGPIPE, -+ // or have a SIGILL handler when detecting CPU type). When that happens, -+ // JVM_handle_linux_signal() might be invoked with junk info/ucVoid. To -+ // avoid unnecessary crash when libjsig is not preloaded, try handle signals -+ // that do not require siginfo/ucontext first. -+ -+ if (sig == SIGPIPE || sig == SIGXFSZ) { -+ // allow chained handler to go first -+ if (os::Linux::chained_handler(sig, info, ucVoid)) { -+ return true; -+ } else { -+ if (PrintMiscellaneous && (WizardMode || Verbose)) { -+ char buf[64]; -+ warning("Ignoring %s - see bugs 4229104 or 646499219", -+ os::exception_name(sig, buf, sizeof(buf))); -+ } -+ return true; -+ } -+ } -+ -+ JavaThread* thread = NULL; -+ VMThread* vmthread = NULL; -+ if (os::Linux::signal_handlers_are_installed) { -+ if (t != NULL ){ -+ if(t->is_Java_thread()) { -+ thread = (JavaThread*)t; -+ } -+ else if(t->is_VM_thread()){ -+ vmthread = (VMThread *)t; -+ } -+ } -+ } -+ -+ // decide if this trap can be handled by a stub -+ address stub = NULL; -+ address pc = NULL; -+ address npc = NULL; -+ -+ //%note os_trap_1 -+ if (info != NULL && uc != NULL && thread != NULL) { -+ pc = address(SIG_PC(uc)); -+ npc = address(SIG_NPC(uc)); -+ -+ // Check to see if we caught the safepoint code in the -+ // process of write protecting the memory serialization page. -+ // It write enables the page immediately after protecting it -+ // so we can just return to retry the write. -+ if ((sig == SIGSEGV) && checkSerializePage(thread, (address)info->si_addr)) { -+ // Block current thread until the memory serialize page permission restored. -+ os::block_on_serialize_page_trap(); -+ return 1; -+ } -+ -+ if (checkPrefetch(uc, pc)) { -+ return 1; -+ } -+ -+ // Handle ALL stack overflow variations here -+ if (sig == SIGSEGV) { -+ if (checkOverflow(uc, pc, (address)info->si_addr, thread, &stub)) { -+ return 1; -+ } -+ } -+ -+ if (sig == SIGBUS && -+ thread->thread_state() == _thread_in_vm && -+ thread->doing_unsafe_access()) { -+ stub = StubRoutines::handler_for_unsafe_access(); -+ } -+ -+ if (thread->thread_state() == _thread_in_Java) { -+ do { -+ // Java thread running in Java code => find exception handler if any -+ // a fault inside compiled code, the interpreter, or a stub -+ -+ if ((sig == SIGSEGV) && checkPollingPage(pc, (address)info->si_addr, &stub)) { -+ break; -+ } -+ -+ if ((sig == SIGBUS) && checkByteBuffer(pc, &stub)) { -+ break; -+ } -+ -+ if ((sig == SIGSEGV || sig == SIGBUS) && -+ checkVerifyOops(pc, (address)info->si_addr, &stub)) { -+ break; -+ } -+ -+ if ((sig == SIGSEGV) && checkZombie(uc, &pc, &stub)) { -+ break; -+ } -+ -+ if ((sig == SIGILL) && checkICMiss(uc, &pc, &stub)) { -+ break; -+ } -+ -+ if ((sig == SIGFPE) && checkFPFault(pc, info->si_code, thread, &stub)) { -+ break; -+ } -+ -+ if ((sig == SIGSEGV) && -+ checkNullPointer(pc, (intptr_t)info->si_addr, thread, &stub)) { -+ break; -+ } -+ } while (0); -+ -+ // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in -+ // and the heap gets shrunk before the field access. -+ if ((sig == SIGSEGV) || (sig == SIGBUS)) { -+ checkFastJNIAccess(pc, &stub); -+ } -+ } -+ -+ if (stub != NULL) { -+ // save all thread context in case we need to restore it -+ thread->set_saved_exception_pc(pc); -+ thread->set_saved_exception_npc(npc); -+ set_cont_address(uc, stub); -+ return true; -+ } -+ } -+ -+ // signal-chaining -+ if (os::Linux::chained_handler(sig, info, ucVoid)) { -+ return true; -+ } -+ -+ if (!abort_if_unrecognized) { -+ // caller wants another chance, so give it to him -+ return false; -+ } -+ -+ if (pc == NULL && uc != NULL) { -+ pc = os::Linux::ucontext_get_pc((ucontext_t*)uc); -+ } -+ -+ // unmask current signal -+ sigset_t newset; -+ sigemptyset(&newset); -+ sigaddset(&newset, sig); -+ sigprocmask(SIG_UNBLOCK, &newset, NULL); -+ -+ VMError err(t, sig, pc, info, ucVoid); -+ err.report_and_die(); -+ -+ ShouldNotReachHere(); -+} -+ -+void os::Linux::init_thread_fpu_state(void) { -+ // Nothing to do -+} -+ -+int os::Linux::get_fpu_control_word() { -+ return 0; -+} -+ -+void os::Linux::set_fpu_control_word(int fpu) { -+ // nothing -+} -+ -+bool os::is_allocatable(size_t bytes) { -+#ifdef _LP64 -+ return true; -+#else -+ if (bytes < 2 * G) { -+ return true; -+ } -+ -+ char* addr = reserve_memory(bytes, NULL); -+ -+ if (addr != NULL) { -+ release_memory(addr, bytes); -+ } -+ -+ return addr != NULL; -+#endif // _LP64 -+} -+ -+/////////////////////////////////////////////////////////////////////////////// -+// thread stack -+ -+size_t os::Linux::min_stack_allowed = 128 * K; -+ -+// pthread on Ubuntu is always in floating stack mode -+bool os::Linux::supports_variable_stack_size() { return true; } -+ -+// return default stack size for thr_type -+size_t os::Linux::default_stack_size(os::ThreadType thr_type) { -+ // default stack size (compiler thread needs larger stack) -+ size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M); -+ return s; -+} -+ -+size_t os::Linux::default_guard_size(os::ThreadType thr_type) { -+ // Creating guard page is very expensive. Java thread has HotSpot -+ // guard page, only enable glibc guard page for non-Java threads. -+ return (thr_type == java_thread ? 0 : page_size()); -+} -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,46 @@ -+/* -+ * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+ // -+ // NOTE: we are back in class os here, not Linux -+ // -+ static jint (*atomic_xchg_func) (jint, volatile jint*); -+ static jint (*atomic_cmpxchg_func) (jint, volatile jint*, jint); -+ static jlong (*atomic_cmpxchg_long_func)(jlong, volatile jlong*, jlong); -+ static jint (*atomic_add_func) (jint, volatile jint*); -+ static void (*fence_func) (); -+ -+ static jint atomic_xchg_bootstrap (jint, volatile jint*); -+ static jint atomic_cmpxchg_bootstrap (jint, volatile jint*, jint); -+ static jlong atomic_cmpxchg_long_bootstrap(jlong, volatile jlong*, jlong); -+ static jint atomic_add_bootstrap (jint, volatile jint*); -+ static void fence_bootstrap (); -+ -+ static void setup_fpu() {} -+ -+ static bool is_allocatable(size_t bytes); -+ -+ // Used to register dynamic code cache area with the OS -+ // Note: Currently only used in 64 bit Windows implementations -+ static bool register_code_area(char *low, char *high) { return true; } ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,40 @@ -+/* -+ * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+#if defined(COMPILER2) || defined(_LP64) -+ -+inline void Prefetch::read(void *loc, intx interval) { -+ __asm__ volatile("prefetch [%0+%1], 0" : : "r" (loc), "r" (interval) : "memory" ); -+} -+ -+inline void Prefetch::write(void *loc, intx interval) { -+ __asm__ volatile("prefetch [%0+%1], 2" : : "r" (loc), "r" (interval) : "memory" ); -+} -+ -+#else -+ -+inline void Prefetch::read (void *loc, intx interval) {} -+inline void Prefetch::write(void *loc, intx interval) {} -+ -+#endif ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,37 @@ -+/* -+ * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+#include "incls/_precompiled.incl" -+#include "incls/_threadLS_linux_sparc.cpp.incl" -+ -+void ThreadLocalStorage::generate_code_for_get_thread() { -+} -+ -+void ThreadLocalStorage::pd_init() { -+ // Nothing to do -+} -+ -+void ThreadLocalStorage::pd_set_thread(Thread* thread) { -+ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread); -+} ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,28 @@ -+/* -+ * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+public: -+ static Thread* thread() { -+ return (Thread*) os::thread_local_storage_at(thread_index()); -+ } ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,107 @@ -+/* -+ * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+#include "incls/_precompiled.incl" -+#include "incls/_thread_linux_sparc.cpp.incl" -+ -+// For Forte Analyzer AsyncGetCallTrace profiling support - thread is -+// currently interrupted by SIGPROF -+bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr, -+ void* ucontext, -+ bool isInJava) { -+ assert(Thread::current() == this, "caller must be current thread"); -+ assert(this->is_Java_thread(), "must be JavaThread"); -+ -+ JavaThread* jt = (JavaThread *)this; -+ -+ if (!isInJava) { -+ // make_walkable flushes register windows and grabs last_Java_pc -+ // which can not be done if the ucontext sp matches last_Java_sp -+ // stack walking utilities assume last_Java_pc set if marked flushed -+ jt->frame_anchor()->make_walkable(jt); -+ } -+ -+ // If we have a walkable last_Java_frame, then we should use it -+ // even if isInJava == true. It should be more reliable than -+ // ucontext info. -+ if (jt->has_last_Java_frame() && jt->frame_anchor()->walkable()) { -+ *fr_addr = jt->pd_last_frame(); -+ return true; -+ } -+ -+ ucontext_t* uc = (ucontext_t*) ucontext; -+ -+ // At this point, we don't have a walkable last_Java_frame, so -+ // we try to glean some information out of the ucontext. -+ intptr_t* ret_sp; -+ ExtendedPC addr = -+ os::fetch_frame_from_context(uc, &ret_sp, -+ NULL /* ret_fp only used on X86 */); -+ if (addr.pc() == NULL || ret_sp == NULL) { -+ // ucontext wasn't useful -+ return false; -+ } -+ -+ // we were running Java code when SIGPROF came in -+ if (isInJava) { -+ // If we have a last_Java_sp, then the SIGPROF signal caught us -+ // right when we were transitioning from _thread_in_Java to a new -+ // JavaThreadState. We use last_Java_sp instead of the sp from -+ // the ucontext since it should be more reliable. -+ if (jt->has_last_Java_frame()) { -+ ret_sp = jt->last_Java_sp(); -+ } -+ // Implied else: we don't have a last_Java_sp so we use what we -+ // got from the ucontext. -+ -+ frame ret_frame(ret_sp, frame::unpatchable, addr.pc()); -+ if (!ret_frame.safe_for_sender(jt)) { -+ // nothing else to try if the frame isn't good -+ return false; -+ } -+ *fr_addr = ret_frame; -+ return true; -+ } -+ -+ // At this point, we know we weren't running Java code. We might -+ // have a last_Java_sp, but we don't have a walkable frame. -+ // However, we might still be able to construct something useful -+ // if the thread was running native code. -+ if (jt->has_last_Java_frame()) { -+ assert(!jt->frame_anchor()->walkable(), "case covered above"); -+ -+ if (jt->thread_state() == _thread_in_native) { -+ frame ret_frame(jt->last_Java_sp(), frame::unpatchable, addr.pc()); -+ if (!ret_frame.safe_for_sender(jt)) { -+ // nothing else to try if the frame isn't good -+ return false; -+ } -+ *fr_addr = ret_frame; -+ return true; -+ } -+ } -+ -+ // nothing else to try -+ return false; -+} ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,98 @@ -+/* -+ * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+private: -+ -+ void pd_initialize() { -+ _anchor.clear(); -+ _base_of_stack_pointer = NULL; -+ } -+ -+ frame pd_last_frame() { -+ assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); -+ assert(_anchor.walkable(), "thread has not dumped its register windows yet"); -+ -+ assert(_anchor.last_Java_pc() != NULL, "Ack no pc!"); -+ return frame(last_Java_sp(), frame::unpatchable, _anchor.last_Java_pc()); -+ } -+ -+ // Sometimes the trap handler needs to record both PC and NPC. -+ // This is a SPARC-specific companion to Thread::set_saved_exception_pc. -+ address _saved_exception_npc; -+ -+ // In polling_page_safepoint_handler_blob(s) we have to tail call other -+ // blobs without blowing any registers. A tail call requires some -+ // register to jump with and we can't blow any registers, so it must -+ // be restored in the delay slot. 'restore' cannot be used as it -+ // will chop the heads off of 64-bit %o registers in the 32-bit -+ // build. Instead we reload the registers using G2_thread and this -+ // location. Must be 64bits in the 32-bit LION build. -+ jdouble _o_reg_temps[6]; -+ -+ // a stack pointer older than any java frame stack pointer. It is -+ // used to validate stack pointers in frame::next_younger_sp (it -+ // provides the upper bound in the range check). This is necessary -+ // on Solaris/SPARC since the ucontext passed to a signal handler is -+ // sometimes corrupt and we need a way to check the extracted sp. -+ intptr_t* _base_of_stack_pointer; -+ -+public: -+ -+ static int o_reg_temps_offset_in_bytes() { return offset_of(JavaThread, _o_reg_temps); } -+ -+#ifndef _LP64 -+ address o_reg_temps(int i) { return (address)&_o_reg_temps[i]; } -+#endif -+ -+ static int saved_exception_npc_offset_in_bytes() { return offset_of(JavaThread,_saved_exception_npc); } -+ -+ address saved_exception_npc() { return _saved_exception_npc; } -+ void set_saved_exception_npc(address a) { _saved_exception_npc = a; } -+ -+ -+public: -+ -+ intptr_t* base_of_stack_pointer() { return _base_of_stack_pointer; } -+ -+ void set_base_of_stack_pointer(intptr_t* base_sp) { -+ _base_of_stack_pointer = base_sp; -+ } -+ -+ void record_base_of_stack_pointer() { -+ intptr_t *sp = (intptr_t *)(((intptr_t)StubRoutines::Sparc::flush_callers_register_windows_func()())); -+ intptr_t *ysp; -+ while((ysp = (intptr_t*)sp[FP->sp_offset_in_saved_window()]) != NULL) { -+ sp = (intptr_t *)((intptr_t)ysp + STACK_BIAS); -+ } -+ _base_of_stack_pointer = sp; -+ } -+ -+ bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, -+ bool isInJava); -+ -+ // These routines are only used on cpu architectures that -+ // have separate register stacks (Itanium). -+ static bool register_stack_overflow() { return false; } -+ static void enable_register_stack_guard() {} -+ static void disable_register_stack_guard() {} ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,69 @@ -+/* -+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+// These are the OS and CPU-specific fields, types and integer -+// constants required by the Serviceability Agent. This file is -+// referenced by vmStructs.cpp. -+ -+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \ -+ \ -+ /******************************/ \ -+ /* Threads (NOTE: incomplete) */ \ -+ /******************************/ \ -+ \ -+ nonstatic_field(JavaThread, _base_of_stack_pointer, intptr_t*) \ -+ nonstatic_field(OSThread, _thread_id, pid_t) \ -+ nonstatic_field(OSThread, _pthread_id, pthread_t) \ -+ /* This must be the last entry, and must be present */ \ -+ last_entry() -+ -+ -+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \ -+ \ -+ /**********************/ \ -+ /* POSIX Thread IDs */ \ -+ /**********************/ \ -+ \ -+ declare_integer_type(pid_t) \ -+ declare_unsigned_integer_type(pthread_t) \ -+ \ -+ /* This must be the last entry, and must be present */ \ -+ last_entry() -+ -+ -+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ -+ \ -+ /************************/ \ -+ /* JavaThread constants */ \ -+ /************************/ \ -+ \ -+ declare_constant(JavaFrameAnchor::flushed) \ -+ \ -+ /* This must be the last entry, and must be present */ \ -+ last_entry() -+ -+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ -+ \ -+ /* This must be the last entry, and must be present */ \ -+ last_entry() ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp Thu Apr 24 15:07:57 2008 -0400 -@@ -0,0 +1,61 @@ -+/* -+ * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ */ -+ -+# include "incls/_precompiled.incl" -+# include "incls/_vm_version_linux_sparc.cpp.incl" -+ -+static bool detect_niagara() { -+ char cpu[128]; -+ bool rv = false; -+ -+ FILE* fp = fopen("/proc/cpuinfo", "r"); -+ if (fp == NULL) { -+ return rv; -+ } -+ -+ while (!feof(fp)) { -+ if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) { -+ if (strstr(cpu, "Niagara") != NULL) { -+ rv = true; -+ } -+ break; -+ } -+ } -+ -+ fclose(fp); -+ -+ return rv; -+} -+ -+int VM_Version::platform_features(int features) { -+ // Default to generic v9 -+ features = generic_v9_m; -+ -+ if (detect_niagara()) { -+ NOT_PRODUCT(if (PrintMiscellaneous && Verbose) tty->print_cr("Detected Linux on Niagara");) -+ features = niagara1_m; -+ } -+ -+ return features; -+} - -diff -urN openjdk/hotspot/build/linux/makefiles/sparc.make openjdk/hotspot/build/linux/makefiles/sparc.make ---- openjdk/hotspot/build/linux/makefiles/sparc.make 1970-01-01 00:00:00.000000000 +0000 -+++ openjdk/hotspot/build/linux/makefiles/sparc.make 2008-05-13 19:08:58.000000000 +0000 -@@ -0,0 +1,27 @@ -+# -+# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+# -+ -+# TLS helper, assembled from .s file -+# Not included in includeDB because it has no dependencies -+Obj_Files += linux_sparc.o ---- openjdk/hotspot/build/linux/makefiles/gcc.make.orig 2008-05-13 22:45:24.000000000 +0000 -+++ openjdk/hotspot/build/linux/makefiles/gcc.make 2008-05-13 22:46:34.000000000 +0000 -@@ -52,6 +52,10 @@ - PICFLAG = -fpic - endif - -+ifneq ($(filter sparc sparcv9,$(BUILDARCH)),) -+PICFLAG = -fPIC -+endif -+ - VM_PICFLAG/LIBJVM = $(PICFLAG) - VM_PICFLAG/AOUT = - ---- openjdk/hotspot/build/linux/makefiles/defs.make.orig 2008-05-14 10:39:14.000000000 +0000 -+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-05-14 15:18:21.000000000 +0000 -@@ -59,7 +59,7 @@ - endif - - # sparc --ifeq ($(ARCH), sparc64) -+ifneq (,$(filter $(ARCH), sparc sparc64)) - ifeq ($(ARCH_DATA_MODEL), 64) - ARCH_DATA_MODEL = 64 - MAKE_ARGS += LP64=1