Mercurial > hg > truffle

comparison src/share/vm/prims/forte.cpp @ 14407:94c202aa2646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Thu, 01 Aug 2013 17:25:10 -0700
parents 75ef1a499665 e619a2766bcc
children abec000618bf a9becfeecd1b
comparison
equal deleted inserted replaced
14406:c9f0adfb4a8b 14407:94c202aa2646
29 #include "memory/space.hpp" 29 #include "memory/space.hpp"
30 #include "memory/universe.inline.hpp" 30 #include "memory/universe.inline.hpp"
31 #include "oops/oop.inline.hpp" 31 #include "oops/oop.inline.hpp"
32 #include "oops/oop.inline2.hpp" 32 #include "oops/oop.inline2.hpp"
33 #include "prims/forte.hpp" 33 #include "prims/forte.hpp"
34 #include "runtime/javaCalls.hpp"
34 #include "runtime/thread.hpp" 35 #include "runtime/thread.hpp"
35 #include "runtime/vframe.hpp" 36 #include "runtime/vframe.hpp"
36 #include "runtime/vframeArray.hpp" 37 #include "runtime/vframeArray.hpp"
37 38
38 // call frame copied from old .h file and renamed 39 // call frame copied from old .h file and renamed
306 int loop_max = MaxJavaStackTraceDepth * 2; 307 int loop_max = MaxJavaStackTraceDepth * 2;
307 RegisterMap map(thread, false); 308 RegisterMap map(thread, false);
308 309
309 for (loop_count = 0; loop_count < loop_max; loop_count++) { 310 for (loop_count = 0; loop_count < loop_max; loop_count++) {
310 311
311 if (candidate.is_first_frame()) { 312 if (candidate.is_entry_frame()) {
313 // jcw is NULL if the java call wrapper couldn't be found
314 JavaCallWrapper *jcw = candidate.entry_frame_call_wrapper_if_safe(thread);
312 // If initial frame is frame from StubGenerator and there is no 315 // If initial frame is frame from StubGenerator and there is no
313 // previous anchor, there are no java frames associated with a method 316 // previous anchor, there are no java frames associated with a method
314 return false; 317 if (jcw == NULL || jcw->is_first_frame()) {
318 return false;
319 }
315 } 320 }
316 321
317 if (candidate.is_interpreted_frame()) { 322 if (candidate.is_interpreted_frame()) {
318 if (is_decipherable_interpreted_frame(thread, &candidate, method_p, bci_p)) { 323 if (is_decipherable_interpreted_frame(thread, &candidate, method_p, bci_p)) {
319 *initial_frame_p = candidate; 324 *initial_frame_p = candidate;