Bug 1479842: Don't PGO gfxFontInfoLoader.cpp with clang-cl. r=froydnj
authorDavid Major <dmajor@mozilla.com>
Wed, 01 Aug 2018 15:10:13 -0400
changeset 429711 d87a527914e1b9385d36f0cf1f9c8d41b177af72
parent 429710 ef88a6a743c26fce23c121d5c3372cebc0448032
child 429712 96504aefa81f2bd3a0c7daaa17043a20db48e59b
push id34372
push usernerli@mozilla.com
push dateThu, 02 Aug 2018 08:55:28 +0000
treeherdermozilla-central@bd79b07f57a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1479842
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1479842: Don't PGO gfxFontInfoLoader.cpp with clang-cl. r=froydnj
gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -171,34 +171,39 @@ if CONFIG['INTEL_ARCHITECTURE']:
 SOURCES += [
     # Includes mac system header conflicting with point/size,
     # and includes glxXlibSurface.h which drags in Xrender.h
     'gfxASurface.cpp',
     # on X11, gfxDrawable.cpp includes X headers for an old workaround which
     # we could consider removing soon (affects Ubuntus older than 10.04 LTS)
     # which currently prevent it from joining UNIFIED_SOURCES.
     'gfxDrawable.cpp',
+    # gfxFontInfoLoader.cpp needs to set no_pgo for clang-cl
+    'gfxFontInfoLoader.cpp',
     # gfxFontUtils.cpp and gfxPlatform.cpp include mac system header conflicting with point/size
     'gfxFontUtils.cpp',
     'gfxPlatform.cpp',
     'gfxPrefs.cpp',
     'PrintTarget.cpp',
     'PrintTargetThebes.cpp',
 ]
 
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    # clang-cl crashes trying to PGO this file (Bug 1479842)
+    SOURCES['gfxFontInfoLoader.cpp'].no_pgo = True
+
 UNIFIED_SOURCES += [
     'CJKCompatSVS.cpp',
     'gfxAlphaRecovery.cpp',
     'gfxBaseSharedMemorySurface.cpp',
     'gfxBlur.cpp',
     'gfxContext.cpp',
     'gfxFont.cpp',
     'gfxFontEntry.cpp',
     'gfxFontFeatures.cpp',
-    'gfxFontInfoLoader.cpp',
     'gfxFontMissingGlyphs.cpp',
     'gfxFontSrcPrincipal.cpp',
     'gfxFontSrcURI.cpp',
     'gfxGlyphExtents.cpp',
     'gfxGradientCache.cpp',
     'gfxGraphiteShaper.cpp',
     'gfxHarfBuzzShaper.cpp',
     'gfxImageSurface.cpp',