--- a/src/share/vm/compiler/disassembler.cpp	Mon May 17 05:47:14 2021 +0100
+++ b/src/share/vm/compiler/disassembler.cpp	Wed May 19 16:08:42 2021 +0100
@@ -89,7 +89,7 @@
   {
     // Match "jvm[^/]*" in jvm_path.
     const char* base = buf;
-    const char* p = strrchr(buf, '/');
+    const char* p = strrchr(buf, *os::file_separator());
     if (p != NULL) lib_offset = p - base + 1;
     p = strstr(p ? p : base, "jvm");
     if (p != NULL)  jvm_offset = p - base;
@@ -114,7 +114,7 @@
     if (_library == NULL) {
       // 3. <home>/jre/lib/<arch>/hsdis-<arch>.so
       buf[lib_offset - 1] = '\0';
-      const char* p = strrchr(buf, '/');
+      const char* p = strrchr(buf, *os::file_separator());
       if (p != NULL) {
         lib_offset = p - buf + 1;
         strcpy(&buf[lib_offset], hsdis_library_name);

--- a/src/share/vm/runtime/sharedRuntime.cpp	Mon May 17 05:47:14 2021 +0100
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Wed May 19 16:08:42 2021 +0100
@@ -2634,8 +2634,8 @@
     BufferBlob*  buf = buffer_blob(); // the temporary code buffer in CodeCache
     if (buf != NULL) {
       CodeBuffer buffer(buf);
-      double locs_buf[20];
-      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
+      struct { double data[20]; } locs_buf;
+      buffer.insts()->initialize_shared_locs((relocInfo*)&locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
       MacroAssembler _masm(&buffer);
 
       // Fill in the signature array, for the calling-convention call.

--- a/src/share/vm/utilities/taskqueue.hpp	Mon May 17 05:47:14 2021 +0100
+++ b/src/share/vm/utilities/taskqueue.hpp	Wed May 19 16:08:42 2021 +0100
@@ -430,9 +430,7 @@
 }
 
 template<class E, MEMFLAGS F, unsigned int N>
-GenericTaskQueue<E, F, N>::~GenericTaskQueue() {
-  FREE_C_HEAP_ARRAY(E, _elems, F);
-}
+GenericTaskQueue<E, F, N>::~GenericTaskQueue() {}
 
 // OverflowTaskQueue is a TaskQueue that also includes an overflow stack for
 // elements that do not fit in the TaskQueue.