Bug 1185106 - Part 1: Exclude StoreBuffer.cpp from unified build to prevent build bustage. r=efaust
authorTerrence Cole <terrence@mozilla.com>
Tue, 28 Jul 2015 11:48:16 -0700
changeset 287102 48a35f84fb9dbc895ca66fcd1bbde5f85c9f90b9
parent 287101 890f4c8154fa21c4ea05cfd6002f67ce7d9d9d7e
child 287103 a69943dee0b21d1e69ccebd0a62d3c2da564536d
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersefaust
bugs1185106
milestone42.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 1185106 - Part 1: Exclude StoreBuffer.cpp from unified build to prevent build bustage. r=efaust
js/src/moz.build
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -168,17 +168,16 @@ UNIFIED_SOURCES += [
     'gc/Barrier.cpp',
     'gc/GCTrace.cpp',
     'gc/Iteration.cpp',
     'gc/Marking.cpp',
     'gc/Memory.cpp',
     'gc/Nursery.cpp',
     'gc/RootMarking.cpp',
     'gc/Statistics.cpp',
-    'gc/StoreBuffer.cpp',
     'gc/Tracer.cpp',
     'gc/Verifier.cpp',
     'gc/Zone.cpp',
     'irregexp/NativeRegExpMacroAssembler.cpp',
     'irregexp/RegExpAST.cpp',
     'irregexp/RegExpEngine.cpp',
     'irregexp/RegExpInterpreter.cpp',
     'irregexp/RegExpMacroAssembler.cpp',
@@ -334,19 +333,23 @@ UNIFIED_SOURCES += [
 # 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 pull rand_s
 # from <stdlib.h> on Windows through a preprocessor define.
 # jsutil.cpp cannot be built in unified mode because it is needed for
 # check-vanilla-allocations.
+# StoreBuffer.cpp cannot be built in unified because its template
+# instantiations may or may not be needed depending on what it gets bundled
+# with.
 SOURCES += [
     'builtin/RegExp.cpp',
     'frontend/Parser.cpp',
+    'gc/StoreBuffer.cpp',
     'jsarray.cpp',
     'jsatom.cpp',
     'jsmath.cpp',
     'jsutil.cpp',
 ]
 
 if CONFIG['JS_POSIX_NSPR']:
     UNIFIED_SOURCES += [