RFR: 8301697: [s390] Optimized-build is broken

Tyler Steele tsteele at openjdk.org
Thu Feb 9 19:46:46 UTC 2023


On Fri, 3 Feb 2023 04:34:46 GMT, Amit Kumar <duke at openjdk.org> wrote:

> This fix guards `__ asm_assert_eq("killed Z_R14", 0)` & `__asm_assert_mem8_is_zero(in_bytes(JavaThread::exception_pc_offset()), Z_thread, "exception pc already set : "FILE_AND_LINE, 0)` with ASSERT because on s390x  `JavaThread::exception_oop_offset()` is always cleared but `JavaThread::exception_pc_offset()` is being cleared only in ASSERT-def, Which is causing the build failure in Optimized-Debug.

Changes requested by tsteele (Committer).

src/hotspot/cpu/s390/c1_Runtime1_s390.cpp line 3:

> 1: /*
> 2:  * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
> 3:  * Copyright (c) 2016, 2023, SAP SE. All rights reserved.

As I understand it, only SAPers should touch the SAP copyright header. I recognize that this is a bit confusing because everyone updates the Oracle header.

If @RealLucy confirms this to be true, please keep the Oracle line update, and revert the SAP line.

src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp line 3:

> 1: /*
> 2:  * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
> 3:  * Copyright (c) 2016, 2023, SAP SE. All rights reserved.

Same suggestion as above.

-------------

PR: https://git.openjdk.org/jdk/pull/12400


More information about the hotspot-dev mailing list