/hg/icedtea8-forest/hotspot: 2 new changesets

[andrew at icedtea.classpath.org]

changeset ef176cb429c4 in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=ef176cb429c4
author: ysuenaga
date: Mon May 28 10:09:33 2018 +0100

	8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
	Reviewed-by: kbarrett, vlivanov


changeset 8cde8f606e3f in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=8cde8f606e3f
author: andrew
date: Wed May 30 07:19:21 2018 +0100

	PR3597: Potential bogus -Wformat-overflow warning with -Wformat enabled


diffstat:

 src/share/vm/adlc/adlc.hpp         |  13 +++++++++++++
 src/share/vm/adlc/output_c.cpp     |   3 +++
 src/share/vm/code/dependencies.cpp |   2 +-
 3 files changed, 17 insertions(+), 1 deletions(-)

diffs (55 lines):

diff -r 6915dc9ae18c -r 8cde8f606e3f src/share/vm/adlc/adlc.hpp
--- a/src/share/vm/adlc/adlc.hpp	Mon May 28 09:26:07 2018 +0100
+++ b/src/share/vm/adlc/adlc.hpp	Wed May 30 07:19:21 2018 +0100
@@ -85,6 +85,19 @@
 #undef max
 #define max(a, b)   (((a)>(b)) ? (a) : (b))
 
+#if !defined(__clang_major__) && (__GNUC__ >= 7)
+#define PRAGMA_DIAG_PUSH             _Pragma("GCC diagnostic push")
+#define PRAGMA_DIAG_POP              _Pragma("GCC diagnostic pop")
+#define PRAGMA_FORMAT_OVERFLOW_IGNORED _Pragma("GCC diagnostic ignored \"-Wformat-overflow\"")
+#define PRAGMA_FORMAT_OVERFLOW_IGNORED_EXTERNAL PRAGMA_FORMAT_OVERFLOW_IGNORED
+#define PRAGMA_FORMAT_OVERFLOW_IGNORED_INTERNAL PRAGMA_FORMAT_OVERFLOW_IGNORED
+#else
+#define PRAGMA_DIAG_PUSH
+#define PRAGMA_DIAG_POP
+#define PRAGMA_FORMAT_OVERFLOW_IGNORED_EXTERNAL
+#define PRAGMA_FORMAT_OVERFLOW_IGNORED_INTERNAL
+#endif
+
 // ADLC components
 #include "arena.hpp"
 #include "opto/adlcVMDeps.hpp"
diff -r 6915dc9ae18c -r 8cde8f606e3f src/share/vm/adlc/output_c.cpp
--- a/src/share/vm/adlc/output_c.cpp	Mon May 28 09:26:07 2018 +0100
+++ b/src/share/vm/adlc/output_c.cpp	Wed May 30 07:19:21 2018 +0100
@@ -560,6 +560,8 @@
   return (ndx);
 }
 
+PRAGMA_DIAG_PUSH
+PRAGMA_FORMAT_OVERFLOW_IGNORED_EXTERNAL
 void ArchDesc::build_pipe_classes(FILE *fp_cpp) {
   const char *classname;
   const char *resourcename;
@@ -1016,6 +1018,7 @@
   fprintf(fp_cpp, "}\n");
   fprintf(fp_cpp, "#endif\n");
 }
+PRAGMA_DIAG_POP
 
 // ---------------------------------------------------------------------------
 //------------------------------Utilities to build Instruction Classes--------
diff -r 6915dc9ae18c -r 8cde8f606e3f src/share/vm/code/dependencies.cpp
--- a/src/share/vm/code/dependencies.cpp	Mon May 28 09:26:07 2018 +0100
+++ b/src/share/vm/code/dependencies.cpp	Wed May 30 07:19:21 2018 +0100
@@ -525,7 +525,7 @@
         xtty->object("x", arg.metadata_value());
       }
     } else {
-      char xn[10]; sprintf(xn, "x%d", j);
+      char xn[12]; sprintf(xn, "x%d", j);
       if (arg.is_oop()) {
         xtty->object(xn, arg.oop_value());
       } else {