Bug 1090497 - Re-enable warnings as errors on clang-cl. r=froydnj

--HG-- extra : rebase_source : a62521fdc66def4e4d5d7bf52e68365a786b5c55 extra : source : ca1b9a2bcc4381795f556fea2fb59066567c30f3
2024-11-24 13:21:05 +00:00 · 2018-07-31 22:10:07 +09:00 · 2018-07-31 22:10:07 +09:00 · feea19030c
commit feea19030c
parent e77355efc0
74 changed files with 213 additions and 8 deletions
--- a/accessible/base/moz.build
+++ b/accessible/base/moz.build
@ -114,3 +114,6 @@ include('/ipc/chromium/chromium-config.mozbuild')

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/accessible/generic/moz.build
+++ b/accessible/generic/moz.build
@ -70,3 +70,6 @@ include('/ipc/chromium/chromium-config.mozbuild')

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/accessible/ipc/moz.build
+++ b/accessible/ipc/moz.build
@ -62,3 +62,6 @@ FINAL_LIBRARY = 'xul'

 # Add libFuzzer configuration directives
 include('/tools/fuzzing/libfuzzer-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/accessible/ipc/win/handler/moz.build
+++ b/accessible/ipc/win/handler/moz.build
@ -83,3 +83,5 @@ LIBRARY_DEFINES['_UNICODE'] = True
 LIBRARY_DEFINES['MOZ_NO_MOZALLOC'] = True
 DisableStlWrapping()

+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/accessible/ipc/win/moz.build
+++ b/accessible/ipc/win/moz.build
@ -55,3 +55,6 @@ if CONFIG['ACCESSIBILITY']:
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/accessible/windows/msaa/moz.build
+++ b/accessible/windows/msaa/moz.build
@ -84,3 +84,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/accessible/windows/sdn/moz.build
+++ b/accessible/windows/sdn/moz.build
@ -22,3 +22,6 @@ LOCAL_INCLUDES += [
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/accessible/xpcom/moz.build
+++ b/accessible/xpcom/moz.build
@ -64,3 +64,6 @@ include('/ipc/chromium/chromium-config.mozbuild')

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/browser/app/winlauncher/moz.build
+++ b/browser/app/winlauncher/moz.build
@ -25,3 +25,6 @@ TEST_DIRS += [
 ]

 DisableStlWrapping()
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/browser/app/winlauncher/test/moz.build
+++ b/browser/app/winlauncher/test/moz.build
@ -15,3 +15,6 @@ LOCAL_INCLUDES += [
 OS_LIBS += [
    'ntdll',
 ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/build/win32/moz.build
+++ b/build/win32/moz.build
@ -32,3 +32,6 @@ if CONFIG['LLVM_SYMBOLIZER'] and CONFIG['WIN_DIA_SDK_BIN_DIR']:
    FINAL_TARGET_FILES += [
        '%%%s/msdia140.dll' % CONFIG['WIN_DIA_SDK_BIN_DIR']
    ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -510,3 +510,6 @@ counterlist.inputs = ['UseCounters.conf']

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/media/fake-cdm/moz.build
+++ b/dom/media/fake-cdm/moz.build
@ -30,3 +30,6 @@ NoVisibilityFlags()
 # Don't use STL wrappers; this isn't Gecko code
 DisableStlWrapping()
 NO_PGO = True
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/media/gmp/moz.build
+++ b/dom/media/gmp/moz.build
@ -148,3 +148,6 @@ LOCAL_INCLUDES += [

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/media/gtest/moz.build
+++ b/dom/media/gtest/moz.build
@ -79,3 +79,6 @@ FINAL_LIBRARY = 'xul-gtest'

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@ -92,3 +92,6 @@ CXXFLAGS += CONFIG['TK_CFLAGS']

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@ -155,3 +155,6 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):

    # 'type cast': conversion from 'unsigned int' to 'HIMC' of greater size
    CXXFLAGS += ['-wd4312']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@ -68,3 +68,6 @@ else:

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/dom/storage/moz.build
+++ b/dom/storage/moz.build
@ -49,3 +49,6 @@ LOCAL_INCLUDES += [

 if CONFIG['ENABLE_TESTS']:
    DEFINES['DOM_STORAGE_TESTS'] = True
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@ -255,3 +255,5 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
        '/gfx/skia/skia/src/gpu',
    ]

+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@ -166,3 +166,6 @@ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@ -583,3 +583,6 @@ if CONFIG['MOZ_ENABLE_SKIA']:
  UNIFIED_SOURCES += [
    'composite/PaintCounter.cpp',
  ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@ -293,3 +293,6 @@ DEFINES['GRAPHITE2_STATIC'] = True
 if CONFIG['CC_TYPE'] == 'clang':
    # Suppress warnings from Skia header files.
    SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/gfx/vr/moz.build
+++ b/gfx/vr/moz.build
@ -97,3 +97,6 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
    # ovr_capi_dynamic.h '<unnamed-tag>': Alignment specifier is less than
    # actual alignment (8), and will be ignored
    CXXFLAGS += ['-wd4359']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/gfx/webrender_bindings/moz.build
+++ b/gfx/webrender_bindings/moz.build
@ -66,3 +66,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@ -152,3 +152,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):

 # Add libFuzzer configuration directives
 include('/tools/fuzzing/libfuzzer-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/ipc/ipdl/moz.build
+++ b/ipc/ipdl/moz.build
@ -19,3 +19,6 @@ CXXFLAGS += CONFIG['TK_CFLAGS']

 # Add libFuzzer configuration directives
 include('/tools/fuzzing/libfuzzer-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1479779
--- a/ipc/mscom/moz.build
+++ b/ipc/mscom/moz.build
@ -86,3 +86,6 @@ FINAL_LIBRARY = 'xul'

 with Files("**"):
    BUG_COMPONENT = ("Core", "IPC: MSCOM")
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/ipc/mscom/oop/moz.build
+++ b/ipc/mscom/oop/moz.build
@ -37,3 +37,6 @@ FORCE_STATIC_LIB = True
 # This DLL may be loaded into other processes, so we need static libs for
 # Windows 7 and Windows 8.
 USE_STATIC_LIBS = True
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/layout/painting/moz.build
+++ b/layout/painting/moz.build
@ -75,3 +75,6 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/media/gmp-clearkey/0.1/moz.build
+++ b/media/gmp-clearkey/0.1/moz.build
@ -78,3 +78,6 @@ elif CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
    CFLAGS += [
        '-FI', 'stdio.h',           # for sprintf() prototype
    ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/media/mtransport/common.build
+++ b/media/mtransport/common.build
@ -93,3 +93,6 @@ DEFINES['R_DEFINED_UINT8'] = 'uint64_t'

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/media/mtransport/third_party/nICEr/nicer.gyp
+++ b/media/mtransport/third_party/nICEr/nicer.gyp
@ -207,6 +207,7 @@
              # Windows, clang-cl build
              [ 'clang_cl == 1', {
                'cflags_mozilla': [
+                    '-Wno-error', # workaround for bug 1090497
                    '-Xclang',
                    '-Wall',
                    '-Wno-parentheses',
--- a/media/mtransport/third_party/nrappkit/nrappkit.gyp
+++ b/media/mtransport/third_party/nrappkit/nrappkit.gyp
@ -204,6 +204,7 @@
              # Windows, clang-cl build
              [ 'clang_cl == 1', {
                'cflags_mozilla': [
+                    '-Wno-error', # workaround for bug 1090497
                    '-Xclang',
                    '-Wall',
                    '-Wno-parentheses',
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@ -53,3 +53,6 @@ if CONFIG['MOZ_REPLACE_MALLOC_STATIC']:
    DEFINES['MOZ_REPLACE_MALLOC_STATIC'] = True

 DisableStlWrapping()
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/memory/replace/logalloc/moz.build
+++ b/memory/replace/logalloc/moz.build
@ -28,3 +28,6 @@ if CONFIG['OS_TARGET'] == 'Android' and FORCE_SHARED_LIB:
 DIRS += [
    'replay',
 ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/memory/replace/moz.build
+++ b/memory/replace/moz.build
@ -18,3 +18,6 @@ DIRS += [

 if CONFIG['MOZ_DMD']:
    DIRS += ['dmd']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@ -134,3 +134,6 @@ if CONFIG['MOZ_LINKER'] and CONFIG['CPU_ARCH'] == 'arm':
    LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR]

 DIST_INSTALL = True
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/mozglue/tests/interceptor/moz.build
+++ b/mozglue/tests/interceptor/moz.build
@ -21,3 +21,6 @@ if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CC_TYPE'] == 'gcc':
    LDFLAGS += [
        '-municode',
    ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@ -306,3 +306,6 @@ LOCAL_INCLUDES += [

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@ -55,3 +55,6 @@ FINAL_LIBRARY = 'xul'

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@ -143,3 +143,6 @@ if CONFIG['OS_TARGET'] == 'Darwin':
        DEFINES.update(
            HAS_CONNECTX=True,
        )
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@ -54,3 +54,6 @@ if CONFIG['NECKO_WIFI_DBUS']:
    CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']

 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/old-configure.in
+++ b/old-configure.in
@ -1041,12 +1041,7 @@ case "$target" in
        CXXFLAGS="$CXXFLAGS -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
        LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib secur32.lib"
        MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
-        # -Werror is disabled on clang-cl until bug 1090497 cleans up the noise.
-        if test -n "$CLANG_CL"; then
-            WARNINGS_AS_ERRORS=''
-        else
-            WARNINGS_AS_ERRORS='-WX'
-        fi
+        WARNINGS_AS_ERRORS='-WX'
        # Use a higher optimization level for clang-cl, so we can come closer
        # to MSVC's performance numbers (see bug 1443590).
        if test -n "$CLANG_CL"; then
--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@ -144,3 +144,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    ]

 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@ -219,3 +219,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += [
        '-Wno-unused-parameter',
    ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/security/pkix/test/gtest/moz.build
+++ b/security/pkix/test/gtest/moz.build
@ -70,3 +70,6 @@ elif CONFIG['CC_TYPE'] == 'msvc':
    # declaration of '*' hides class member
    '-wd4458',
  ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/security/pkix/warnings.mozbuild
+++ b/security/pkix/warnings.mozbuild
@ -10,6 +10,8 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
    '-Wno-reserved-id-macro', # NSPR and NSS use reserved IDs in their include guards.
    '-Wno-weak-vtables', # We rely on the linker to merge the duplicate vtables.
  ]
+  if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
 elif CONFIG['CC_TYPE'] == 'msvc':
  CXXFLAGS += [
    '-sdl', # Enable additional security checks based on Microsoft's SDL.
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@ -178,3 +178,6 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
            '-wd4311', # 'reinterpret_cast': pointer truncation from 'LPOVERLAPPED' to 'DWORD'
            '-wd4312', # 'reinterpret_cast': conversion from 'DWORD' to 'LPOVERLAPPED' of greater size
        ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/security/sandbox/win/src/sandboxbroker/moz.build
+++ b/security/sandbox/win/src/sandboxbroker/moz.build
@ -19,3 +19,6 @@ LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
 LOCAL_INCLUDES += ['/security/sandbox/chromium']

 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/testing/tools/fileid/moz.build
+++ b/testing/tools/fileid/moz.build
@ -38,3 +38,5 @@ if CONFIG['OS_ARCH'] == 'Linux' or CONFIG['OS_ARCH'] == 'Darwin':
        '/toolkit/crashreporter/google-breakpad/src',
    ]

+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/testing/tools/minidumpwriter/moz.build
+++ b/testing/tools/minidumpwriter/moz.build
@ -17,3 +17,6 @@ if CONFIG['ENABLE_TESTS'] and CONFIG['CPU_ARCH'] == 'x86_64' and CONFIG['OS_ARCH
        WIN32_EXE_LDFLAGS += ['-municode']

 NO_PGO = True
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@ -37,3 +37,6 @@ if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS']:
    LOCAL_INCLUDES += [
        '../parentalcontrols',
    ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/components/extensions/moz.build
+++ b/toolkit/components/extensions/moz.build
@ -98,3 +98,6 @@ with Files('docs/**'):
    SCHEDULES.exclusive = ['docs']

 include('/ipc/chromium/chromium-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/components/jsoncpp/src/lib_json/moz.build
+++ b/toolkit/components/jsoncpp/src/lib_json/moz.build
@ -51,3 +51,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl', 'gcc'):
    CXXFLAGS += [
        '-Wno-implicit-fallthrough',
    ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/components/maintenanceservice/moz.build
+++ b/toolkit/components/maintenanceservice/moz.build
@ -47,3 +47,6 @@ OS_LIBS += [

 with Files('**'):
    BUG_COMPONENT = ('Toolkit', 'Application Update')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/components/reputationservice/moz.build
+++ b/toolkit/components/reputationservice/moz.build
@ -42,3 +42,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += ['-Wno-shadow']

 include('/ipc/chromium/chromium-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@ -98,3 +98,6 @@ with Files('docs/**'):
    SCHEDULES.exclusive = ['docs']

 include('/ipc/chromium/chromium-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/components/url-classifier/tests/gtest/moz.build
+++ b/toolkit/components/url-classifier/tests/gtest/moz.build
@ -36,3 +36,6 @@ if CONFIG['NIGHTLY_BUILD'] or CONFIG['MOZ_DEBUG']:
    DEFINES['MOZ_SAFEBROWSING_DUMP_FAILED_UPDATES'] = True

 FINAL_LIBRARY = 'xul-gtest'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@ -98,3 +98,6 @@ RCINCLUDE = 'crashreporter.rc'
 DisableStlWrapping()

 include('/toolkit/crashreporter/crashreporter.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build
@ -61,3 +61,6 @@ Library('breakpad_processor')
 DisableStlWrapping()

 include('/toolkit/crashreporter/crashreporter.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@ -128,3 +128,6 @@ else:

 with Files('**'):
    BUG_COMPONENT = ('Toolkit', 'Crash Reporting')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@ -58,3 +58,6 @@ NO_PGO = True
 # Temporary workaround for an issue in upstream breakpad
 if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
    CXXFLAGS += ['-wd4334']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@ -50,3 +50,6 @@ SOURCES += [
    'readstrings.cpp',
    'updatecommon.cpp',
 ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/mozapps/update/updater/updater-common.build
+++ b/toolkit/mozapps/update/updater/updater-common.build
@ -114,3 +114,5 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 if CONFIG['CC_TYPE'] == 'gcc':
    CXXFLAGS += ['-Wno-format-truncation']

+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/system/windowsDHCPClient/moz.build
+++ b/toolkit/system/windowsDHCPClient/moz.build
@ -15,4 +15,7 @@ SOURCES += [
    'WindowsNetworkFunctionsWrapper.cpp'
 ]

-FINAL_LIBRARY = 'xul'
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/system/windowsDHCPClient/tests/gtest/moz.build
+++ b/toolkit/system/windowsDHCPClient/tests/gtest/moz.build
@ -18,4 +18,7 @@ LOCAL_INCLUDES += [
 FINAL_LIBRARY = 'xul-gtest'

 if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wshadow']
+    CXXFLAGS += ['-Wshadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@ -234,3 +234,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):

 if CONFIG['MOZ_IPDL_TESTS']:
    DEFINES['MOZ_IPDL_TESTS'] = True
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/toolkit/xre/test/win/moz.build
+++ b/toolkit/xre/test/win/moz.build
@ -23,3 +23,6 @@ OS_LIBS += [
    'shell32',
    'ws2_32',
 ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@ -153,3 +153,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):

 with Files('**'):
    BUG_COMPONENT = ('Core', 'Gecko Profiler')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@ -166,3 +166,6 @@ OS_LIBS += [
 if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
    # C5038: Suppress initializer list order warnings from wrl.h
    SOURCES['WindowsUIUtils.cpp'].flags += ['-wd5038']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/xpcom/glue/objs.mozbuild
+++ b/xpcom/glue/objs.mozbuild
@ -19,3 +19,6 @@ xpcom_gluens_src_lcppsrcs = [
 xpcom_gluens_src_cppsrcs = [
    '/xpcom/glue/%s' % s for s in xpcom_gluens_src_lcppsrcs
 ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@ -157,3 +157,6 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
    # '_snwprintf' : format string '%s' requires an argument of type 'wchar_t *',
    # but variadic argument 3 has type 'char16ptr_t'
    CXXFLAGS += ['-wd4477']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@ -119,3 +119,6 @@ LOCAL_INCLUDES += [
 FINAL_LIBRARY = 'xul'

 include('/ipc/chromium/chromium-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497