archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8209833: C2 compilation fails with "assert(ex_map->jvms()->same_calls_as(_exceptions->jvms())) failed: all collected exceptions must come from the same place"

Browse source 
Deoptimize if exception is thrown in _clone intrinsic.

Reviewed-by: kvn
This commit is contained in:
Tobias Hartmann 2018-08-24 08:17:23 +02:00
parent aad3230b1d
commit a494a819eb
4 changed files with 94 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/hotspot/share/opto/library_call.cpp
View file

@ -4386,7 +4386,8 @@ bool LibraryCallKit::inline_native_clone(bool is_virtual) {
if (!stopped()) {
PreserveJVMState pjvms(this);
CallJavaNode* slow_call = generate_method_call(vmIntrinsics::_clone, is_virtual);
Node* slow_result = set_results_for_java_call(slow_call);
// We need to deoptimize on exception (see comment above)
Node* slow_result = set_results_for_java_call(slow_call, false, /* deoptimize */ true);
// this->control() comes from set_results_for_java_call
result_reg->init_req(_slow_path, control());
result_val->init_req(_slow_path, slow_result);