diff src/cpu/x86/vm/frame_x86.cpp @ 11173:6b0fd0964b87

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 836a62f43af9 e0c9a1d29eb4
children 774e1c2f8741
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.cpp	Tue Jul 30 13:03:28 2013 -0700
+++ b/src/cpu/x86/vm/frame_x86.cpp	Wed Jul 31 11:00:54 2013 +0200
@@ -587,7 +587,7 @@
 
   // validate ConstantPoolCache*
   ConstantPoolCache* cp = *interpreter_frame_cache_addr();
-  if (cp == NULL || !cp->is_metadata()) return false;
+  if (cp == NULL || !cp->is_metaspace_object()) return false;
 
   // validate locals