From 0007daf65b0951b15f453808124d0740d0400892 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 14 Mar 2018 20:35:43 -0400
Subject: [PATCH] Backed out changeset 1ec0f839a905 (bug 1086964) for mass Win7
 debug test failures.

---
 gfx/layers/moz.build                     | 12 ++++++++++--
 js/src/moz.build                         |  8 +++++++-
 netwerk/sctp/datachannel/moz.build       |  2 ++
 netwerk/sctp/src/moz.build               |  2 ++
 xpcom/reflect/xptcall/md/unix/moz.build  |  2 ++
 xpcom/reflect/xptcall/md/win32/moz.build |  1 +
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index b81f0de7f694..ed9fb8f0cada 100755
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -422,13 +422,11 @@ UNIFIED_SOURCES += [
     'ipc/UiCompositorControllerParent.cpp',
     'ipc/VideoBridgeChild.cpp',
     'ipc/VideoBridgeParent.cpp',
-    'Layers.cpp',
     'LayerScope.cpp',
     'LayersHelpers.cpp',
     'LayersLogging.cpp',
     'LayerSorter.cpp',
     'LayersTypes.cpp',
-    'LayerTreeInvalidation.cpp',
     'mlgpu/BufferCache.cpp',
     'mlgpu/CanvasLayerMLGPU.cpp',
     'mlgpu/ContainerLayerMLGPU.cpp',
@@ -482,6 +480,8 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'basic/BasicImageLayer.cpp',
     'ImageContainer.cpp',
+    'Layers.cpp',
+    'LayerTreeInvalidation.cpp',
     'PersistentBufferProvider.cpp',
     'protobuf/LayerScopePacket.pb.cc',
     'wr/WebRenderTextureHost.cpp',
@@ -490,6 +490,14 @@ SOURCES += [
 DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
 
+# Workaround compiler bug (Bug 795594)
+if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl') and CONFIG['CPU_ARCH'] == 'x86_64':
+    for src in [
+        'Layers.cpp',
+        'LayerTreeInvalidation.cpp',
+    ]:
+        SOURCES[src].no_pgo = True
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'basic/MacIOSurfaceTextureHostBasic.cpp',
diff --git a/js/src/moz.build b/js/src/moz.build
index cc418122c590..9195cdb086de 100755
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -180,7 +180,6 @@ UNIFIED_SOURCES += [
     'builtin/Promise.cpp',
     'builtin/Reflect.cpp',
     'builtin/ReflectParse.cpp',
-    'builtin/RegExp.cpp',
     'builtin/SIMD.cpp',
     'builtin/Stream.cpp',
     'builtin/String.cpp',
@@ -415,6 +414,8 @@ UNIFIED_SOURCES += [
 
 # builtin/Array.cpp and vm/JSAtom.cpp cannot be built in unified mode because
 #   xpcshell is broken during packaging when compiled with gcc-4.8.2
+# builtin/RegExp.cpp cannot be built in unified mode because it is built
+#   without PGO
 # frontend/Parser.cpp cannot be built in unified mode because of explicit
 #   template instantiations.
 # jsmath.cpp cannot be built in unified mode because it needs to re-#define the
@@ -430,6 +431,7 @@ UNIFIED_SOURCES += [
 #   files unlucky enough to be unified with it.
 SOURCES += [
     'builtin/Array.cpp',
+    'builtin/RegExp.cpp',
     'frontend/Parser.cpp',
     'gc/StoreBuffer.cpp',
     'jsmath.cpp',
@@ -722,6 +724,10 @@ if CONFIG['MOZ_LINKER']:
     DEFINES['MOZ_LINKER'] = True
 
 if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
+    if CONFIG['CPU_ARCH'] == 'x86':
+        SOURCES['builtin/RegExp.cpp'].no_pgo = True # Bug 772303
+    elif CONFIG['CPU_ARCH'] == 'x86_64' and CONFIG['JS_HAS_CTYPES']:
+        SOURCES['ctypes/CTypes.cpp'].no_pgo = True # Bug 810661
     # Prevent floating point errors caused by VC++ optimizations
     # XXX We should add this to CXXFLAGS, too?
     CFLAGS += ['-fp:precise']
diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build
index 8a5735a1b419..52cf72908545 100644
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -30,5 +30,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':
 else:
     DEFINES['__Userspace_os_%s' % CONFIG['OS_TARGET']] = 1
 
+NO_PGO = True # Don't PGO
+
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build
index 6564496e40e0..dd2af17ba81a 100644
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -86,5 +86,7 @@ if CONFIG['OS_TARGET'] == 'OpenBSD':
 if CONFIG['OS_TARGET'] == 'DragonFly':
     DEFINES['__DragonFly__'] = False
 
+NO_PGO = True # Don't PGO
+
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CFLAGS += ['-std=gnu99']
diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build
index 6fdb19ad1d90..4c2c35f53631 100644
--- a/xpcom/reflect/xptcall/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/md/unix/moz.build
@@ -332,3 +332,5 @@ LOCAL_INCLUDES += [
     '../..',
     '/xpcom/reflect/xptinfo',
 ]
+
+NO_PGO = True
diff --git a/xpcom/reflect/xptcall/md/win32/moz.build b/xpcom/reflect/xptcall/md/win32/moz.build
index 6e782e70368f..7c91bbcace14 100644
--- a/xpcom/reflect/xptcall/md/win32/moz.build
+++ b/xpcom/reflect/xptcall/md/win32/moz.build
@@ -34,6 +34,7 @@ else:
             'xptcinvoke_asm_x86_msvc.asm',
             'xptcstubs.cpp',
         ]
+        SOURCES['xptcinvoke.cpp'].no_pgo = True
         SOURCES['xptcinvoke_asm_x86_msvc.asm'].flags += ['-safeseh']
 
 FINAL_LIBRARY = 'xul'