Mercurial > hg > graal-jvmci-8

comparison src/share/vm/opto/runtime.cpp @ 7485:4fc2763e670e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Another merge fix.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 15:39:59 +0100
parents 989155e2d07a
children f2aebc22372a
comparison
equal deleted inserted replaced
7484:69318374c8d7 7485:4fc2763e670e
1156 frame stub_frame = thread->last_frame(); 1156 frame stub_frame = thread->last_frame();
1157 assert(stub_frame.is_runtime_frame() || exception_blob()->contains(stub_frame.pc()), "sanity check"); 1157 assert(stub_frame.is_runtime_frame() || exception_blob()->contains(stub_frame.pc()), "sanity check");
1158 frame caller_frame = stub_frame.sender(&reg_map); 1158 frame caller_frame = stub_frame.sender(&reg_map);
1159 1159
1160 // Deoptimize the caller frame. 1160 // Deoptimize the caller frame.
1161 Deoptimization::deoptimize_frame(thread, caller_frame.id()); 1161 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint);
1162 } 1162 }
1163 1163
1164 1164
1165 bool OptoRuntime::is_deoptimized_caller_frame(JavaThread *thread) { 1165 bool OptoRuntime::is_deoptimized_caller_frame(JavaThread *thread) {
1166 // Called from within the owner thread, so no need for safepoint 1166 // Called from within the owner thread, so no need for safepoint