1.1 --- a/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Thu Nov 05 11:42:42 2015 +0100
1.2 +++ b/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Tue May 07 20:38:26 2019 +0000
1.3 @@ -1,6 +1,6 @@
1.4 /*
1.5 * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
1.6 - * Copyright 2012, 2014 SAP AG. All rights reserved.
1.7 + * Copyright (c) 2012, 2017 SAP AG. All rights reserved.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 * This code is free software; you can redistribute it and/or modify it
1.11 @@ -2513,16 +2513,11 @@
1.12
1.13 __ reset_last_Java_frame();
1.14
1.15 - // Unpack oop result.
1.16 + // Unbox oop result, e.g. JNIHandles::resolve value.
1.17 // --------------------------------------------------------------------------
1.18
1.19 if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
1.20 - Label skip_unboxing;
1.21 - __ cmpdi(CCR0, R3_RET, 0);
1.22 - __ beq(CCR0, skip_unboxing);
1.23 - __ ld(R3_RET, 0, R3_RET);
1.24 - __ bind(skip_unboxing);
1.25 - __ verify_oop(R3_RET);
1.26 + __ resolve_jobject(R3_RET, r_temp_1, r_temp_2, /* needs_frame */ false); // kills R31
1.27 }
1.28
1.29
