diff src/share/vm/oops/instanceKlass.hpp @ 20383:14b8221771dc

Merge
author tschatzl
date Wed, 03 Sep 2014 09:25:44 +0200
parents 6e0cb14ce59b
children 90257dfad6e3
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.hpp	Wed Sep 03 09:24:07 2014 +0200
+++ b/src/share/vm/oops/instanceKlass.hpp	Wed Sep 03 09:25:44 2014 +0200
@@ -1004,6 +1004,13 @@
 
   u2 idnum_allocated_count() const      { return _idnum_allocated_count; }
 
+public:
+  void set_in_error_state() {
+    assert(DumpSharedSpaces, "only call this when dumping archive");
+    _init_state = initialization_error;
+  }
+  bool check_sharing_error_state();
+
 private:
   // initialization state
 #ifdef ASSERT
@@ -1062,7 +1069,7 @@
 public:
   // CDS support - remove and restore oops from metadata. Oops are not shared.
   virtual void remove_unshareable_info();
-  virtual void restore_unshareable_info(TRAPS);
+  virtual void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS);
 
   // jvm support
   jint compute_modifier_flags(TRAPS) const;