8295146: Clean up native code with newer C/C++ language features

make/autoconf/flags-cflags.m4

@@ -629,7 +629,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections \
-      -DJNIEXPORT='__attribute__((visibility(\"hidden\")))'"
+      -DJNIEXPORT='[[gnu::visibility(\"hidden\")]]'"
   else
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -DJNIEXPORT="
   fi

make/hotspot/lib/CompileJvm.gmk

@@ -61,11 +61,6 @@ else
   OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU)
 endif
 
-ifeq ($(VERSION_BUILD), )
-  # Hotspot cannot handle an empty build number
-  VERSION_BUILD := 0
-endif
-
 ifeq ($(HOTSPOT_BUILD_TIME), )
   HOTSPOT_BUILD_TIME := $(call EpochToISO8601, $(shell $(DATE) +"%s"))
 endif

src/hotspot/cpu/aarch64/assembler_aarch64.hpp

@@ -208,7 +208,7 @@ class Instruction_aarch64 {
     return extend(uval, msb - lsb);
   }
 
-  static ALWAYSINLINE void patch(address a, int msb, int lsb, uint64_t val) {
+  ALWAYSINLINE static void patch(address a, int msb, int lsb, uint64_t val) {
     int nbits = msb - lsb + 1;
     guarantee(val < (1ULL << nbits), "Field too big for insn");
     assert_cond(msb >= lsb);

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -178,7 +178,7 @@ class RelocActions {
   virtual int immediate(address insn_addr, address &target) = 0;
   virtual void verify(address insn_addr, address &target) = 0;
 
-  int ALWAYSINLINE run(address insn_addr, address &target) {
+  ALWAYSINLINE int run(address insn_addr, address &target) {
     int instructions = 1;
 
     uint32_t dispatch = Instruction_aarch64::extract(_insn, 30, 25);

src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

@@ -3386,7 +3386,7 @@ do {                                                    \
 // in  A Cryptographic Library for the Motorola DSP56000,
 // Dusse and Kaliski, Proc. EUROCRYPT 90, pp. 230-237.
 
-static void NOINLINE
+NOINLINE static void
 montgomery_multiply(julong a[], julong b[], julong n[],
                     julong m[], julong inv, int len) {
   julong t0 = 0, t1 = 0, t2 = 0; // Triple-precision accumulator
@@ -3428,7 +3428,7 @@ montgomery_multiply(julong a[], julong b[], julong n[],
 // multiplication.  However, its loop control is more complex and it
 // may actually run slower on some machines.
 
-static void NOINLINE
+NOINLINE static void
 montgomery_square(julong a[], julong n[],
                   julong m[], julong inv, int len) {
   julong t0 = 0, t1 = 0, t2 = 0; // Triple-precision accumulator

src/hotspot/os/linux/os_linux.cpp

@@ -601,7 +601,7 @@ void os::Linux::libpthread_init() {
 // _expand_stack_to() assumes its frame size is less than page size, which
 // should always be true if the function is not inlined.
 
-static void NOINLINE _expand_stack_to(address bottom) {
+NOINLINE static void _expand_stack_to(address bottom) {
   address sp;
   size_t size;
   volatile char *p;

src/hotspot/os/linux/os_perf_linux.cpp

@@ -230,7 +230,8 @@ static double get_cpu_load(int which_logical_cpu, CPUPerfCounters* counters, dou
 /** reads /proc/<pid>/stat data, with some checks and some skips.
  *  Ensure that 'fmt' does _NOT_ contain the first two "%d %s"
  */
-static int SCANF_ARGS(2, 0) vread_statdata(const char* procfile, _SCANFMT_ const char* fmt, va_list args) {
+SCANF_ARGS(2, 0)
+static int vread_statdata(const char* procfile, _SCANFMT_ const char* fmt, va_list args) {
   FILE*f;
   int n;
   char buf[2048];
@@ -259,7 +260,8 @@ static int SCANF_ARGS(2, 0) vread_statdata(const char* procfile, _SCANFMT_ const
   return n;
 }
 
-static int SCANF_ARGS(2, 3) read_statdata(const char* procfile, _SCANFMT_ const char* fmt, ...) {
+SCANF_ARGS(2, 3)
+static int read_statdata(const char* procfile, _SCANFMT_ const char* fmt, ...) {
   int   n;
   va_list args;
 
@@ -394,7 +396,8 @@ static double get_cpu_load(int which_logical_cpu, CPUPerfCounters* counters, dou
   return user_load;
 }
 
-static int SCANF_ARGS(1, 2) parse_stat(_SCANFMT_ const char* fmt, ...) {
+SCANF_ARGS(1, 2)
+static int parse_stat(_SCANFMT_ const char* fmt, ...) {
   FILE *f;
   va_list args;
 

src/hotspot/os/windows/os_windows.hpp

@@ -32,6 +32,8 @@
 class outputStream;
 class Thread;
 
+static unsigned __stdcall thread_native_entry(Thread*);
+
 typedef void (*signal_handler_t)(int);
 
 class os::win32 {

src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp

@@ -65,7 +65,7 @@ void os::os_exception_wrapper(java_call_t f, JavaValue* value, const methodHandl
   f(value, method, args, thread);
 }
 
-PRAGMA_DISABLE_MSVC_WARNING(4172)
+PRAGMA_DISABLE_VISCPP_WARNING(4172)
 // Returns an estimate of the current stack pointer. Result must be guaranteed
 // to point into the calling threads stack, and be no lower than the current
 // stack pointer.

src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp

@@ -332,7 +332,7 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
 #ifndef AMD64
 // Ignore "C4172: returning address of local variable or temporary" on 32bit
 PRAGMA_DIAG_PUSH
-PRAGMA_DISABLE_MSVC_WARNING(4172)
+PRAGMA_DISABLE_VISCPP_WARNING(4172)
 // Returns an estimate of the current stack pointer. Result must be guaranteed
 // to point into the calling threads stack, and be no lower than the current
 // stack pointer.

src/hotspot/share/c1/c1_CFGPrinter.hpp

@@ -62,7 +62,8 @@ class CFGPrinterOutput : public CHeapObj<mtCompiler> {
 
   void inc_indent();
   void dec_indent();
-  void print(const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
+  ATTRIBUTE_PRINTF(2, 3)
+  void print(const char* format, ...);
   void print_begin(const char* tag);
   void print_end(const char* tag);
 

src/hotspot/share/cds/filemap.hpp

@@ -479,8 +479,8 @@ class FileMapInfo : public CHeapObj<mtInternal> {
   bool  remap_shared_readonly_as_readwrite();
 
   // Errors.
-  static void fail_stop(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
-  static void fail_continue(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
+  ATTRIBUTE_PRINTF(1, 2) static void fail_stop(const char *msg, ...);
+  ATTRIBUTE_PRINTF(1, 2) static void fail_continue(const char *msg, ...);
   static bool memory_mapping_failed() {
     CDS_ONLY(return _memory_mapping_failed;)
     NOT_CDS(return false;)

src/hotspot/share/classfile/verifier.hpp

@@ -432,8 +432,8 @@ class ClassVerifier : public StackObj {
 
   // Called when verify or class format errors are encountered.
   // May throw an exception based upon the mode.
-  void verify_error(ErrorContext ctx, const char* fmt, ...) ATTRIBUTE_PRINTF(3, 4);
-  void class_format_error(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3);
+  ATTRIBUTE_PRINTF(3, 4) void verify_error(ErrorContext ctx, const char* fmt, ...);
+  ATTRIBUTE_PRINTF(2, 3) void class_format_error(const char* fmt, ...);
 
   Klass* load_class(Symbol* name, TRAPS);
 

src/hotspot/share/compiler/compileLog.hpp

@@ -55,7 +55,7 @@ class CompileLog : public xmlStream {
 
   static CompileLog* _first;     // head of static chain
 
-  void va_tag(bool push, const char* format, va_list ap) ATTRIBUTE_PRINTF(3, 0);
+  ATTRIBUTE_PRINTF(3, 0) void va_tag(bool push, const char* format, va_list ap);
 
  public:
   CompileLog(const char* file_name, FILE* fp, intx thread_id);
@@ -69,7 +69,8 @@ class CompileLog : public xmlStream {
   // or reset, context string will be silently ignored
   stringStream* context()                        { return &_context; }
   void    clear_context()                        { context()->reset(); }
-  void      set_context(const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
+  ATTRIBUTE_PRINTF(2, 3)
+  void      set_context(const char* format, ...);
 
   void          name(ciSymbol* s);               // name='s'
   void          name(Symbol* s)                  { xmlStream::name(s); }

src/hotspot/share/gc/shared/gcLogPrecious.hpp

@@ -60,22 +60,25 @@ class GCLogPrecious : public AllStatic {
   // Protects the buffers
   static Mutex* _lock;
 
+  ATTRIBUTE_PRINTF(2, 0)
   static void vwrite_inner(LogTargetHandle log,
                            const char* format,
-                           va_list args) ATTRIBUTE_PRINTF(2, 0);
+                           va_list args);
 
 public:
   static void initialize();
 
+  ATTRIBUTE_PRINTF(2, 0)
   static void vwrite(LogTargetHandle log,
                      const char* format,
-                     va_list args) ATTRIBUTE_PRINTF(2, 0);
+                     va_list args);
 
+  ATTRIBUTE_PRINTF(2, 0)
   static void vwrite_and_debug(LogTargetHandle log,
                                const char* format,
                                va_list args
                                DEBUG_ONLY(COMMA const char* file)
-                               DEBUG_ONLY(COMMA int line)) ATTRIBUTE_PRINTF(2, 0);
+                               DEBUG_ONLY(COMMA int line));
 
   static void print_on_error(outputStream* st);
 };
@@ -94,14 +97,16 @@ class GCLogPreciousHandle {
       DEBUG_ONLY(COMMA _line(line))
  {}
 
-  void write(const char* format, ...) ATTRIBUTE_PRINTF(2, 3) {
+  ATTRIBUTE_PRINTF(2, 3)
+  void write(const char* format, ...) {
     va_list args;
     va_start(args, format);
     GCLogPrecious::vwrite(_log, format, args);
     va_end(args);
   }
 
-  void write_and_debug(const char* format, ...) ATTRIBUTE_PRINTF(2, 3) {
+  ATTRIBUTE_PRINTF(2, 3)
+  void write_and_debug(const char* format, ...) {
     va_list args;
     va_start(args, format);
     GCLogPrecious::vwrite_and_debug(_log, format, args DEBUG_ONLY(COMMA _file COMMA _line));

src/hotspot/share/gc/z/zStat.cpp

@@ -984,7 +984,8 @@ class ZStatTablePrinter {
         _width(width),
         _width_next(width_next) {}
 
-    ZColumn left(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+    ATTRIBUTE_PRINTF(2, 3)
+    ZColumn left(const char* fmt, ...) {
       va_list va;
 
       va_start(va, fmt);
@@ -999,7 +1000,8 @@ class ZStatTablePrinter {
       return next();
     }
 
-    ZColumn right(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+    ATTRIBUTE_PRINTF(2, 3)
+    ZColumn right(const char* fmt, ...) {
       va_list va;
 
       va_start(va, fmt);
@@ -1022,7 +1024,8 @@ class ZStatTablePrinter {
       return next();
     }
 
-    ZColumn center(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+    ATTRIBUTE_PRINTF(2, 3)
+    ZColumn center(const char* fmt, ...) {
       va_list va;
 
       va_start(va, fmt);

src/hotspot/share/jvmci/jvmci.hpp

@@ -173,18 +173,18 @@ class JVMCI : public AllStatic {
   static JVMCIRuntime* compiler_runtime(JavaThread* thread, bool create=true);
 
   // Appends an event to the JVMCI event log if JVMCIEventLogLevel >= `level`
-  static void vlog(int level, const char* format, va_list ap) ATTRIBUTE_PRINTF(2, 0);
+  ATTRIBUTE_PRINTF(2, 0) static void vlog(int level, const char* format, va_list ap);
 
   // Traces an event to tty if JVMCITraceLevel >= `level`
-  static void vtrace(int level, const char* format, va_list ap) ATTRIBUTE_PRINTF(2, 0);
+  ATTRIBUTE_PRINTF(2, 0) static void vtrace(int level, const char* format, va_list ap);
 
  public:
   // Log/trace a JVMCI event
-  static void event(int level, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
-  static void event1(const char* format, ...) ATTRIBUTE_PRINTF(1, 2);
-  static void event2(const char* format, ...) ATTRIBUTE_PRINTF(1, 2);
-  static void event3(const char* format, ...) ATTRIBUTE_PRINTF(1, 2);
-  static void event4(const char* format, ...) ATTRIBUTE_PRINTF(1, 2);
+  ATTRIBUTE_PRINTF(2, 3) static void event(int level, const char* format, ...);
+  ATTRIBUTE_PRINTF(1, 2) static void event1(const char* format, ...);
+  ATTRIBUTE_PRINTF(1, 2) static void event2(const char* format, ...);
+  ATTRIBUTE_PRINTF(1, 2) static void event3(const char* format, ...);
+  ATTRIBUTE_PRINTF(1, 2) static void event4(const char* format, ...);
 };
 
 // JVMCI event macros.

src/hotspot/share/jvmci/jvmciEnv.hpp

@@ -344,7 +344,7 @@ class JVMCIEnv : public ResourceObj {
 
 #undef DO_THROW
 
-  void fthrow_error(const char* file, int line, const char* format, ...) ATTRIBUTE_PRINTF(4, 5);
+  ATTRIBUTE_PRINTF(4, 5) void fthrow_error(const char* file, int line, const char* format, ...);
 
   // Given an instance of HotSpotInstalledCode return the corresponding CodeBlob*.
   CodeBlob* get_code_blob(JVMCIObject code);

src/hotspot/share/logging/log.hpp

@@ -153,7 +153,7 @@ class LogImpl {
     vwrite(LogLevel::level, fmt, args); \
     return *this; \
   } \
-  LogImpl& name(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) { \
+  ATTRIBUTE_PRINTF(2, 3) LogImpl& name(const char* fmt, ...) { \
     va_list args; \
     va_start(args, fmt); \
     vwrite(LogLevel::level, fmt, args); \
@@ -189,7 +189,8 @@ class LogTargetImpl {
     PRODUCT_ONLY(return false);
   }
 
-  static void print(const char* fmt, ...) ATTRIBUTE_PRINTF(1, 2) {
+  ATTRIBUTE_PRINTF(1, 2)
+  static void print(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
     LogTagSetMapping<T0, T1, T2, T3, T4, GuardTag>::tagset().vwrite(level, fmt, args);

src/hotspot/share/logging/logHandle.hpp

@@ -52,7 +52,7 @@ class LogHandle {
     _tagset.vwrite(LogLevel::level, fmt, args); \
     return *this; \
   } \
-  LogHandle& name(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) { \
+  ATTRIBUTE_PRINTF(2, 3) LogHandle& name(const char* fmt, ...) { \
     va_list args; \
     va_start(args, fmt); \
     _tagset.vwrite(LogLevel::level, fmt, args); \
@@ -90,7 +90,8 @@ class LogTargetHandle {
     return LogTargetHandle(LogTargetImpl<level, T0, T1, T2, T3, T4, GuardTag>());
   }
 
-  void print(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+  ATTRIBUTE_PRINTF(2, 3)
+  void print(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
     if (is_enabled()) {

src/hotspot/share/logging/logMessageBuffer.hpp

@@ -121,8 +121,8 @@ class LogMessageBuffer : public StackObj {
   virtual void vwrite(LogLevelType level, const char* fmt, va_list args);
 
 #define LOG_LEVEL(level, name) \
-  LogMessageBuffer& v##name(const char* fmt, va_list args) ATTRIBUTE_PRINTF(2, 0); \
-  LogMessageBuffer& name(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3);
+  ATTRIBUTE_PRINTF(2, 0) LogMessageBuffer& v##name(const char* fmt, va_list args); \
+  ATTRIBUTE_PRINTF(2, 3) LogMessageBuffer& name(const char* fmt, ...);
   LOG_LEVEL_LIST
 #undef LOG_LEVEL
 };

src/hotspot/share/logging/logStream.hpp

@@ -148,7 +148,8 @@ class LogMessageHandle {
     return _lm.is_level(_level);
   }
 
-  void print(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) {
+  ATTRIBUTE_PRINTF(2, 3)
+  void print(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
     if (is_enabled()) {

src/hotspot/share/oops/generateOopMap.hpp

@@ -407,9 +407,12 @@ class GenerateOopMap {
   int copy_cts                              (CellTypeState *dst, CellTypeState *src);
 
   // Error handling
-  void  error_work                          (const char *format, va_list ap) ATTRIBUTE_PRINTF(2, 0);
-  void  report_error                        (const char *format, ...) ATTRIBUTE_PRINTF(2, 3);
-  void  verify_error                        (const char *format, ...) ATTRIBUTE_PRINTF(2, 3);
+  ATTRIBUTE_PRINTF(2, 0)
+  void  error_work                          (const char *format, va_list ap);
+  ATTRIBUTE_PRINTF(2, 3)
+  void  report_error                        (const char *format, ...);
+  ATTRIBUTE_PRINTF(2, 3)
+  void  verify_error                        (const char *format, ...);
   bool  got_error()                         { return _got_error; }
 
   // Create result set

src/hotspot/share/runtime/abstract_vm_version.cpp

@@ -80,13 +80,21 @@ VirtualizationType Abstract_VM_Version::_detected_virtualization = NoDetectedVir
 
 #define VM_RELEASE HOTSPOT_VERSION_STRING
 
+#define EMPTY(ARG)        (0-ARG-1)==1 && (ARG+0)!=-2
+
 // HOTSPOT_VERSION_STRING equals the JDK VERSION_STRING (unless overridden
 // in a standalone build).
 int Abstract_VM_Version::_vm_major_version = VERSION_FEATURE;
 int Abstract_VM_Version::_vm_minor_version = VERSION_INTERIM;
 int Abstract_VM_Version::_vm_security_version = VERSION_UPDATE;
 int Abstract_VM_Version::_vm_patch_version = VERSION_PATCH;
+#if EMPTY(VERSION_BUILD)
+int Abstract_VM_Version::_vm_build_number = 0;
+#else
 int Abstract_VM_Version::_vm_build_number = VERSION_BUILD;
+#endif
+
+#undef EMPTY
 
 #if defined(_LP64)
   #define VMLP "64-Bit "

src/hotspot/share/runtime/arguments.hpp

@@ -43,7 +43,7 @@ class JVMFlag;
 extern "C" {
   typedef void (JNICALL *abort_hook_t)(void);
   typedef void (JNICALL *exit_hook_t)(jint code);
-  typedef jint (JNICALL *vfprintf_hook_t)(FILE *fp, const char *format, va_list args)  ATTRIBUTE_PRINTF(2, 0);
+  typedef jint (JNICALL *vfprintf_hook_t ATTRIBUTE_PRINTF(2, 0))(FILE *fp, const char *format, va_list args);
 }
 
 // Obsolete or deprecated -XX flag.