comparison src/os_cpu/windows_x86/vm/thread_windows_x86.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents 774e1c2f8741
children be896a1983c0
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
73 } 73 }
74 74
75 frame ret_frame(ret_sp, ret_fp, addr.pc()); 75 frame ret_frame(ret_sp, ret_fp, addr.pc());
76 if (!ret_frame.safe_for_sender(jt)) { 76 if (!ret_frame.safe_for_sender(jt)) {
77 #if defined(COMPILER2) || defined(GRAAL) 77 #if defined(COMPILER2) || defined(GRAAL)
78 // C2 uses ebp as a general register see if NULL fp helps 78 // C2 and Graal use ebp as a general register see if NULL fp helps
79 frame ret_frame2(ret_sp, NULL, addr.pc()); 79 frame ret_frame2(ret_sp, NULL, addr.pc());
80 if (!ret_frame2.safe_for_sender(jt)) { 80 if (!ret_frame2.safe_for_sender(jt)) {
81 // nothing else to try if the frame isn't good 81 // nothing else to try if the frame isn't good
82 return false; 82 return false;
83 } 83 }