diff src/share/vm/oops/arrayKlass.hpp @ 20804:7848fc12602b

Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents eaf39a954227 8cb56c8cb30d
children
line wrap: on
line diff
--- a/src/share/vm/oops/arrayKlass.hpp	Tue Apr 07 11:20:51 2015 +0200
+++ b/src/share/vm/oops/arrayKlass.hpp	Tue Apr 07 14:58:49 2015 +0200
@@ -141,7 +141,7 @@
 
   // 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);
 
   // Printing
   void print_on(outputStream* st) const;