--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp Thu Oct 17 20:27:44 2019 +0100
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp Thu Oct 17 20:53:35 2019 +0100
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -713,6 +713,11 @@
Register temp2_reg,
Label& L_success);
+ void clinit_barrier(Register klass,
+ Register thread,
+ Label* L_fast_path = NULL,
+ Label* L_slow_path = NULL);
+
// Increment a counter at counter_address when the eq condition code is set.
// Kills registers tmp1_reg and tmp2_reg and preserves the condition code.
void increment_counter_eq(address counter_address, Register tmp1_reg, Register tmp2_reg);
@@ -823,7 +828,8 @@
Register Rbase = Z_R1, int pow2_offset = -1);
void resolve_oop_handle(Register result);
- void load_mirror(Register mirror, Register method);
+ void load_mirror_from_const_method(Register mirror, Register const_method);
+ void load_method_holder(Register holder, Register method);
//--------------------------
//--- Operations on arrays.