Mercurial > hg > icedtea8-forest > hotspot
changeset 9562:9bad7d4825fb icedtea-3.6.0
Merge jdk8u151-b12
author | andrew |
---|---|
date | Mon, 30 Oct 2017 17:28:38 +0000 |
parents | f7ae197522b1 (current diff) 856e341587d5 (diff) |
children | d0f3d468da21 |
files | .hgtags THIRD_PARTY_README src/share/vm/interpreter/linkResolver.cpp src/share/vm/interpreter/linkResolver.hpp src/share/vm/runtime/arguments.cpp test/TEST.groups |
diffstat | 4 files changed, 63 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Feb 24 12:49:21 2014 +0100 +++ b/.hgtags Mon Oct 30 17:28:38 2017 +0000 @@ -1022,3 +1022,16 @@ 24ab92601b895b36ffc66e50e634cb962f8f6c1e icedtea-3.6.0pre00 ecaa25cbc662396ad7ea422bf43e23098af2100e icedtea-3.6.0pre01 542f4e30fdffc87e5e098d81d69e7aa52d3c763c icedtea-3.6.0pre02 +db36f4d498b1bde975700a800b5ce732941c04b7 jdk8u144-b01 +2d5100bddeb80cf767485b787fc3051311e3d7b9 jdk8u151-b00 +596b584c68b73ec635347807571463580deb955f jdk8u151-b01 +1f6f436360d5cd375b806aec1c78abb8fcb4e5f6 jdk8u151-b02 +0aaeb48ae39e4fc558caf1b0c7ee504a49fec441 jdk8u151-b03 +e48302d521d59c2fe62f874f1f5d34bc46517da7 jdk8u151-b04 +507af6ef977a5d0306a8723dec66e34befc1ae81 jdk8u151-b05 +e1dc36cddcbc36b78e3d0558f87bbf459191e479 jdk8u151-b06 +e2a930243efa63b0a789e85a523e69574d53ac92 jdk8u151-b07 +158904fa31b28f1e027dc5b5a833ee673e89a84b jdk8u151-b08 +8b0169692abbf8fb7972920cd79cee7dcab959c3 jdk8u151-b09 +e352e54382928eb8d5ec70455ef251973c332ccb jdk8u151-b10 +0f06584f52ffc8627b78f4d461a3eba2b703a8f7 jdk8u151-b11
--- a/THIRD_PARTY_README Mon Feb 24 12:49:21 2014 +0100 +++ b/THIRD_PARTY_README Mon Oct 30 17:28:38 2017 +0000 @@ -2808,12 +2808,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.8, which may be included +%% This notice is provided with respect to zlib v1.2.11, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.8, April 28th, 2013 + version 1.2.11, January 15th, 2017 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
--- a/src/share/vm/interpreter/linkResolver.cpp Mon Feb 24 12:49:21 2014 +0100 +++ b/src/share/vm/interpreter/linkResolver.cpp Mon Oct 30 17:28:38 2017 +0000 @@ -538,6 +538,42 @@ } } +void LinkResolver::check_method_loader_constraints(methodHandle& resolved_method, + KlassHandle resolved_klass, + Symbol* method_name, + Symbol* method_signature, + KlassHandle current_klass, + const char* method_type, TRAPS) { + Handle loader (THREAD, InstanceKlass::cast(current_klass())->class_loader()); + Handle class_loader (THREAD, resolved_method->method_holder()->class_loader()); + { + ResourceMark rm(THREAD); + Symbol* failed_type_symbol = + SystemDictionary::check_signature_loaders(method_signature, loader, + class_loader, true, CHECK); + if (failed_type_symbol != NULL) { + const char* msg = "loader constraint violation: when resolving %s" + " \"%s\" the class loader (instance of %s) of the current class, %s," + " and the class loader (instance of %s) for the method's defining class, %s, have" + " different Class objects for the type %s used in the signature"; + char* sig = Method::name_and_sig_as_C_string(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()); + char* target = InstanceKlass::cast(resolved_method->method_holder()) + ->name()->as_C_string(); + char* failed_type_name = failed_type_symbol->as_C_string(); + size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + + strlen(current) + strlen(loader2) + strlen(target) + + strlen(failed_type_name) + strlen(method_type) + 1; + char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); + jio_snprintf(buf, buflen, msg, method_type, sig, loader1, current, loader2, + target, failed_type_name); + THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); + } + } +} + void LinkResolver::resolve_method(methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, @@ -594,34 +630,8 @@ CHECK); // check loader constraints - Handle loader (THREAD, InstanceKlass::cast(current_klass())->class_loader()); - Handle class_loader (THREAD, resolved_method->method_holder()->class_loader()); - { - ResourceMark rm(THREAD); - Symbol* failed_type_symbol = - SystemDictionary::check_signature_loaders(method_signature, loader, - class_loader, true, CHECK); - if (failed_type_symbol != NULL) { - const char* msg = "loader constraint violation: when resolving method" - " \"%s\" the class loader (instance of %s) of the current class, %s," - " and the class loader (instance of %s) for the method's defining class, %s, have" - " different Class objects for the type %s used in the signature"; - char* sig = Method::name_and_sig_as_C_string(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()); - char* target = InstanceKlass::cast(resolved_method->method_holder()) - ->name()->as_C_string(); - char* failed_type_name = failed_type_symbol->as_C_string(); - size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + - strlen(current) + strlen(loader2) + strlen(target) + - strlen(failed_type_name) + 1; - char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); - jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, - target, failed_type_name); - THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); - } - } + check_method_loader_constraints(resolved_method, resolved_klass, method_name, + method_signature, current_klass, "method", CHECK); } } @@ -670,36 +680,8 @@ resolved_method, CHECK); - HandleMark hm(THREAD); - Handle loader (THREAD, InstanceKlass::cast(current_klass())->class_loader()); - Handle class_loader (THREAD, resolved_method->method_holder()->class_loader()); - { - ResourceMark rm(THREAD); - Symbol* failed_type_symbol = - SystemDictionary::check_signature_loaders(method_signature, loader, - class_loader, true, CHECK); - if (failed_type_symbol != NULL) { - const char* msg = "loader constraint violation: when resolving " - "interface method \"%s\" the class loader (instance of %s) of the " - "current class, %s, and the class loader (instance of %s) for " - "the method's defining class, %s, have different Class objects for the type %s " - "used in the signature"; - char* sig = Method::name_and_sig_as_C_string(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()); - char* target = InstanceKlass::cast(resolved_method->method_holder()) - ->name()->as_C_string(); - char* failed_type_name = failed_type_symbol->as_C_string(); - size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + - strlen(current) + strlen(loader2) + strlen(target) + - strlen(failed_type_name) + 1; - char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); - jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, - target, failed_type_name); - THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); - } - } + check_method_loader_constraints(resolved_method, resolved_klass, method_name, + method_signature, current_klass, "interface method", CHECK); } if (nostatics && resolved_method->is_static()) { @@ -1049,6 +1031,10 @@ Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); + } else if (sel_method() != resolved_method()) { + check_method_loader_constraints(sel_method, resolved_klass, + sel_method->name(), sel_method->signature(), + current_klass, "method", CHECK); } }
--- a/src/share/vm/interpreter/linkResolver.hpp Mon Feb 24 12:49:21 2014 +0100 +++ b/src/share/vm/interpreter/linkResolver.hpp Mon Oct 30 17:28:38 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,9 @@ 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, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool nostatics, TRAPS); + static void check_method_loader_constraints(methodHandle& resolved_method, KlassHandle resolved_klass, + Symbol* method_name, Symbol* method_signature, + KlassHandle current_klass, const char* method_type, TRAPS); static void resolve_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool require_methodref, 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);