[patch] rebase JDK14 patches

Author: JakubVanek

scripts/jdk14_cds.patch

@@ -1,8 +1,8 @@
 diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
-index b0b8b8f5a..2f9cbcd0a 100644
+index 8ccc83a1c..3b6b73a9a 100644
 --- a/src/hotspot/share/memory/metaspaceShared.cpp
 +++ b/src/hotspot/share/memory/metaspaceShared.cpp
-@@ -1213,7 +1213,7 @@ public:
+@@ -1205,7 +1205,7 @@ public:
      address obj = ref->obj();
      int bytes = ref->size() * BytesPerWord;
      char* p;
@@ -11,7 +11,7 @@ index b0b8b8f5a..2f9cbcd0a 100644
      char* oldtop;
      char* newtop;
 
-@@ -1231,7 +1231,7 @@ public:
+@@ -1223,7 +1223,7 @@ public:
          Klass* klass = (Klass*)obj;
          if (klass->is_instance_klass()) {
            SystemDictionaryShared::validate_before_archiving(InstanceKlass::cast(klass));
@@ -21,15 +21,15 @@ index b0b8b8f5a..2f9cbcd0a 100644
        }
        p = _rw_region.allocate(bytes, alignment);
 diff --git a/src/hotspot/share/memory/metaspaceShared.hpp b/src/hotspot/share/memory/metaspaceShared.hpp
-index 43d69975b..f1236659b 100644
+index e293f60eb..687376403 100644
 --- a/src/hotspot/share/memory/metaspaceShared.hpp
 +++ b/src/hotspot/share/memory/metaspaceShared.hpp
-@@ -60,7 +60,7 @@ public:
+@@ -67,7 +67,7 @@ public:
    DumpRegion(const char* name) : _name(name), _base(NULL), _top(NULL), _end(NULL), _is_packed(false) {}
 
    char* expand_top_to(char* newtop);
 -  char* allocate(size_t num_bytes, size_t alignment=BytesPerWord);
 +  char* allocate(size_t num_bytes, size_t alignment=BytesPerLong);
 
-   void append_intptr_t(intptr_t n) {
-     assert(is_aligned(_top, sizeof(intptr_t)), "bad alignment");
+   void append_intptr_t(intptr_t n, bool need_to_mark = false);
+ 

scripts/jdk14_jfr.patch

@@ -1,5 +1,5 @@
 diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
-index 075eb1f7f..643df6351 100644
+index 649e48cb6..bc841fc26 100644
 --- a/make/autoconf/hotspot.m4
 +++ b/make/autoconf/hotspot.m4
 @@ -313,6 +313,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
@@ -14,81 +14,23 @@ index 075eb1f7f..643df6351 100644
    # Verify that dependencies are met for explicitly set features.
    if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then
      AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services'])
-diff --git a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
-index 0c4d0e0fe..2f7044349 100644
---- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
-+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
-@@ -775,7 +775,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
-   bool is_oop = type == T_OBJECT || type == T_ARRAY;
-   LIR_Opr result = new_register(type);
-   value.load_item();
--  assert(type == T_INT || is_oop LP64_ONLY( || type == T_LONG ), "unexpected type");
-+  assert(type == T_INT || is_oop || type == T_LONG, "unexpected type");
-   LIR_Opr tmp = (UseCompressedOops && is_oop) ? new_pointer_register() : LIR_OprFact::illegalOpr;
-   __ xchg(addr, value.result(), result, tmp);
-   return result;
-@@ -784,7 +784,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
- LIR_Opr LIRGenerator::atomic_add(BasicType type, LIR_Opr addr, LIRItem& value) {
-   LIR_Opr result = new_register(type);
-   value.load_item();
--  assert(type == T_INT LP64_ONLY( || type == T_LONG), "unexpected type");
-+  assert(type == T_INT || type == T_LONG, "unexpected type");
-   LIR_Opr tmp = new_register(type);
-   __ xadd(addr, value.result(), result, tmp);
-   return result;
-@@ -1311,9 +1311,14 @@ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
-                                         CodeEmitInfo* info) {
-   if (value->is_double_cpu()) {
-     assert(address->index()->is_illegal(), "should have a constant displacement");
--    LIR_Opr tmp = new_pointer_register();
--    add_large_constant(address->base(), address->disp(), tmp);
--    __ volatile_store_mem_reg(value, new LIR_Address(tmp, (intx)0, address->type()), info);
-+    LIR_Opr src;
-+    if (address->disp() == 0) {
-+      src = address->base();
-+    } else {
-+      src = new_pointer_register();
-+      add_large_constant(address->base(), address->disp(), src);
-+    }
-+    __ volatile_store_mem_reg(value, new LIR_Address(src, (intx)0, address->type()), info);
-     return;
-   }
-   __ store(value, address, info, lir_patch_none);
-@@ -1323,9 +1328,14 @@ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
-                                        CodeEmitInfo* info) {
-   if (result->is_double_cpu()) {
-     assert(address->index()->is_illegal(), "should have a constant displacement");
--    LIR_Opr tmp = new_pointer_register();
--    add_large_constant(address->base(), address->disp(), tmp);
--    __ volatile_load_mem_reg(new LIR_Address(tmp, (intx)0, address->type()), result, info);
-+    LIR_Opr src;
-+    if (address->disp() == 0) {
-+      src = address->base();
-+    } else {
-+      src = new_pointer_register();
-+      add_large_constant(address->base(), address->disp(), src);
-+    }
-+    __ volatile_load_mem_reg(new LIR_Address(src, (intx)0, address->type()), result, info);
-     return;
-   }
-   __ load(address, result, info, lir_patch_none);
 diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
-index 2e1e89bc2..b0b8b8f5a 100644
+index a181a434d..8ccc83a1c 100644
 --- a/src/hotspot/share/memory/metaspaceShared.cpp
 +++ b/src/hotspot/share/memory/metaspaceShared.cpp
-@@ -70,6 +70,7 @@
- #include "utilities/bitMap.hpp"
+@@ -71,6 +71,7 @@
+ #include "utilities/bitMap.inline.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/hashtable.inline.hpp"
 +#include "gc/shared/softRefPolicy.hpp"
  #if INCLUDE_G1GC
  #include "gc/g1/g1CollectedHeap.hpp"
  #endif
 diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
-index fc6c933eb..fd58a69ff 100644
+index 61cbf259e..938666dac 100644
 --- a/src/hotspot/share/oops/constantPool.cpp
 +++ b/src/hotspot/share/oops/constantPool.cpp
-@@ -414,8 +414,12 @@ void ConstantPool::remove_unshareable_info() {
+@@ -415,8 +415,12 @@ void ConstantPool::remove_unshareable_info() {
  }
 
  int ConstantPool::cp_to_object_index(int cp_index) {