--- src/hotspot/share/runtime/arguments.cpp	2020-01-16 20:50:30.000000000 +0100
+++ src/hotspot/share/runtime/arguments.cpp	2020-03-21 17:00:38.001530000 +0100
@@ -1445,7 +1445,7 @@
       // save it in _java_vendor_url_bug, so JVM fatal error handler can access
       // its value without going through the property list or making a Java call.
       _java_vendor_url_bug = os::strdup_check_oom(value, mtArguments);
-      if (old_java_vendor_url_bug != DEFAULT_VENDOR_URL_BUG) {
+      if (strcmp(old_java_vendor_url_bug, DEFAULT_VENDOR_URL_BUG) != 0) {
         assert(old_java_vendor_url_bug != NULL, "_java_vendor_url_bug is NULL");
         os::free((void *)old_java_vendor_url_bug);
       }
--- src/hotspot/share/c1/c1_LIR.cpp.orig	2020-01-16 20:50:30.000000000 +0100
+++ src/hotspot/share/c1/c1_LIR.cpp	2020-03-21 17:13:58.603578000 +0100
@@ -547,7 +547,8 @@
       if (opAllocObj->_tmp2->is_valid())         do_temp(opAllocObj->_tmp2);
       if (opAllocObj->_tmp3->is_valid())         do_temp(opAllocObj->_tmp3);
       if (opAllocObj->_tmp4->is_valid())         do_temp(opAllocObj->_tmp4);
-      if (opAllocObj->_result->is_valid())       do_output(opAllocObj->_result);
+      if (opAllocObj->_result->is_valid()) {     do_output(opAllocObj->_result);
+                                           }
                                                  do_stub(opAllocObj->_stub);
       break;
     }
@@ -848,7 +849,8 @@
       if (opTypeCheck->_tmp1->is_valid())         do_temp(opTypeCheck->_tmp1);
       if (opTypeCheck->_tmp2->is_valid())         do_temp(opTypeCheck->_tmp2);
       if (opTypeCheck->_tmp3->is_valid())         do_temp(opTypeCheck->_tmp3);
-      if (opTypeCheck->_result->is_valid())       do_output(opTypeCheck->_result);
+      if (opTypeCheck->_result->is_valid()) {     do_output(opTypeCheck->_result);
+                                            }
                                                   do_stub(opTypeCheck->_stub);
       break;
     }
@@ -863,7 +865,8 @@
       assert(opCompareAndSwap->_addr->is_valid(),      "used");
       assert(opCompareAndSwap->_cmp_value->is_valid(), "used");
       assert(opCompareAndSwap->_new_value->is_valid(), "used");
-      if (opCompareAndSwap->_info)                    do_info(opCompareAndSwap->_info);
+      if (opCompareAndSwap->_info) {                  do_info(opCompareAndSwap->_info);
+                                   }
                                                       do_input(opCompareAndSwap->_addr);
                                                       do_temp(opCompareAndSwap->_addr);
                                                       do_input(opCompareAndSwap->_cmp_value);
@@ -890,7 +893,8 @@
       if (opAllocArray->_tmp2->is_valid())            do_temp(opAllocArray->_tmp2);
       if (opAllocArray->_tmp3->is_valid())            do_temp(opAllocArray->_tmp3);
       if (opAllocArray->_tmp4->is_valid())            do_temp(opAllocArray->_tmp4);
-      if (opAllocArray->_result->is_valid())          do_output(opAllocArray->_result);
+      if (opAllocArray->_result->is_valid()) {        do_output(opAllocArray->_result);
+                                             }
                                                       do_stub(opAllocArray->_stub);
       break;
     }
--- src/hotspot/share/runtime/sharedRuntime.cpp	2020-01-16 20:50:30.000000000 +0100
+++ src/hotspot/share/runtime/sharedRuntime.cpp	2020-03-21 18:29:20.554600000 +0100
@@ -2871,7 +2871,7 @@
     if (buf != NULL) {
       CodeBuffer buffer(buf);
       double locs_buf[20];
-      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
+      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.
--- src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp	2020-01-16 20:50:30.000000000 +0100
+++ src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp	2020-03-21 18:45:39.766201000 +0100
@@ -147,7 +147,8 @@
       assert(_addr->is_valid(),      "used");
       assert(_cmp_value->is_valid(), "used");
       assert(_new_value->is_valid(), "used");
-      if (_info)                    state->do_info(_info);
+      if (_info) {                  state->do_info(_info);
+                 }
                                     state->do_input(_addr);
                                     state->do_temp(_addr);
                                     state->do_input(_cmp_value);
--- src/java.base/share/native/libfdlibm/e_asin.c	2020-01-16 20:50:30.000000000 +0100
+++ src/java.base/share/native/libfdlibm/e_asin.c	2020-03-21 19:06:42.683139000 +0100
@@ -97,12 +97,13 @@
         } else if (ix<0x3fe00000) {     /* |x|<0.5 */
             if(ix<0x3e400000) {         /* if |x| < 2**-27 */
                 if(huge+x>one) return x;/* return x with inexact if x!=0*/
-            } else
+            } else {
                 t = x*x;
                 p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
                 q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
                 w = p/q;
                 return x+x*w;
+            }
         }
         /* 1> |x|>= 0.5 */
         w = one-fabs(x);