Merge to tag jdk-22+5

make/hotspot/lib/CompileJvm.gmk

@@ -84,11 +84,11 @@ CFLAGS_VM_VERSION := \
 # Disabled warnings
 
 DISABLED_WARNINGS_gcc := array-bounds comment delete-non-virtual-dtor \
- empty-body ignored-qualifiers implicit-fallthrough int-in-bool-context \
+ empty-body implicit-fallthrough int-in-bool-context \
  maybe-uninitialized missing-field-initializers parentheses \
  shift-negative-value unknown-pragmas
 
-DISABLED_WARNINGS_clang := ignored-qualifiers sometimes-uninitialized \
+DISABLED_WARNINGS_clang := sometimes-uninitialized \
  missing-braces delete-non-abstract-non-virtual-dtor unknown-pragmas
 
 ifneq ($(DEBUG_LEVEL), release)

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -251,6 +251,13 @@ ifeq ($(call isTargetOs, windows macosx), false)
  DISABLED_WARNINGS_gcc_XRBackendNative.c := maybe-uninitialized, \
  DISABLED_WARNINGS_gcc_XToolkit.c := unused-result, \
  DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
+ DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
+ DISABLED_WARNINGS_clang_gtk2_interface.c := parentheses, \
+ DISABLED_WARNINGS_clang_gtk3_interface.c := parentheses, \
+ DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
+ DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
+ DISABLED_WARNINGS_clang_screencast_pipewire.c := format-nonliteral, \
+ DISABLED_WARNINGS_clang_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
  DISABLED_WARNINGS_clang_aix := deprecated-non-prototype, \
  DISABLED_WARNINGS_clang_aix_awt_Taskbar.c := parentheses, \
  DISABLED_WARNINGS_clang_aix_OGLPaints.c := format-nonliteral, \

make/modules/java.security.jgss/Lib.gmk

@@ -33,6 +33,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \
  CFLAGS := $(CFLAGS_JDKLIB), \
  DISABLED_WARNINGS_gcc := undef, \
  DISABLED_WARNINGS_clang_aix := undef, \
+ DISABLED_WARNINGS_clang := undef, \
  LDFLAGS := $(LDFLAGS_JDKLIB) \
  $(call SET_SHARED_LIBRARY_ORIGIN), \
  LIBS := $(LIBDL), \

make/modules/jdk.hotspot.agent/Lib.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
  OPTIMIZATION := HIGH, \
  DISABLED_WARNINGS_gcc := sign-compare, \
  DISABLED_WARNINGS_gcc_ps_core.c := pointer-arith, \
+ DISABLED_WARNINGS_clang_ps_core.c := pointer-arith, \
  DISABLED_WARNINGS_clang := sign-compare, \
  DISABLED_WARNINGS_clang_libproc_impl.c := format-nonliteral, \
  DISABLED_WARNINGS_clang_sadis.c := format-nonliteral, \

make/modules/jdk.jpackage/Lib.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,8 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHEREXE, \
  INCLUDE_FILES := $(JPACKAGE_APPLAUNCHER_INCLUDE_FILES), \
  TOOLCHAIN := $(JPACKAGE_APPLAUNCHER_TOOLCHAIN), \
  OPTIMIZATION := LOW, \
+ DISABLED_WARNINGS_clang_LinuxPackage.c := format-nonliteral, \
+ DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
  CXXFLAGS := $(call JpackageWithStaticCrt, $(CXXFLAGS_JDKEXE)) \
  $(JPACKAGE_APPLAUNCHER_INCLUDES), \
  CFLAGS := $(call JpackageWithStaticCrt, $(CFLAGS_JDKEXE)) \
@@ -103,6 +105,8 @@ ifeq ($(call isTargetOs, linux), true)
  EXCLUDE_FILES := LinuxLauncher.c LinuxPackage.c, \
  TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
  OPTIMIZATION := LOW, \
+ DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
+ DISABLED_WARNINGS_clang_tstrings.cpp := format-nonliteral, \
  CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JPACKAGE_LIBAPPLAUNCHER_INCLUDES), \
  CFLAGS := $(CFLAGS_JDKLIB) $(JPACKAGE_LIBAPPLAUNCHER_INCLUDES), \
  LDFLAGS := $(LDFLAGS_JDKLIB), \

make/modules/jdk.management/Lib.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
  NAME := management_ext, \
  OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
+ DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \
  CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_EXT_CFLAGS), \
  LDFLAGS := $(LDFLAGS_JDKLIB) \
  $(call SET_SHARED_LIBRARY_ORIGIN), \

src/hotspot/cpu/aarch64/aarch64.ad

@@ -2285,7 +2285,7 @@ int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf)
 
 //=============================================================================
 
-const bool Matcher::match_rule_supported(int opcode) {
+bool Matcher::match_rule_supported(int opcode) {
  if (!has_match_rule(opcode))
  return false;
 
@@ -2320,7 +2320,7 @@ const TypeVectMask* Matcher::predicate_reg_type(const Type* elemTy, int length)
 }
 
 // Vector calling convention not yet implemented.
-const bool Matcher::supports_vector_calling_convention(void) {
+bool Matcher::supports_vector_calling_convention(void) {
  return false;
 }
 
@@ -2340,7 +2340,7 @@ bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
 }
 
 // Vector width in bytes.
-const int Matcher::vector_width_in_bytes(BasicType bt) {
+int Matcher::vector_width_in_bytes(BasicType bt) {
  // The MaxVectorSize should have been set by detecting SVE max vector register size.
  int size = MIN2((UseSVE > 0) ? 256 : 16, (int)MaxVectorSize);
  // Minimum 2 values in vector
@@ -2351,11 +2351,11 @@ const int Matcher::vector_width_in_bytes(BasicType bt) {
 }
 
 // Limits on vector size (number of elements) loaded into vector.
-const int Matcher::max_vector_size(const BasicType bt) {
+int Matcher::max_vector_size(const BasicType bt) {
  return vector_width_in_bytes(bt)/type2aelembytes(bt);
 }
 
-const int Matcher::min_vector_size(const BasicType bt) {
+int Matcher::min_vector_size(const BasicType bt) {
  int max_size = max_vector_size(bt);
  // Limit the min vector size to 8 bytes.
  int size = 8 / type2aelembytes(bt);
@@ -2370,17 +2370,17 @@ const int Matcher::min_vector_size(const BasicType bt) {
  return MIN2(size, max_size);
 }
 
-const int Matcher::superword_max_vector_size(const BasicType bt) {
+int Matcher::superword_max_vector_size(const BasicType bt) {
  return Matcher::max_vector_size(bt);
 }
 
 // Actual max scalable vector register length.
-const int Matcher::scalable_vector_reg_size(const BasicType bt) {
+int Matcher::scalable_vector_reg_size(const BasicType bt) {
  return Matcher::max_vector_size(bt);
 }
 
 // Vector ideal reg.
-const uint Matcher::vector_ideal_reg(int len) {
+uint Matcher::vector_ideal_reg(int len) {
  if (UseSVE > 0 && 16 < len && len <= 256) {
  return Op_VecA;
  }

src/hotspot/cpu/aarch64/aarch64_vector.ad

@@ -125,7 +125,7 @@ source %{
  }
  }
 
- const bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
+ bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
  if (UseSVE == 0) {
  // These operations are not profitable to be vectorized on NEON, because no direct
  // NEON instructions support them. But the match rule support for them is profitable for
@@ -148,7 +148,7 @@ source %{
 
  // Identify extra cases that we might want to provide match rules for vector nodes and
  // other intrinsics guarded with vector length (vlen) and element type (bt).
- const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
+ bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
  if (!match_rule_supported(opcode)) {
  return false;
  }
@@ -232,7 +232,7 @@ source %{
  return vector_size_supported(bt, vlen);
  }
 
- const bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt) {
+ bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt) {
  // Only SVE supports masked operations.
  if (UseSVE == 0) {
  return false;
@@ -271,7 +271,7 @@ source %{
  return match_rule_supported_vector(opcode, vlen, bt);
  }
 
- const bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
+ bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
  // Only SVE has partial vector operations
  if (UseSVE == 0) {
  return false;

src/hotspot/cpu/aarch64/aarch64_vector_ad.m4

@@ -115,7 +115,7 @@ source %{
  }
  }
 
- const bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
+ bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
  if (UseSVE == 0) {
  // These operations are not profitable to be vectorized on NEON, because no direct
  // NEON instructions support them. But the match rule support for them is profitable for
@@ -138,7 +138,7 @@ source %{
 
  // Identify extra cases that we might want to provide match rules for vector nodes and
  // other intrinsics guarded with vector length (vlen) and element type (bt).
- const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
+ bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
  if (!match_rule_supported(opcode)) {
  return false;
  }
@@ -222,7 +222,7 @@ source %{
  return vector_size_supported(bt, vlen);
  }
 
- const bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt) {
+ bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt) {
  // Only SVE supports masked operations.
  if (UseSVE == 0) {
  return false;
@@ -261,7 +261,7 @@ source %{
  return match_rule_supported_vector(opcode, vlen, bt);
  }
 
- const bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
+ bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
  // Only SVE has partial vector operations
  if (UseSVE == 0) {
  return false;

src/hotspot/cpu/aarch64/assembler_aarch64.hpp

@@ -4211,7 +4211,7 @@ Instruction_aarch64::~Instruction_aarch64() {
 #undef starti
 
 // Invert a condition
-inline const Assembler::Condition operator~(const Assembler::Condition cond) {
+inline Assembler::Condition operator~(const Assembler::Condition cond) {
  return Assembler::Condition(int(cond) ^ 1);
 }
 

src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp

@@ -693,6 +693,12 @@ void InterpreterMacroAssembler::remove_activation(
  // testing if reserved zone needs to be re-enabled
  Label no_reserved_zone_enabling;
 
+ // check if already enabled - if so no re-enabling needed
+ assert(sizeof(StackOverflow::StackGuardState) == 4, "unexpected size");
+ ldrw(rscratch1, Address(rthread, JavaThread::stack_guard_state_offset()));
+ cmpw(rscratch1, (u1)StackOverflow::stack_guard_enabled);
+ br(Assembler::EQ, no_reserved_zone_enabling);
+
  // look for an overflow into the stack reserved zone, i.e.
  // interpreter_frame_sender_sp <= JavaThread::reserved_stack_activation
  ldr(rscratch1, Address(rthread, JavaThread::reserved_stack_activation_offset()));

src/hotspot/cpu/aarch64/matcher_aarch64.hpp

@@ -33,7 +33,7 @@
  // Whether this platform implements the scalable vector feature
  static const bool implements_scalable_vector = true;
 
- static const bool supports_scalable_vector() {
+ static bool supports_scalable_vector() {
  return UseSVE > 0;
  }
 
@@ -144,12 +144,12 @@
  }
 
  // Does the CPU supports vector unsigned comparison instructions?
- static const bool supports_vector_comparison_unsigned(int vlen, BasicType bt) {
+ static constexpr bool supports_vector_comparison_unsigned(int vlen, BasicType bt) {
  return true;
  }
 
  // Some microarchitectures have mask registers used on vectors
- static const bool has_predicated_vectors(void) {
+ static bool has_predicated_vectors(void) {
  return UseSVE > 0;
  }
 

src/hotspot/cpu/arm/arm.ad

@@ -947,7 +947,7 @@ int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) {
  return offset;
 }
 
-const bool Matcher::match_rule_supported(int opcode) {
+bool Matcher::match_rule_supported(int opcode) {
  if (!has_match_rule(opcode))
  return false;
 
@@ -1002,11 +1002,11 @@ const bool Matcher::match_rule_supported(int opcode) {
  return true; // Per default match rules are supported.
 }
 
-const bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
+bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
  return match_rule_supported_vector(opcode, vlen, bt);
 }
 
-const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
+bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
 
  // TODO
  // identify extra cases that we might want to provide match rules for
@@ -1017,11 +1017,11 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType
  return ret_value; // Per default match rules are supported.
 }
 
-const bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt) {
+bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt) {
  return false;
 }
 
-const bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
+bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
  return false;
 }
 
@@ -1034,7 +1034,7 @@ const TypeVectMask* Matcher::predicate_reg_type(const Type* elemTy, int length)
 }
 
 // Vector calling convention not yet implemented.
-const bool Matcher::supports_vector_calling_convention(void) {
+bool Matcher::supports_vector_calling_convention(void) {
  return false;
 }
 
@@ -1044,16 +1044,16 @@ OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
 }
 
 // Vector width in bytes
-const int Matcher::vector_width_in_bytes(BasicType bt) {
+int Matcher::vector_width_in_bytes(BasicType bt) {
  return MaxVectorSize;
 }
 
-const int Matcher::scalable_vector_reg_size(const BasicType bt) {
+int Matcher::scalable_vector_reg_size(const BasicType bt) {
  return -1;
 }
 
 // Vector ideal reg corresponding to specified size in bytes
-const uint Matcher::vector_ideal_reg(int size) {
+uint Matcher::vector_ideal_reg(int size) {
  assert(MaxVectorSize >= size, "");
  switch(size) {
  case 8: return Op_VecD;
@@ -1064,17 +1064,17 @@ const uint Matcher::vector_ideal_reg(int size) {
 }
 
 // Limits on vector size (number of elements) loaded into vector.
-const int Matcher::max_vector_size(const BasicType bt) {
+int Matcher::max_vector_size(const BasicType bt) {
  assert(is_java_primitive(bt), "only primitive type vectors");
  return vector_width_in_bytes(bt)/type2aelembytes(bt);
 }
 
-const int Matcher::min_vector_size(const BasicType bt) {
+int Matcher::min_vector_size(const BasicType bt) {
  assert(is_java_primitive(bt), "only primitive type vectors");
  return 8/type2aelembytes(bt);
 }
 
-const int Matcher::superword_max_vector_size(const BasicType bt) {
+int Matcher::superword_max_vector_size(const BasicType bt) {
  return Matcher::max_vector_size(bt);
 }
 

src/hotspot/cpu/arm/assembler_arm.hpp

@@ -245,7 +245,7 @@ class Address {
 
  bool uses(Register reg) const { return _base == reg || _index == reg; }
 
- const relocInfo::relocType rtype() { return _rspec.type(); }
+ relocInfo::relocType rtype()  { return _rspec.type(); }
  const RelocationHolder& rspec() { return _rspec; }
 
  // Convert the raw encoding form into the form expected by the

src/hotspot/cpu/ppc/icache_ppc.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -44,7 +44,7 @@ class ICache : public AbstractICache {
  static void ppc64_flush_icache_bytes(address start, int bytes) {
  // Align start address to an icache line boundary and transform
  // nbytes to an icache line count.
- const uint line_offset = mask_address_bits(start, line_size - 1);
+ const uint line_offset = (uintptr_t)start & (line_size - 1);
  ppc64_flush_icache(start - line_offset, (bytes + line_offset + line_size - 1) >> log2_line_size, 0);
  }
 };

src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp

@@ -888,6 +888,12 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
  // Test if reserved zone needs to be enabled.
  Label no_reserved_zone_enabling;
 
+ // check if already enabled - if so no re-enabling needed
+ assert(sizeof(StackOverflow::StackGuardState) == 4, "unexpected size");
+ lwz(R0, in_bytes(JavaThread::stack_guard_state_offset()), R16_thread);
+ cmpwi(CCR0, R0, StackOverflow::stack_guard_enabled);
+ beq_predict_taken(CCR0, no_reserved_zone_enabling);
+
  // Compare frame pointers. There is no good stack pointer, as with stack
  // frame compression we can get different SPs when we do calls. A subsequent
  // call could have a smaller SP, so that this compare succeeds for an