diff src/share/vm/oops/constMethod.cpp @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents a1ebd310d5c1
children e0c9a1d29eb4
line wrap: on
line diff
--- a/src/share/vm/oops/constMethod.cpp	Tue Jun 18 14:23:29 2013 -0700
+++ b/src/share/vm/oops/constMethod.cpp	Wed Jun 19 10:45:56 2013 +0200
@@ -40,7 +40,7 @@
                                    MethodType method_type,
                                    TRAPS) {
   int size = ConstMethod::size(byte_code_size, sizes);
-  return new (loader_data, size, true, THREAD) ConstMethod(
+  return new (loader_data, size, true, MetaspaceObj::ConstMethodType, THREAD) ConstMethod(
       byte_code_size, sizes, method_type, size);
 }