Bug 1535301 - turn off ICF for Windows builds; r=chmanchester a=pascalc
☠☠ backed out by d57904ef74cd ☠ ☠
authorNathan Froyd <froydnj@mozilla.com>
Mon, 08 Apr 2019 18:19:39 +0200
changeset 523104 1ec10dce28e2587acb3329f89b600555ce54e315
parent 523103 4a094d23761cc23c04460fb6373beee85542c069
child 523105 828f8931afe0bc0f686c5a9143ce953c1f086587
push id11057
push userarchaeopteryx@coole-files.de
push dateWed, 10 Apr 2019 14:56:16 +0000
treeherdermozilla-beta@590d0706d113 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester, pascalc
bugs1535301
milestone67.0
Bug 1535301 - turn off ICF for Windows builds; r=chmanchester a=pascalc We're doing this to try and gather some information on crashes that have stacks affected by ICF, particularly on beta. We plan to revert this patch after we've gathered crashes for a day or two. Differential Revision: https://phabricator.services.mozilla.com//D26765
python/mozbuild/mozbuild/frontend/context.py
python/mozbuild/mozbuild/test/frontend/test_emitter.py
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -411,17 +411,17 @@ class LinkFlags(BaseCompileFlags):
 
         # TODO: This is pretty convoluted, and isn't really a per-context thing,
         # configure would be a better place to aggregate these.
         if all([self._context.config.substs.get('OS_ARCH') == 'WINNT',
                 not self._context.config.substs.get('GNU_CC'),
                 not self._context.config.substs.get('MOZ_DEBUG')]):
 
             if self._context.config.substs.get('MOZ_OPTIMIZE'):
-                flags.append('-OPT:REF,ICF')
+                flags.append('-OPT:REF')
 
         return flags
 
 
 class CompileFlags(BaseCompileFlags):
     def __init__(self, context):
         main_src_dir = mozpath.dirname(context.main_path)
         self._context = context
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -272,32 +272,32 @@ class TestEmitterBasic(unittest.TestCase
             'MOZ_DEBUG_LDFLAGS': ['-DEBUG'],
             'MOZ_DEBUG_SYMBOLS': '1',
             'MOZ_OPTIMIZE_FLAGS': [],
             'MOZ_OPTIMIZE_LDFLAGS': [],
         })
         sources, ldflags, lib, compile_flags = self.read_topsrcdir(reader)
         self.assertIsInstance(ldflags, ComputedFlags)
         self.assertIn('-DEBUG', ldflags.flags['OS'])
-        self.assertIn('-OPT:REF,ICF', ldflags.flags['OS'])
+        self.assertIn('-OPT:REF', ldflags.flags['OS'])
 
     def test_windows_dmd_link_flags(self):
         reader = self.reader('link-flags', extra_substs={
             'OS_ARCH': 'WINNT',
             'GNU_CC': '',
             'MOZ_DMD': '1',
             'MOZ_DEBUG_LDFLAGS': ['-DEBUG'],
             'MOZ_DEBUG_SYMBOLS': '1',
             'MOZ_OPTIMIZE': '1',
             'MOZ_OPTIMIZE_FLAGS': [],
         })
         sources, ldflags, lib, compile_flags = self.read_topsrcdir(reader)
         self.assertIsInstance(ldflags, ComputedFlags)
         self.assertEqual(ldflags.flags['OS'],
-                         ['-DEBUG', '-OPT:REF,ICF'])
+                         ['-DEBUG', '-OPT:REF'])
 
     def test_host_compile_flags(self):
         reader = self.reader('host-compile-flags', extra_substs={
             'HOST_CXXFLAGS': ['-Wall', '-Werror'],
             'HOST_CFLAGS': ['-Werror', '-Wall'],
         })
         sources, ldflags, flags, lib, target_flags = self.read_topsrcdir(reader)
         self.assertIsInstance(flags, ComputedFlags)