Mercurial > hg > truffle

diff src/share/vm/classfile/javaClasses.hpp @ 17891:b6a2ba7d3ea7 hs25.20-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Thu, 17 Apr 2014 16:09:07 -0700
parents 9428a0b94204
children 52b4284cb496 27188ae8bbbb
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.hpp	Wed Apr 16 12:32:23 2014 -0700
+++ b/src/share/vm/classfile/javaClasses.hpp	Thu Apr 17 16:09:07 2014 -0700
@@ -246,11 +246,12 @@
 
   static void set_init_lock(oop java_class, oop init_lock);
   static void set_protection_domain(oop java_class, oop protection_domain);
+  static void initialize_mirror_fields(KlassHandle k, Handle mirror, Handle protection_domain, TRAPS);
  public:
   static void compute_offsets();
 
   // Instance creation
-  static oop  create_mirror(KlassHandle k, Handle protection_domain, TRAPS);
+  static void create_mirror(KlassHandle k, Handle protection_domain, TRAPS);
   static void fixup_mirror(KlassHandle k, TRAPS);
   static oop  create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS);
   // Conversion