diff src/share/vm/oops/symbol.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 d9eed26d638a
line wrap: on
line diff
--- a/src/share/vm/oops/symbol.cpp	Tue Jun 18 14:23:29 2013 -0700
+++ b/src/share/vm/oops/symbol.cpp	Wed Jun 19 10:45:56 2013 +0200
@@ -55,7 +55,7 @@
   address res;
   int alloc_size = size(len)*HeapWordSize;
   res = (address) Metaspace::allocate(loader_data, size(len), true,
-                                      Metaspace::NonClassType, CHECK_NULL);
+                                      MetaspaceObj::SymbolType, CHECK_NULL);
   return res;
 }