combine the calacution of stelen

sendaoYan · Nov 27, 2024 · a41e68e · a41e68e
1 parent 0d3768d
commit a41e68e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/src/hotspot/share/compiler/methodMatcher.cpp b/src/hotspot/share/compiler/methodMatcher.cpp
@@ -219,25 +219,22 @@ bool MethodMatcher::match(Symbol* candidate, Symbol* match, Mode match_mode) con
 
 static MethodMatcher::Mode check_mode(char name[], const char*& error_msg) {
   int match = MethodMatcher::Exact;
+  size_t len = strlen(name);
   if (name[0] == '*') {
-    if (strlen(name) == 1) {
+    if (len == 1) {
       return MethodMatcher::Any;
     }
     match |= MethodMatcher::Suffix;
-PRAGMA_DIAG_PUSH
-PRAGMA_STRINGOP_OVERREAD_IGNORED
-    // This code can incorrectly cause a "stringop-overread" warning with gcc
-     memmove(name, name + 1, strlen(name + 1) + 1);
-PRAGMA_DIAG_POP
+    memmove(name, name + 1, len); // Include terminating nul in move.
+    len--;
   }
 
-  size_t len = strlen(name);
   if (len > 0 && name[len - 1] == '*') {
     match |= MethodMatcher::Prefix;
     name[--len] = '\0';
   }
 
-  if (strlen(name) == 0) {
+  if (len == 0) {
     error_msg = "** Not a valid pattern";
     return MethodMatcher::Any;
   }

diff --git a/src/hotspot/share/utilities/compilerWarnings.hpp b/src/hotspot/share/utilities/compilerWarnings.hpp
@@ -74,10 +74,6 @@
 #define PRAGMA_STRINGOP_OVERFLOW_IGNORED
 #endif
 
-#ifndef PRAGMA_STRINGOP_OVERREAD_IGNORED
-#define PRAGMA_STRINGOP_OVERREAD_IGNORED
-#endif
-
 #ifndef PRAGMA_INFINITE_RECURSION_IGNORED
 #define PRAGMA_INFINITE_RECURSION_IGNORED
 #endif

diff --git a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp b/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
@@ -65,12 +65,6 @@
 #define PRAGMA_STRINGOP_OVERFLOW_IGNORED PRAGMA_DISABLE_GCC_WARNING("-Wstringop-overflow")
 #endif
 
-// Disable -Wstringop-overread which is introduced in GCC 11.
-// https://gcc.gnu.org/gcc-11/changes.html
-#if !defined(__clang_major__) && (__GNUC__ >= 11)
-#define PRAGMA_STRINGOP_OVERREAD_IGNORED PRAGMA_DISABLE_GCC_WARNING("-Wstringop-overread")
-#endif
-
 #define PRAGMA_NONNULL_IGNORED PRAGMA_DISABLE_GCC_WARNING("-Wnonnull")
 
 #define PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED \