diff src/share/vm/ci/ciInstanceKlass.cpp @ 13086:096c224171c4

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 20 Nov 2013 00:10:38 +0100
parents cefad50507d8 4d3575d37a07
children 52b4284cb496
line wrap: on
line diff
--- a/src/share/vm/ci/ciInstanceKlass.cpp	Tue Nov 19 17:44:26 2013 +0100
+++ b/src/share/vm/ci/ciInstanceKlass.cpp	Wed Nov 20 00:10:38 2013 +0100
@@ -57,6 +57,7 @@
   _init_state = ik->init_state();
   _nonstatic_field_size = ik->nonstatic_field_size();
   _has_nonstatic_fields = ik->has_nonstatic_fields();
+  _has_default_methods = ik->has_default_methods();
   _nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields:
 
   _implementor = NULL; // we will fill these lazily
@@ -671,7 +672,6 @@
 
 
 void ciInstanceKlass::dump_replay_data(outputStream* out) {
-  ASSERT_IN_VM;
   ResourceMark rm;
 
   InstanceKlass* ik = get_instanceKlass();