Mercurial > hg > graal-jvmci-8
comparison src/share/vm/interpreter/interpreterRuntime.cpp @ 22853:cae03a88934b
8067231: Zero builds fails after JDK-6898462
Summary: Interpreter::remove_activation_entry() is not defined for the C++ interpreter
Reviewed-by: roland, coleenp
Contributed-by: Severin Gehwolf <sgehwolf@redhat.com>
| author | roland |
|---|---|
| date | Mon, 15 Dec 2014 09:36:46 +0100 |
| parents | d3f3f7677537 |
| children | 9dc350b9e498 |
comparison
equal
deleted
inserted
replaced
| 22852:c6affd32651a | 22853:cae03a88934b |
|---|---|
| 405 thread->set_vm_result(h_exception()); | 405 thread->set_vm_result(h_exception()); |
| 406 // If the method is synchronized we already unlocked the monitor | 406 // If the method is synchronized we already unlocked the monitor |
| 407 // during deoptimization so the interpreter needs to skip it when | 407 // during deoptimization so the interpreter needs to skip it when |
| 408 // the frame is popped. | 408 // the frame is popped. |
| 409 thread->set_do_not_unlock_if_synchronized(true); | 409 thread->set_do_not_unlock_if_synchronized(true); |
| 410 #ifdef CC_INTERP | |
| 411 return (address) -1; | |
| 412 #else | |
| 410 return Interpreter::remove_activation_entry(); | 413 return Interpreter::remove_activation_entry(); |
| 414 #endif | |
| 411 } | 415 } |
| 412 | 416 |
| 413 // Need to do this check first since when _do_not_unlock_if_synchronized | 417 // Need to do this check first since when _do_not_unlock_if_synchronized |
| 414 // is set, we don't want to trigger any classloading which may make calls | 418 // is set, we don't want to trigger any classloading which may make calls |
| 415 // into java, or surprisingly find a matching exception handler for bci 0 | 419 // into java, or surprisingly find a matching exception handler for bci 0 |