Mercurial > hg > truffle

comparison src/share/vm/shark/sharkTopLevelBlock.hpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2cd5e15048e6
children
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
288 llvm::Value** args_start, 288 llvm::Value** args_start,
289 llvm::Value** args_end, 289 llvm::Value** args_end,
290 int exception_action) { 290 int exception_action) {
291 decache_for_VM_call(); 291 decache_for_VM_call();
292 stack()->CreateSetLastJavaFrame(); 292 stack()->CreateSetLastJavaFrame();
293 llvm::CallInst *res = builder()->CreateCall(callee, args_start, args_end); 293 llvm::CallInst *res = builder()->CreateCall(callee, llvm::makeArrayRef(args_start, args_end));
294 stack()->CreateResetLastJavaFrame(); 294 stack()->CreateResetLastJavaFrame();
295 cache_after_VM_call(); 295 cache_after_VM_call();
296 if (exception_action & EAM_CHECK) { 296 if (exception_action & EAM_CHECK) {
297 check_pending_exception(exception_action); 297 check_pending_exception(exception_action);
298 current_state()->set_has_safepointed(true); 298 current_state()->set_has_safepointed(true);