1.1 --- a/src/cpu/ppc/vm/interpreter_ppc.cpp Thu Nov 05 11:42:42 2015 +0100
1.2 +++ b/src/cpu/ppc/vm/interpreter_ppc.cpp Tue May 07 20:38:26 2019 +0000
1.3 @@ -1,6 +1,6 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
1.6 - * Copyright 2012, 2015 SAP AG. All rights reserved.
1.7 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
1.8 + * Copyright (c) 2012, 2017 SAP AG. All rights reserved.
1.9 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.10 *
1.11 * This code is free software; you can redistribute it and/or modify it
1.12 @@ -413,11 +413,8 @@
1.13 case T_LONG:
1.14 break;
1.15 case T_OBJECT:
1.16 - // unbox result if not null
1.17 - __ cmpdi(CCR0, R3_RET, 0);
1.18 - __ beq(CCR0, done);
1.19 - __ ld(R3_RET, 0, R3_RET);
1.20 - __ verify_oop(R3_RET);
1.21 + // JNIHandles::resolve result.
1.22 + __ resolve_jobject(R3_RET, R11_scratch1, R12_scratch2, /* needs_frame */ true); // kills R31
1.23 break;
1.24 case T_FLOAT:
1.25 break;
