archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8175086: [BACKOUT] fix for JDK-8166188

Browse source 
Reviewed-by: kbarrett, jwilhelm, dcubed
This commit is contained in:
Daniel D. Daugherty 2017-02-16 10:41:19 -08:00
parent 28477cf493
commit 298e3a2dcc
37 changed files with 427 additions and 1059 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp
View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017 SAP SE. All rights reserved.
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -2272,9 +2272,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
__ reset_last_Java_frame();
// Unpack oop result, e.g. JNIHandles::resolve result.
// Unpack oop result
if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
__ resolve_jobject(Z_RET, /* tmp1 */ Z_R13, /* tmp2 */ Z_R7);
NearLabel L;
__ compare64_and_branch(Z_RET, (RegisterOrConstant)0L, Assembler::bcondEqual, L);
__ z_lg(Z_RET, 0, Z_RET);
__ bind(L);
__ verify_oop(Z_RET);
}
if (CheckJNICalls) {