--- a/src/hotspot/cpu/s390/nativeInst_s390.hpp Mon Jul 29 13:57:54 2019 +0200
+++ b/src/hotspot/cpu/s390/nativeInst_s390.hpp Fri Jul 26 16:03:08 2019 +0200
@@ -490,13 +490,13 @@
// Patch data in code stream.
address set_data_plain(intptr_t x, CodeBlob *code);
// Patch data in code stream and oop pool if necessary.
- void set_data(intptr_t x);
+ void set_data(intptr_t x, relocInfo::relocType expected_type = relocInfo::none);
// Patch narrow oop constant in code stream.
void set_narrow_oop(intptr_t data);
void set_narrow_klass(intptr_t data);
- void set_pcrel_addr(intptr_t addr, CompiledMethod *nm = NULL, bool copy_back_to_oop_pool=false);
- void set_pcrel_data(intptr_t data, CompiledMethod *nm = NULL, bool copy_back_to_oop_pool=false);
+ void set_pcrel_addr(intptr_t addr, CompiledMethod *nm = NULL);
+ void set_pcrel_data(intptr_t data, CompiledMethod *nm = NULL);
void verify();