From 40a65bd331c2fa58f88feb3918088253d118cf62 Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Tue, 25 Aug 2015 09:14:38 -0700 Subject: [PATCH] Bug 1198124 - Enable -Wshadow in directories that have no -Wshadow warnings. r=glandium --- accessible/windows/ia2/moz.build | 3 +++ accessible/windows/msaa/moz.build | 3 +++ accessible/windows/sdn/moz.build | 3 +++ b2g/app/moz.build | 3 +++ browser/app/moz.build | 3 +++ docshell/build/moz.build | 3 +++ dom/apps/moz.build | 3 +++ dom/archivereader/moz.build | 3 +++ dom/canvas/compiledtest/moz.build | 3 +++ dom/push/moz.build | 3 +++ dom/xml/moz.build | 3 +++ dom/xslt/xml/moz.build | 3 +++ layout/base/gtest/moz.build | 3 +++ layout/inspector/moz.build | 3 +++ memory/build/moz.build | 3 +++ memory/mozjemalloc/moz.build | 2 ++ memory/replace/dummy/moz.build | 3 +++ memory/replace/jemalloc/moz.build | 3 +++ netwerk/protocol/app/moz.build | 3 +++ netwerk/protocol/device/moz.build | 3 +++ netwerk/protocol/viewsource/moz.build | 3 +++ netwerk/socket/moz.build | 3 +++ parser/xml/moz.build | 3 +++ storage/build/moz.build | 3 +++ toolkit/components/mediasniffer/moz.build | 4 ++++ view/moz.build | 3 +++ widget/gtkxtbin/moz.build | 3 +++ widget/x11/moz.build | 3 +++ xpcom/build/moz.build | 3 +++ xpcom/components/moz.build | 3 +++ xpcom/glue/standalone/moz.build | 3 +++ xpcom/glue/standalone/staticruntime/moz.build | 3 +++ xpcom/glue/staticruntime/moz.build | 3 +++ xpcom/io/moz.build | 3 +++ xpfe/components/build/moz.build | 3 +++ xpfe/components/windowds/moz.build | 3 +++ 36 files changed, 108 insertions(+) diff --git a/accessible/windows/ia2/moz.build b/accessible/windows/ia2/moz.build index 43499cfe83c..967203dbdc0 100644 --- a/accessible/windows/ia2/moz.build +++ b/accessible/windows/ia2/moz.build @@ -47,6 +47,9 @@ LOCAL_INCLUDES += [ FINAL_LIBRARY = 'xul' +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') diff --git a/accessible/windows/msaa/moz.build b/accessible/windows/msaa/moz.build index 954f1b7548a..435c929468e 100644 --- a/accessible/windows/msaa/moz.build +++ b/accessible/windows/msaa/moz.build @@ -62,4 +62,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True diff --git a/accessible/windows/sdn/moz.build b/accessible/windows/sdn/moz.build index 4cdf63d565d..260dd503719 100644 --- a/accessible/windows/sdn/moz.build +++ b/accessible/windows/sdn/moz.build @@ -21,4 +21,7 @@ LOCAL_INCLUDES += [ FINAL_LIBRARY = 'xul' +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True diff --git a/b2g/app/moz.build b/b2g/app/moz.build index e29288cb4c6..bade9180e4a 100644 --- a/b2g/app/moz.build +++ b/b2g/app/moz.build @@ -75,6 +75,9 @@ if CONFIG['OS_ARCH'] == 'WINNT': 'version', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True JS_PREFERENCE_FILES += [ diff --git a/browser/app/moz.build b/browser/app/moz.build index beb8f633c2e..7b1d025c53e 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -84,4 +84,7 @@ if CONFIG['HAVE_CLOCK_MONOTONIC']: JAR_MANIFESTS += ['jar.mn'] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True diff --git a/docshell/build/moz.build b/docshell/build/moz.build index d13841c4e0f..0c7e77c3596 100644 --- a/docshell/build/moz.build +++ b/docshell/build/moz.build @@ -25,4 +25,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": FINAL_LIBRARY = 'xul' +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True diff --git a/dom/apps/moz.build b/dom/apps/moz.build index 5bd6f165742..0a7046d655e 100644 --- a/dom/apps/moz.build +++ b/dom/apps/moz.build @@ -51,6 +51,9 @@ EXTRA_PP_JS_MODULES += [ 'Webapps.jsm', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/dom/archivereader/moz.build b/dom/archivereader/moz.build index 0084cf5b44b..9b0d4f64b45 100644 --- a/dom/archivereader/moz.build +++ b/dom/archivereader/moz.build @@ -21,6 +21,9 @@ UNIFIED_SOURCES += [ 'ArchiveZipFile.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True LOCAL_INCLUDES += [ diff --git a/dom/canvas/compiledtest/moz.build b/dom/canvas/compiledtest/moz.build index c8a6c0fbc34..0771aae32c9 100644 --- a/dom/canvas/compiledtest/moz.build +++ b/dom/canvas/compiledtest/moz.build @@ -8,6 +8,9 @@ GeckoCppUnitTests([ 'TestWebGLElementArrayCache', ]) +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True LOCAL_INCLUDES += [ diff --git a/dom/push/moz.build b/dom/push/moz.build index 28f2b7cd5dd..6f1a47463a5 100644 --- a/dom/push/moz.build +++ b/dom/push/moz.build @@ -38,6 +38,9 @@ UNIFIED_SOURCES += [ 'PushManager.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True LOCAL_INCLUDES += [ diff --git a/dom/xml/moz.build b/dom/xml/moz.build index 63c41e535c1..69c3ad430f3 100644 --- a/dom/xml/moz.build +++ b/dom/xml/moz.build @@ -31,6 +31,9 @@ UNIFIED_SOURCES += [ 'XMLStylesheetProcessingInstruction.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/dom/xslt/xml/moz.build b/dom/xslt/xml/moz.build index aa8f5b49d66..89b5df0514f 100644 --- a/dom/xslt/xml/moz.build +++ b/dom/xslt/xml/moz.build @@ -9,6 +9,9 @@ UNIFIED_SOURCES += [ 'txXMLUtils.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True LOCAL_INCLUDES += [ diff --git a/layout/base/gtest/moz.build b/layout/base/gtest/moz.build index 2f27721ef81..07894d170dd 100644 --- a/layout/base/gtest/moz.build +++ b/layout/base/gtest/moz.build @@ -15,6 +15,9 @@ LOCAL_INCLUDES += [ '/layout/base' ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + # Workaround bug 1142396. Suppress the warning from gmock library for clang. if CONFIG['CLANG_CXX']: CXXFLAGS += ['-Wno-null-dereference'] diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build index 64295c42dd5..c531d8aac8d 100644 --- a/layout/inspector/moz.build +++ b/layout/inspector/moz.build @@ -41,6 +41,9 @@ if CONFIG['MOZ_XUL']: 'inDOMView.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/memory/build/moz.build b/memory/build/moz.build index 250ccb6af4e..c84af86f254 100644 --- a/memory/build/moz.build +++ b/memory/build/moz.build @@ -63,4 +63,7 @@ if CONFIG['MOZ_REPLACE_MALLOC'] and CONFIG['OS_TARGET'] == 'Darwin': # The zone allocator for OSX needs some jemalloc internal functions LOCAL_INCLUDES += ['/memory/jemalloc/src/include'] +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True diff --git a/memory/mozjemalloc/moz.build b/memory/mozjemalloc/moz.build index 2b223f4817a..41a033afbba 100644 --- a/memory/mozjemalloc/moz.build +++ b/memory/mozjemalloc/moz.build @@ -42,3 +42,5 @@ LOCAL_INCLUDES += [ '/memory/build', ] +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] diff --git a/memory/replace/dummy/moz.build b/memory/replace/dummy/moz.build index 7bc32fb1f3e..e86dd031344 100644 --- a/memory/replace/dummy/moz.build +++ b/memory/replace/dummy/moz.build @@ -12,3 +12,6 @@ SOURCES += [ SharedLibrary('dummy_replace_malloc') DISABLE_STL_WRAPPING = True + +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] diff --git a/memory/replace/jemalloc/moz.build b/memory/replace/jemalloc/moz.build index 861de37b3be..78c86a2bc84 100644 --- a/memory/replace/jemalloc/moz.build +++ b/memory/replace/jemalloc/moz.build @@ -33,3 +33,6 @@ if CONFIG['_MSC_VER']: LOCAL_INCLUDES += ['/memory/jemalloc/src/include/msvc_compat/C99'] DISABLE_STL_WRAPPING = True + +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] diff --git a/netwerk/protocol/app/moz.build b/netwerk/protocol/app/moz.build index f7f5ba9bcc2..86496d1044a 100644 --- a/netwerk/protocol/app/moz.build +++ b/netwerk/protocol/app/moz.build @@ -8,6 +8,9 @@ SOURCES += [ 'AppProtocolHandler.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index cead28fde58..2fe464fc16d 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -18,6 +18,9 @@ UNIFIED_SOURCES += [ 'nsDeviceProtocolHandler.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build index c178a184711..787f60a7ed8 100644 --- a/netwerk/protocol/viewsource/moz.build +++ b/netwerk/protocol/viewsource/moz.build @@ -15,6 +15,9 @@ UNIFIED_SOURCES += [ 'nsViewSourceHandler.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build index 130f96cf486..b2f103b57d1 100644 --- a/netwerk/socket/moz.build +++ b/netwerk/socket/moz.build @@ -21,6 +21,9 @@ UNIFIED_SOURCES += [ 'nsUDPSocketProvider.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/parser/xml/moz.build b/parser/xml/moz.build index bbc9c5596a0..b80db4c1770 100644 --- a/parser/xml/moz.build +++ b/parser/xml/moz.build @@ -35,4 +35,7 @@ SOURCES += [ FINAL_LIBRARY = 'xul' +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True diff --git a/storage/build/moz.build b/storage/build/moz.build index 968455a98cb..7084aebb494 100644 --- a/storage/build/moz.build +++ b/storage/build/moz.build @@ -12,6 +12,9 @@ SOURCES += [ 'mozStorageModule.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build index e8e48355827..a2cd35df199 100644 --- a/toolkit/components/mediasniffer/moz.build +++ b/toolkit/components/mediasniffer/moz.build @@ -18,6 +18,10 @@ UNIFIED_SOURCES += [ FINAL_LIBRARY = 'xul' +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True with Files('**'): diff --git a/view/moz.build b/view/moz.build index 226ac1e8075..703989f8a6a 100644 --- a/view/moz.build +++ b/view/moz.build @@ -15,6 +15,9 @@ SOURCES += [ 'nsViewManager.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build index c9aacf62560..f48932bd25b 100644 --- a/widget/gtkxtbin/moz.build +++ b/widget/gtkxtbin/moz.build @@ -17,3 +17,6 @@ FINAL_LIBRARY = 'xul' DEFINES['_IMPL_GTKXTBIN_API'] = True CFLAGS += CONFIG['MOZ_GTK2_CFLAGS'] + +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] diff --git a/widget/x11/moz.build b/widget/x11/moz.build index 94e95fa2f46..84b13e2a812 100644 --- a/widget/x11/moz.build +++ b/widget/x11/moz.build @@ -11,3 +11,6 @@ SOURCES += [ FINAL_LIBRARY = 'xul' CXXFLAGS += CONFIG['TK_CFLAGS'] + +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index 50f89f75f81..9f7756f7d81 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -68,6 +68,9 @@ SOURCES += [ 'Omnijar.cpp', ] +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index 564a02d0c4c..606021def3d 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -39,6 +39,9 @@ UNIFIED_SOURCES += [ 'nsNativeModuleLoader.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' diff --git a/xpcom/glue/standalone/moz.build b/xpcom/glue/standalone/moz.build index 4f24c50a31d..5ab1d245696 100644 --- a/xpcom/glue/standalone/moz.build +++ b/xpcom/glue/standalone/moz.build @@ -43,6 +43,9 @@ LOCAL_INCLUDES += [ # Don't use STL wrappers here (i.e. wrapped ); they require mozalloc DISABLE_STL_WRAPPING = True +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True # Include fallible for third party code using the xpcom glue diff --git a/xpcom/glue/standalone/staticruntime/moz.build b/xpcom/glue/standalone/staticruntime/moz.build index 2ed177f3b2f..ea3d7f0a1f6 100644 --- a/xpcom/glue/standalone/staticruntime/moz.build +++ b/xpcom/glue/standalone/staticruntime/moz.build @@ -38,6 +38,9 @@ USE_STATIC_LIBS = True # Don't use STL wrappers here (i.e. wrapped ); they require mozalloc DISABLE_STL_WRAPPING = True +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True # Include fallible for third party code using the xpcom glue diff --git a/xpcom/glue/staticruntime/moz.build b/xpcom/glue/staticruntime/moz.build index 595602b2941..5d8dd68fbe8 100644 --- a/xpcom/glue/staticruntime/moz.build +++ b/xpcom/glue/staticruntime/moz.build @@ -36,6 +36,9 @@ USE_STATIC_LIBS = True # Don't use STL wrappers here (i.e. wrapped ); they require mozalloc DISABLE_STL_WRAPPING = True +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True # Include fallible for third party code using the xpcom glue diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index 69208996e4d..09c640e3478 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -123,6 +123,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 'CocoaFileUtils.mm', ] +if CONFIG['GNU_CC']: + CFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') diff --git a/xpfe/components/build/moz.build b/xpfe/components/build/moz.build index 8508440ae99..ee61cb2df12 100644 --- a/xpfe/components/build/moz.build +++ b/xpfe/components/build/moz.build @@ -14,4 +14,7 @@ LOCAL_INCLUDES += [ '../directory', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FAIL_ON_WARNINGS = True diff --git a/xpfe/components/windowds/moz.build b/xpfe/components/windowds/moz.build index d576b100cdc..0840f6e8072 100644 --- a/xpfe/components/windowds/moz.build +++ b/xpfe/components/windowds/moz.build @@ -14,6 +14,9 @@ SOURCES += [ 'nsWindowDataSource.cpp', ] +if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wshadow'] + FINAL_LIBRARY = 'xul' FAIL_ON_WARNINGS = True