comparison 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
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
585 return false; 585 return false;
586 } 586 }
587 587
588 // validate ConstantPoolCache* 588 // validate ConstantPoolCache*
589 ConstantPoolCache* cp = *interpreter_frame_cache_addr(); 589 ConstantPoolCache* cp = *interpreter_frame_cache_addr();
590 if (cp == NULL || !cp->is_metadata()) return false; 590 if (cp == NULL || !cp->is_metaspace_object()) return false;
591 591
592 // validate locals 592 // validate locals
593 593
594 address locals = (address) *interpreter_frame_locals_addr(); 594 address locals = (address) *interpreter_frame_locals_addr();
595 595