Suppress a spurious warning in CompareConfig

third_party/mesa/MesaLib/src/egl/main/eglconfig.c: In function _eglCompareConfigs:
third_party/mesa/MesaLib/src/egl/main/eglconfig.h:98: error: array subscript is below array bounds

BUG=None
TEST=manual/local, and a buildbot running an otherwise affected version.

Review URL: http://codereview.chromium.org/5866007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69472 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 0 deletions

diff --git a/third_party/mesa/MesaLib/src/egl/main/eglconfig.c b/third_party/mesa/MesaLib/src/egl/main/eglconfig.c
index 1c97e42..da94eea 100644
--- a/third_party/mesa/MesaLib/src/egl/main/eglconfig.c
+++ b/third_party/mesa/MesaLib/src/egl/main/eglconfig.c
@@ -601,6 +601,19 @@ _eglParseConfigAttribList(_EGLConfig *conf, const EGLint *attrib_list)
  * Note that EGL_NATIVE_VISUAL_TYPE is platform-dependent and is
  * ignored here.
  */
+/*
+ * Note that there is code that causes spurious array bounds warnings
+ * at the bottom of this function (gcc 4.4.1 and 4.4.3 -O2 + ...)
+ * GCC does not allow changing the warnings inside the function, but
+ * the combination of iterating over the array of attribs, calling
+ * GET_CONFIG_ATTRIB( , compare_attribs[i]) which calls _eglGetConfigKey
+ * which calls _eglGetConfigIdx to get the index into Storgae[]
+ * but the compiler loses track of the fact that all of the elements of
+ * compare_attribs don't cause it to return or use -1 as an index.
+ * Unrolling the loop is sufficient to eliminate the warnings, which puts
+ * high confidence in their spuriousness.
+ */
+#pragma GCC diagnostic ignored "-Warray-bounds"
 EGLint
 _eglCompareConfigs(const _EGLConfig *conf1, const _EGLConfig *conf2,
                    const _EGLConfig *criteria, EGLBoolean compare_id)
@@ -692,6 +705,7 @@ _eglCompareConfigs(const _EGLConfig *conf1, const _EGLConfig *conf2,
 
    return (val1 - val2);
 }
+#pragma GCC diagnostic warning "-Warray-bounds"
 
 
 static INLINE