Mercurial > hg > truffle

changeset 20188:fcef32387025

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coleenp
date Sat, 21 Jun 2014 01:56:29 +0000
parents fc25d8f6c466 (diff) 0be2b9eb0a62 (current diff)
children 5d855d021755
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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.
 
     {