# HG changeset patch
# User coleenp
# Date 1403315789 0
# Node ID fcef323870258f762a4d45282559d7e2a7b9b2dd
# Parent  fc25d8f6c4667ddf03db4acfd3c3b0244e7fbe11# Parent  0be2b9eb0a62998aa2e69e50c7ff8c0275c86a9d
Merge

diff -r 0be2b9eb0a62 -r fcef32387025 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Fri Jun 20 12:39:56 2014 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Sat Jun 21 01:56:29 2014 +0000
@@ -4022,6 +4022,11 @@
     this_klass->set_major_version(major_version);
     this_klass->set_has_default_methods(has_default_methods);
 
+    if (!host_klass.is_null()) {
+      assert (this_klass->is_anonymous(), "should be the same");
+      this_klass->set_host_klass(host_klass());
+    }
+
     // Set up Method*::intrinsic_id as soon as we know the names of methods.
     // (We used to do this lazily, but now we query it in Rewriter,
     // which is eagerly done for every method, so we might as well do it now,
diff -r 0be2b9eb0a62 -r fcef32387025 src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp	Fri Jun 20 12:39:56 2014 -0700
+++ b/src/share/vm/classfile/systemDictionary.cpp	Sat Jun 21 01:56:29 2014 +0000
@@ -997,7 +997,6 @@
 
   if (host_klass.not_null() && k.not_null()) {
     assert(EnableInvokeDynamic, "");
-    k->set_host_klass(host_klass());
     // If it's anonymous, initialize it now, since nobody else will.
 
     {