aboutsummaryrefslogtreecommitdiffstats
path: root/hotspot
diff options
context:
space:
mode:
authorIvan Dubrov <idubrov@guidewire.com>2016-04-06 12:04:53 -0700
committerIvan Dubrov <idubrov@guidewire.com>2016-04-06 12:04:53 -0700
commit43433a1c1daab40c6e498ebf0321ac96ddb330d2 (patch)
tree9454864ad1d3ecb3d63df7eeb4bee1ad9d34a9d0 /hotspot
parente278cb949c512228d3177759be9ee39c3235e324 (diff)
downloaddcevm-43433a1c1daab40c6e498ebf0321ac96ddb330d2.tar.gz
dcevm-43433a1c1daab40c6e498ebf0321ac96ddb330d2.zip
Updating component_mirror during redefinition
Diffstat (limited to 'hotspot')
-rw-r--r--hotspot/.hg/patches/light-jdk8u66-b17.patch217
1 files changed, 109 insertions, 108 deletions
diff --git a/hotspot/.hg/patches/light-jdk8u66-b17.patch b/hotspot/.hg/patches/light-jdk8u66-b17.patch
index 6bb80c54..588a30f4 100644
--- a/hotspot/.hg/patches/light-jdk8u66-b17.patch
+++ b/hotspot/.hg/patches/light-jdk8u66-b17.patch
@@ -1,9 +1,9 @@
# HG changeset patch
-# Parent 5befc082356f5775b55f07434c2ad0e498289767
+# Parent 922768e787073779cd5b1dd57bfb615508817c99
-diff -r 5befc082356f src/share/vm/ci/ciObjectFactory.cpp
---- a/src/share/vm/ci/ciObjectFactory.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/ci/ciObjectFactory.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/ci/ciObjectFactory.cpp
+--- a/src/share/vm/ci/ciObjectFactory.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/ci/ciObjectFactory.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -799,3 +799,27 @@
_unloaded_instances->length(),
_unloaded_klasses->length());
@@ -32,9 +32,9 @@ diff -r 5befc082356f src/share/vm/ci/ciObjectFactory.cpp
+#endif // ASSERT
+}
+
-diff -r 5befc082356f src/share/vm/ci/ciObjectFactory.hpp
---- a/src/share/vm/ci/ciObjectFactory.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/ci/ciObjectFactory.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/ci/ciObjectFactory.hpp
+--- a/src/share/vm/ci/ciObjectFactory.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/ci/ciObjectFactory.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -92,6 +92,7 @@
ciInstance* get_unloaded_instance(ciInstanceKlass* klass);
@@ -52,9 +52,9 @@ diff -r 5befc082356f src/share/vm/ci/ciObjectFactory.hpp
};
#endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP
-diff -r 5befc082356f src/share/vm/classfile/classFileParser.cpp
---- a/src/share/vm/classfile/classFileParser.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/classFileParser.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/classFileParser.cpp
+--- a/src/share/vm/classfile/classFileParser.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/classFileParser.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -763,6 +763,7 @@
Array<Klass*>* ClassFileParser::parse_interfaces(int length,
Handle protection_domain,
@@ -226,9 +226,9 @@ diff -r 5befc082356f src/share/vm/classfile/classFileParser.cpp
k->set_is_cloneable();
}
}
-diff -r 5befc082356f src/share/vm/classfile/classFileParser.hpp
---- a/src/share/vm/classfile/classFileParser.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/classFileParser.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/classFileParser.hpp
+--- a/src/share/vm/classfile/classFileParser.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/classFileParser.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -219,11 +219,12 @@
Array<Klass*>* parse_interfaces(int length,
Handle protection_domain,
@@ -274,9 +274,9 @@ diff -r 5befc082356f src/share/vm/classfile/classFileParser.hpp
TempNewSymbol& parsed_name,
bool verify,
TRAPS);
-diff -r 5befc082356f src/share/vm/classfile/classLoader.cpp
---- a/src/share/vm/classfile/classLoader.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/classLoader.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/classLoader.cpp
+--- a/src/share/vm/classfile/classLoader.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/classLoader.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -1124,6 +1124,7 @@
instanceKlassHandle result = parser.parseClassFile(h_name,
loader_data,
@@ -285,9 +285,9 @@ diff -r 5befc082356f src/share/vm/classfile/classLoader.cpp
parsed_name,
context.should_verify(classpath_index),
THREAD);
-diff -r 5befc082356f src/share/vm/classfile/dictionary.cpp
---- a/src/share/vm/classfile/dictionary.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/dictionary.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/dictionary.cpp
+--- a/src/share/vm/classfile/dictionary.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/dictionary.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -145,7 +145,7 @@
InstanceKlass* ik = InstanceKlass::cast(e);
@@ -357,9 +357,9 @@ diff -r 5befc082356f src/share/vm/classfile/dictionary.cpp
}
-diff -r 5befc082356f src/share/vm/classfile/dictionary.hpp
---- a/src/share/vm/classfile/dictionary.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/dictionary.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/dictionary.hpp
+--- a/src/share/vm/classfile/dictionary.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/dictionary.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -78,6 +78,10 @@
void add_klass(Symbol* class_name, ClassLoaderData* loader_data,KlassHandle obj);
@@ -383,9 +383,9 @@ diff -r 5befc082356f src/share/vm/classfile/dictionary.hpp
// Unload (that is, break root links to) all unmarked classes and loaders.
void do_unloading();
-diff -r 5befc082356f src/share/vm/classfile/javaClasses.cpp
---- a/src/share/vm/classfile/javaClasses.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/javaClasses.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/javaClasses.cpp
+--- a/src/share/vm/classfile/javaClasses.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/javaClasses.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -1712,6 +1712,8 @@
skip_throwableInit_check = true;
}
@@ -395,9 +395,9 @@ diff -r 5befc082356f src/share/vm/classfile/javaClasses.cpp
if (method->is_hidden()) {
if (skip_hidden) continue;
}
-diff -r 5befc082356f src/share/vm/classfile/loaderConstraints.cpp
---- a/src/share/vm/classfile/loaderConstraints.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/loaderConstraints.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/loaderConstraints.cpp
+--- a/src/share/vm/classfile/loaderConstraints.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/loaderConstraints.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -98,6 +98,19 @@
return pp;
}
@@ -427,9 +427,9 @@ diff -r 5befc082356f src/share/vm/classfile/loaderConstraints.cpp
} else {
// If we don't find the class in the system dictionary, it
// has to be in the placeholders table.
-diff -r 5befc082356f src/share/vm/classfile/loaderConstraints.hpp
---- a/src/share/vm/classfile/loaderConstraints.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/loaderConstraints.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/loaderConstraints.hpp
+--- a/src/share/vm/classfile/loaderConstraints.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/loaderConstraints.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -64,6 +64,9 @@
// Enhanced Class Redefinition support
void classes_do(KlassClosure* f);
@@ -440,9 +440,9 @@ diff -r 5befc082356f src/share/vm/classfile/loaderConstraints.hpp
// Check class loader constraints
bool add_entry(Symbol* name, Klass* klass1, Handle loader1,
Klass* klass2, Handle loader2);
-diff -r 5befc082356f src/share/vm/classfile/systemDictionary.cpp
---- a/src/share/vm/classfile/systemDictionary.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/systemDictionary.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/systemDictionary.cpp
+--- a/src/share/vm/classfile/systemDictionary.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/systemDictionary.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -182,6 +182,7 @@
// can return a null klass
klass = handle_resolution_exception(class_name, class_loader, protection_domain, throw_error, k_h, THREAD);
@@ -599,9 +599,9 @@ diff -r 5befc082356f src/share/vm/classfile/systemDictionary.cpp
linkage_error = "loader (instance of %s): attempted duplicate class "
"definition for name: \"%s\"";
} else {
-diff -r 5befc082356f src/share/vm/classfile/systemDictionary.hpp
---- a/src/share/vm/classfile/systemDictionary.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/systemDictionary.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/systemDictionary.hpp
+--- a/src/share/vm/classfile/systemDictionary.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/systemDictionary.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -284,7 +284,7 @@
// Resolve from stream (called by jni_DefineClass and JVM_DefineClass)
static Klass* resolve_from_stream(Symbol* class_name, Handle class_loader,
@@ -643,9 +643,9 @@ diff -r 5befc082356f src/share/vm/classfile/systemDictionary.hpp
static instanceKlassHandle find_or_define_instance_class(Symbol* class_name,
Handle class_loader,
instanceKlassHandle k, TRAPS);
-diff -r 5befc082356f src/share/vm/classfile/verifier.cpp
---- a/src/share/vm/classfile/verifier.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/verifier.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/verifier.cpp
+--- a/src/share/vm/classfile/verifier.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/verifier.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -189,7 +189,7 @@
Symbol* name = klass->name();
Klass* refl_magic_klass = SystemDictionary::reflect_MagicAccessorImpl_klass();
@@ -673,9 +673,9 @@ diff -r 5befc082356f src/share/vm/classfile/verifier.cpp
int num_methods = methods->length();
for (int index = 0; index < num_methods; index++) {
-diff -r 5befc082356f src/share/vm/classfile/verifier.hpp
---- a/src/share/vm/classfile/verifier.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/classfile/verifier.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/classfile/verifier.hpp
+--- a/src/share/vm/classfile/verifier.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/classfile/verifier.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -344,6 +344,7 @@
VerificationType object_type() const;
@@ -684,9 +684,9 @@ diff -r 5befc082356f src/share/vm/classfile/verifier.hpp
instanceKlassHandle _klass; // the class being verified
methodHandle _method; // current method being verified
VerificationType _this_type; // the verification type of the current class
-diff -r 5befc082356f src/share/vm/interpreter/linkResolver.cpp
---- a/src/share/vm/interpreter/linkResolver.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/interpreter/linkResolver.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/interpreter/linkResolver.cpp
+--- a/src/share/vm/interpreter/linkResolver.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/interpreter/linkResolver.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -215,8 +215,8 @@
// Klass resolution
@@ -725,9 +725,9 @@ diff -r 5befc082356f src/share/vm/interpreter/linkResolver.cpp
selected_method = methodHandle(THREAD, inst->method_at_vtable(vtable_index));
}
}
-diff -r 5befc082356f src/share/vm/memory/universe.cpp
---- a/src/share/vm/memory/universe.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/memory/universe.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/memory/universe.cpp
+--- a/src/share/vm/memory/universe.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/memory/universe.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -168,6 +168,43 @@
f(doubleArrayKlassObj());
}
@@ -772,9 +772,9 @@ diff -r 5befc082356f src/share/vm/memory/universe.cpp
void Universe::oops_do(OopClosure* f, bool do_all) {
f->do_oop((oop*) &_int_mirror);
-diff -r 5befc082356f src/share/vm/memory/universe.hpp
---- a/src/share/vm/memory/universe.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/memory/universe.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/memory/universe.hpp
+--- a/src/share/vm/memory/universe.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/memory/universe.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -415,6 +415,7 @@
static void run_finalizers_on_exit();
@@ -783,9 +783,9 @@ diff -r 5befc082356f src/share/vm/memory/universe.hpp
// Apply "f" to the addresses of all the direct heap pointers maintained
// as static fields of "Universe".
-diff -r 5befc082356f src/share/vm/oops/cpCache.cpp
---- a/src/share/vm/oops/cpCache.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/cpCache.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/cpCache.cpp
+--- a/src/share/vm/oops/cpCache.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/cpCache.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -338,7 +338,8 @@
if (has_appendix) {
const int appendix_index = f2_as_index() + _indy_resolved_references_appendix_offset;
@@ -844,9 +844,9 @@ diff -r 5befc082356f src/share/vm/oops/cpCache.cpp
#endif // INCLUDE_JVMTI
-diff -r 5befc082356f src/share/vm/oops/cpCache.hpp
---- a/src/share/vm/oops/cpCache.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/cpCache.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/cpCache.hpp
+--- a/src/share/vm/oops/cpCache.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/cpCache.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -178,6 +178,8 @@
tos_state_bits = 4,
tos_state_mask = right_n_bits(tos_state_bits),
@@ -894,9 +894,9 @@ diff -r 5befc082356f src/share/vm/oops/cpCache.hpp
#endif // INCLUDE_JVMTI
// Deallocate - no fields to deallocate
-diff -r 5befc082356f src/share/vm/oops/instanceKlass.cpp
---- a/src/share/vm/oops/instanceKlass.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/instanceKlass.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/instanceKlass.cpp
+--- a/src/share/vm/oops/instanceKlass.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/instanceKlass.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -729,7 +729,8 @@
}
#endif
@@ -1040,9 +1040,9 @@ diff -r 5befc082356f src/share/vm/oops/instanceKlass.cpp
} // end has_previous_version()
-diff -r 5befc082356f src/share/vm/oops/instanceKlass.hpp
---- a/src/share/vm/oops/instanceKlass.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/instanceKlass.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/instanceKlass.hpp
+--- a/src/share/vm/oops/instanceKlass.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/instanceKlass.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -139,6 +139,7 @@
friend class VMStructs;
friend class ClassFileParser;
@@ -1087,9 +1087,9 @@ diff -r 5befc082356f src/share/vm/oops/instanceKlass.hpp
void methods_do(void f(Method* method));
void array_klasses_do(void f(Klass* k));
void array_klasses_do(void f(Klass* k, TRAPS), TRAPS);
-diff -r 5befc082356f src/share/vm/oops/klass.cpp
---- a/src/share/vm/oops/klass.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/klass.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/klass.cpp
+--- a/src/share/vm/oops/klass.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/klass.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -186,6 +186,13 @@
set_next_link(NULL);
TRACE_INIT_ID(this);
@@ -1129,9 +1129,9 @@ diff -r 5befc082356f src/share/vm/oops/klass.cpp
bool Klass::is_loader_alive(BoolObjectClosure* is_alive) {
#ifdef ASSERT
// The class is alive iff the class loader is alive.
-diff -r 5befc082356f src/share/vm/oops/klass.hpp
---- a/src/share/vm/oops/klass.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/klass.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/klass.hpp
+--- a/src/share/vm/oops/klass.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/klass.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -149,6 +149,10 @@
oop _java_mirror;
// Superclass
@@ -1239,9 +1239,9 @@ diff -r 5befc082356f src/share/vm/oops/klass.hpp
// Compiler support
static ByteSize super_offset() { return in_ByteSize(offset_of(Klass, _super)); }
-diff -r 5befc082356f src/share/vm/oops/klassVtable.cpp
---- a/src/share/vm/oops/klassVtable.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/klassVtable.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/klassVtable.cpp
+--- a/src/share/vm/oops/klassVtable.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/klassVtable.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -1450,6 +1450,8 @@
void klassVtable::verify_against(outputStream* st, klassVtable* vt, int index) {
@@ -1271,9 +1271,9 @@ diff -r 5befc082356f src/share/vm/oops/klassVtable.cpp
}
}
-diff -r 5befc082356f src/share/vm/oops/method.cpp
---- a/src/share/vm/oops/method.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/method.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/method.cpp
+--- a/src/share/vm/oops/method.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/method.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -1208,6 +1208,8 @@
// Reset correct method/const method, method size, and parameter info
@@ -1294,9 +1294,9 @@ diff -r 5befc082356f src/share/vm/oops/method.cpp
ClassLoaderData* cld = loader_data;
if (!SafepointSynchronize::is_at_safepoint()) {
-diff -r 5befc082356f src/share/vm/oops/method.hpp
---- a/src/share/vm/oops/method.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/oops/method.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/oops/method.hpp
+--- a/src/share/vm/oops/method.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/oops/method.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -105,6 +105,10 @@
AccessFlags _access_flags; // Access flags
int _vtable_index; // vtable index of this method (see VtableIndexFlag)
@@ -1332,9 +1332,9 @@ diff -r 5befc082356f src/share/vm/oops/method.hpp
// signature
Symbol* signature() const { return constants()->symbol_at(signature_index()); }
int signature_index() const { return constMethod()->signature_index(); }
-diff -r 5befc082356f src/share/vm/prims/jni.cpp
---- a/src/share/vm/prims/jni.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/prims/jni.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/prims/jni.cpp
+--- a/src/share/vm/prims/jni.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/prims/jni.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -399,6 +399,7 @@
}
Klass* k = SystemDictionary::resolve_from_stream(class_name, class_loader,
@@ -1343,9 +1343,9 @@ diff -r 5befc082356f src/share/vm/prims/jni.cpp
CHECK_NULL);
if (TraceClassResolution && k != NULL) {
-diff -r 5befc082356f src/share/vm/prims/jvm.cpp
---- a/src/share/vm/prims/jvm.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/prims/jvm.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/prims/jvm.cpp
+--- a/src/share/vm/prims/jvm.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/prims/jvm.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -1029,6 +1029,7 @@
Klass* k = SystemDictionary::resolve_from_stream(class_name, class_loader,
protection_domain, &st,
@@ -1354,9 +1354,9 @@ diff -r 5befc082356f src/share/vm/prims/jvm.cpp
CHECK_NULL);
if (TraceClassResolution && k != NULL) {
-diff -r 5befc082356f src/share/vm/prims/jvmtiEnv.cpp
---- a/src/share/vm/prims/jvmtiEnv.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/prims/jvmtiEnv.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/prims/jvmtiEnv.cpp
+--- a/src/share/vm/prims/jvmtiEnv.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/prims/jvmtiEnv.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -43,6 +43,7 @@
#include "prims/jvmtiManageCapabilities.hpp"
#include "prims/jvmtiRawMonitor.hpp"
@@ -1402,9 +1402,9 @@ diff -r 5befc082356f src/share/vm/prims/jvmtiEnv.cpp
VM_RedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
VMThread::execute(&op);
return (op.check_error());
-diff -r 5befc082356f src/share/vm/prims/jvmtiExport.hpp
---- a/src/share/vm/prims/jvmtiExport.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/prims/jvmtiExport.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/prims/jvmtiExport.hpp
+--- a/src/share/vm/prims/jvmtiExport.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/prims/jvmtiExport.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -188,6 +188,7 @@
// systems as needed to relax invariant checks.
static bool _has_redefined_a_class;
@@ -1413,9 +1413,9 @@ diff -r 5befc082356f src/share/vm/prims/jvmtiExport.hpp
inline static void set_has_redefined_a_class() {
JVMTI_ONLY(_has_redefined_a_class = true;)
}
-diff -r 5befc082356f src/share/vm/prims/jvmtiImpl.cpp
---- a/src/share/vm/prims/jvmtiImpl.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/prims/jvmtiImpl.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/prims/jvmtiImpl.cpp
+--- a/src/share/vm/prims/jvmtiImpl.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/prims/jvmtiImpl.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -290,6 +290,11 @@
Symbol* m_name = _method->name();
Symbol* m_signature = _method->signature();
@@ -1428,10 +1428,10 @@ diff -r 5befc082356f src/share/vm/prims/jvmtiImpl.cpp
// search previous versions if they exist
PreviousVersionWalker pvw(thread, (InstanceKlass *)ikh());
for (PreviousVersionNode * pv_node = pvw.next_previous_version();
-diff -r 5befc082356f src/share/vm/prims/jvmtiRedefineClasses2.cpp
+diff -r 922768e78707 src/share/vm/prims/jvmtiRedefineClasses2.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp Wed Mar 02 15:00:42 2016 -0800
-@@ -0,0 +1,2111 @@
++++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp Wed Apr 06 12:04:16 2016 -0700
+@@ -0,0 +1,2112 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2747,6 +2747,7 @@ diff -r 5befc082356f src/share/vm/prims/jvmtiRedefineClasses2.cpp
+ // Also, set array klasses element klass.
+ cur->set_array_klasses(array_klasses);
+ ObjArrayKlass::cast(array_klasses)->set_element_klass(cur);
++ ArrayKlass::cast(array_klasses)->set_component_mirror(cur->java_mirror());
+ }
+
+ // Initialize the new class! Special static initialization that does not execute the
@@ -3543,9 +3544,9 @@ diff -r 5befc082356f src/share/vm/prims/jvmtiRedefineClasses2.cpp
+ transfer.transfer_registrations(old_klass, _deleted_methods, _deleted_methods_length);
+ transfer.transfer_registrations(old_klass, _matching_old_methods, _matching_methods_length);
+}
-diff -r 5befc082356f src/share/vm/prims/jvmtiRedefineClasses2.hpp
+diff -r 922768e78707 src/share/vm/prims/jvmtiRedefineClasses2.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/share/vm/prims/jvmtiRedefineClasses2.hpp Wed Mar 02 15:00:42 2016 -0800
++++ b/src/share/vm/prims/jvmtiRedefineClasses2.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -3706,9 +3707,9 @@ diff -r 5befc082356f src/share/vm/prims/jvmtiRedefineClasses2.hpp
+};
+
+#endif // SHARE_VM_PRIMS_JVMTIENHANCEDREDEFINECLASSES_HPP
-diff -r 5befc082356f src/share/vm/prims/methodHandles.cpp
---- a/src/share/vm/prims/methodHandles.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/prims/methodHandles.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/prims/methodHandles.cpp
+--- a/src/share/vm/prims/methodHandles.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/prims/methodHandles.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -173,7 +173,7 @@
return NULL;
}
@@ -3728,9 +3729,9 @@ diff -r 5befc082356f src/share/vm/prims/methodHandles.cpp
return mname();
} else {
// Redefinition caused this to fail. Return NULL (and an exception?)
-diff -r 5befc082356f src/share/vm/prims/methodHandles.hpp
---- a/src/share/vm/prims/methodHandles.hpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/prims/methodHandles.hpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/prims/methodHandles.hpp
+--- a/src/share/vm/prims/methodHandles.hpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/prims/methodHandles.hpp Wed Apr 06 12:04:16 2016 -0700
@@ -60,7 +60,7 @@
static Handle new_MemberName(TRAPS); // must be followed by init_MemberName
static oop init_MemberName(Handle mname_h, Handle target_h); // compute vmtarget/vmindex from target
@@ -3740,9 +3741,9 @@ diff -r 5befc082356f src/share/vm/prims/methodHandles.hpp
static int method_ref_kind(Method* m, bool do_dispatch_if_possible = true);
static int find_MemberNames(KlassHandle k, Symbol* name, Symbol* sig,
int mflags, KlassHandle caller,
-diff -r 5befc082356f src/share/vm/runtime/reflection.cpp
---- a/src/share/vm/runtime/reflection.cpp Wed Mar 02 13:33:01 2016 -0800
-+++ b/src/share/vm/runtime/reflection.cpp Wed Mar 02 15:00:42 2016 -0800
+diff -r 922768e78707 src/share/vm/runtime/reflection.cpp
+--- a/src/share/vm/runtime/reflection.cpp Tue Apr 05 11:28:40 2016 -0700
++++ b/src/share/vm/runtime/reflection.cpp Wed Apr 06 12:04:16 2016 -0700
@@ -520,6 +520,12 @@
AccessFlags access,
bool classloader_only,