Thu, 10 Jul 2014 16:01:11 -0700
Merge
1.1 --- a/.hgtags Mon Jul 07 13:12:15 2014 -0700 1.2 +++ b/.hgtags Thu Jul 10 16:01:11 2014 -0700 1.3 @@ -493,6 +493,8 @@ 1.4 4f18dea0312d601d0515976bc0c643ea7acc829d hs25.20-b20 1.5 9e4d27da4ac04c6e19291087f7c68a5c5803c7ca jdk8u20-b20 1.6 4828415ebbf11e205dcc08e97ad5ae7dd03522f9 jdk8u20-b21 1.7 +e4a6e7f1b90b85270aee1c54edaca3ef737082f1 hs25.20-b21 1.8 +f7429096a202cab5c36a0f20dea33c554026010f jdk8u20-b22 1.9 a4d44dfb7d30eea54bc172e4429a655454ae0bbf jdk8u25-b00 1.10 9a2152fbd929b0d8b2f5c326a5526214ae71731a jdk8u25-b01 1.11 d3d5604ea0dea3812e87ba76ac199d0a8be6f49f jdk8u25-b02
2.1 --- a/src/share/vm/classfile/classFileParser.cpp Mon Jul 07 13:12:15 2014 -0700 2.2 +++ b/src/share/vm/classfile/classFileParser.cpp Thu Jul 10 16:01:11 2014 -0700 2.3 @@ -4037,6 +4037,11 @@ 2.4 this_klass->set_major_version(major_version); 2.5 this_klass->set_has_default_methods(has_default_methods); 2.6 2.7 + if (!host_klass.is_null()) { 2.8 + assert (this_klass->is_anonymous(), "should be the same"); 2.9 + this_klass->set_host_klass(host_klass()); 2.10 + } 2.11 + 2.12 // Set up Method*::intrinsic_id as soon as we know the names of methods. 2.13 // (We used to do this lazily, but now we query it in Rewriter, 2.14 // which is eagerly done for every method, so we might as well do it now,
3.1 --- a/src/share/vm/classfile/classLoaderData.cpp Mon Jul 07 13:12:15 2014 -0700 3.2 +++ b/src/share/vm/classfile/classLoaderData.cpp Thu Jul 10 16:01:11 2014 -0700 3.3 @@ -531,6 +531,7 @@ 3.4 // GC root of class loader data created. 3.5 ClassLoaderData* ClassLoaderDataGraph::_head = NULL; 3.6 ClassLoaderData* ClassLoaderDataGraph::_unloading = NULL; 3.7 +ClassLoaderData* ClassLoaderDataGraph::_saved_unloading = NULL; 3.8 ClassLoaderData* ClassLoaderDataGraph::_saved_head = NULL; 3.9 3.10 bool ClassLoaderDataGraph::_should_purge = false; 3.11 @@ -628,7 +629,9 @@ 3.12 3.13 void ClassLoaderDataGraph::classes_unloading_do(void f(Klass* const)) { 3.14 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!"); 3.15 - for (ClassLoaderData* cld = _unloading; cld != NULL; cld = cld->next()) { 3.16 + // Only walk the head until any clds not purged from prior unloading 3.17 + // (CMS doesn't purge right away). 3.18 + for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) { 3.19 cld->classes_do(f); 3.20 } 3.21 } 3.22 @@ -676,6 +679,11 @@ 3.23 ClassLoaderData* data = _head; 3.24 ClassLoaderData* prev = NULL; 3.25 bool seen_dead_loader = false; 3.26 + 3.27 + // Save previous _unloading pointer for CMS which may add to unloading list before 3.28 + // purging and we don't want to rewalk the previously unloaded class loader data. 3.29 + _saved_unloading = _unloading; 3.30 + 3.31 // mark metadata seen on the stack and code cache so we can delete 3.32 // unneeded entries. 3.33 bool has_redefined_a_class = JvmtiExport::has_redefined_a_class();
4.1 --- a/src/share/vm/classfile/classLoaderData.hpp Mon Jul 07 13:12:15 2014 -0700 4.2 +++ b/src/share/vm/classfile/classLoaderData.hpp Thu Jul 10 16:01:11 2014 -0700 4.3 @@ -66,6 +66,7 @@ 4.4 static ClassLoaderData* _unloading; 4.5 // CMS support. 4.6 static ClassLoaderData* _saved_head; 4.7 + static ClassLoaderData* _saved_unloading; 4.8 static bool _should_purge; 4.9 4.10 static ClassLoaderData* add(Handle class_loader, bool anonymous, TRAPS);
5.1 --- a/src/share/vm/classfile/systemDictionary.cpp Mon Jul 07 13:12:15 2014 -0700 5.2 +++ b/src/share/vm/classfile/systemDictionary.cpp Thu Jul 10 16:01:11 2014 -0700 5.3 @@ -997,7 +997,6 @@ 5.4 5.5 if (host_klass.not_null() && k.not_null()) { 5.6 assert(EnableInvokeDynamic, ""); 5.7 - k->set_host_klass(host_klass()); 5.8 // If it's anonymous, initialize it now, since nobody else will. 5.9 5.10 {