comparison src/cpu/x86/vm/frame_x86.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents e522a00b91aa 59c790074993
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
537 // first the method 537 // first the method
538 538
539 Method* m = *interpreter_frame_method_addr(); 539 Method* m = *interpreter_frame_method_addr();
540 540
541 // validate the method we'd find in this potential sender 541 // validate the method we'd find in this potential sender
542 if (!Universe::heap()->is_valid_method(m)) return false; 542 if (!m->is_valid_method()) return false;
543 543
544 // stack frames shouldn't be much larger than max_stack elements 544 // stack frames shouldn't be much larger than max_stack elements
545 545
546 if (fp() - sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) { 546 if (fp() - sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) {
547 return false; 547 return false;