From 69e03ffa3545126ca9c48d0dde9e321d7fb03b77 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Fri, 29 May 2015 08:58:46 +0900
Subject: [PATCH] 8081295: Build failed with GCC 5.1.1

Array bounds and incorrect condition warnings happen with GCC 5.1.1

Reviewed-by: azvegint
---
 jdk/make/lib/Awt2dLibraries.gmk                           | 4 ++--
 jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
index 177fe2ad594..aab1add5f48 100644
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
@@ -54,7 +54,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(BUILD_LIBMLIB_CFLAGS), \
-    DISABLED_WARNINGS_gcc := parentheses, \
+    DISABLED_WARNINGS_gcc := parentheses array-bounds, \
     DISABLED_WARNINGS_clang := parentheses, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
@@ -494,7 +494,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
     CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \
         $(LIBJAVA_HEADER_FLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
-    DISABLED_WARNINGS_gcc := clobbered parentheses, \
+    DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \
     DISABLED_WARNINGS_clang := logical-op-parentheses, \
     DISABLED_WARNINGS_microsoft := 4267, \
     MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
index d3eeb4d077c..9d9adf32e79 100644
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
@@ -518,8 +518,8 @@ eventFilterRestricted_passesFilter(JNIEnv *env,
 
           case JDWP_REQUEST_MODIFIER(SourceNameMatch): {
               char* desiredNamePattern = filter->u.SourceNameOnly.sourceNamePattern;
-              if (!searchAllSourceNames(env, clazz,
-                           desiredNamePattern) == 1) {
+              if (searchAllSourceNames(env, clazz,
+                           desiredNamePattern) != 1) {
                   /* The name isn't in the SDE; try the sourceName in the ref
                    * type
                    */