Commit Graph

57731 Commits

Author SHA1 Message Date
Jeff Walden
2afe6227ce Bug 1296814 - Split out Parser::strictError for the two calls that don't pass |bool strict = false|, so that |bool strict| can be removed from the current signature. r=arai
--HG--
extra : rebase_source : 061e1d88515399cb8824d3d12857e84c1c0e8b00
2016-11-07 15:23:17 -08:00
Jeff Walden
3b14786056 Bug 1296814 - Split Parser::report into Parser::zeport (a temporary name) that uses the current offset, and Parser::reportWithNode that derives it from a Node. r=arai
--HG--
extra : rebase_source : 4943a81cf142960826ca07cadbac7797bbce3612
2016-11-07 15:23:17 -08:00
Jeff Walden
8d34045c4f Bug 1296814 - When |continue x| is found outside of a loop, report an error that points at |continue|, not at |x|. r=arai
--HG--
extra : rebase_source : 0ede7c8dee7f9b4a2de756ac880826d37560b0b1
2016-11-07 15:23:16 -08:00
Jeff Walden
c2e73e8629 Bug 1296814 - Don't use ParseHandler::getPosition in a FullParseHandler-specialized function -- just use pn_pos directly. r=anba
--HG--
extra : rebase_source : 784b33df6e6cab03e12f62058c8baa7dc417e9f4
2016-11-07 15:23:16 -08:00
Jeff Walden
7f88dac912 Bug 1296814 - Give correct position information to prototype mutation when syntax-parsing. r=arai
--HG--
extra : rebase_source : c83a02756108b82402d269a9fb0901d40069a3f0
2016-11-07 15:23:16 -08:00
Jeff Walden
0d2eccb89a Bug 1296814 - Give correct position information to pending errors during potential destructuring patterns. r=arai
--HG--
extra : rebase_source : 27538a0a1acea83b6385d34a8826e27d5f4a9968
2016-11-07 15:23:16 -08:00
Jeff Walden
86485c20b3 Bug 1296814 - Implement TokenStream::peekOffset for cases where peekTokenPos was used only to get an offset. r=anba
--HG--
extra : rebase_source : 1f556413cec5d53d35f2ff8def283fb23ddf47b5
2016-11-07 15:23:18 -08:00
Kausam
6594918046 Bug 1310045 - When a non-property-name token is observed instead of a property name in an object/class literal or destructuring pattern, indicate the unexpected token the way most unexpected tokens are indicated using JSMSG_UNEXPECTED_TOKEN. r=jwalden
--HG--
extra : rebase_source : 51331ed501dd653bca17b5134d975cee9cd08eec
2016-11-06 15:52:46 +05:30
Jeff Walden
a6268015a3 Bug 1315815 - Don't treat async or await as a keyword when they contain escapes. r=anba
--HG--
extra : rebase_source : 2122a2add6fe01a4fa52e4bc76e516d765dcc565
2016-11-07 15:21:36 -08:00
Jeff Walden
9819dd23b6 Bug 1305566 - Add testing of names in the destructuring context to the main reserved-word/keyword test. r=test
--HG--
extra : rebase_source : 4047a0378a1f01ebe9fbb3830afd9d0bf8b1af8f
2016-09-09 16:12:19 -07:00
David Major
7304bbd490 Bug 1314169: Move the WasmFaultHandler to last priority on Windows ASan builds. r=luke
Win64 ASan relies on a VectoredExceptionHandler to create shadow memory regions on demand. If WasmFaultHandler gets the exception first, it can itself fault while looking at shadow memory, leading to an infinite recursion.

Unfortunately, due to an ordering problem, we also have to disable the MemoryProtectionExceptionHandler when we do this.

MozReview-Commit-ID: aHwnBFI6dG

--HG--
extra : rebase_source : 77365c9f3afc9077a52df547c3372653a9d36afb
2016-11-14 10:37:47 -06:00
Nicolas B. Pierron
384aa6e996 Bug 1316830 - FoldLinearArith: Do not set new additions as truncated by default. r=h4writer 2016-11-14 15:18:07 +00:00
Nicolas B. Pierron
40ea799982 Bug 1314614 - Replace GetCurrentProcessId calls by getpid. r=h4writer 2016-11-14 11:18:14 +00:00
Luke Wagner
392e723d67 Bug 1317033 - Baldr: hoist mprotect out of MacroAssembler::patchCall/FarJump (r=sunfish)
MozReview-Commit-ID: Nejpro1fxc
2016-11-13 13:21:49 -06:00
Luke Wagner
19ae114a83 Bug 1317033 - Baldr: allow 2*num-cores outstanding tasks (r=sunfish)
MozReview-Commit-ID: 5G8ZBUoHBt9
2016-11-13 13:21:03 -06:00
Luke Wagner
382fd64a5c Bug 1317033 - Baldr: give OpIter Vectors an inline capacity (r=sunfish)
MozReview-Commit-ID: L22p9PXHF0O
2016-11-13 13:20:28 -06:00
Tooru Fujisawa
54c85b62f0 Bug 1317085 - Part 3: Add testcase for relazification. r=till 2016-11-13 07:59:38 +09:00
Tooru Fujisawa
31a2eca03e Bug 1317085 - Part 2: Throw error when cloning async function. r=till 2016-11-13 07:59:38 +09:00
Tooru Fujisawa
aa70f76e14 Bug 1317085 - Part 1: Handle async function flag in XDR. r=till 2016-11-13 07:59:38 +09:00
Tom Schuster
e5bfbcecf4 Bug 1316913 - Warn about ArrayBuffer.slice. r=till 2016-11-12 19:26:25 +01:00
Tooru Fujisawa
93aa351fcb Bug 1021835 - followup: Skip test that needs drainJobQueue in jsreftest. r=bustage
--HG--
extra : amend_source : 4b870064639a2721616d69fa4ffc5499cbdf1984
2016-11-13 01:36:57 +09:00
Tooru Fujisawa
2da73f6075 Bug 1021835 - Part 4: Add testcases for primitive iterator. r=evilpie 2016-11-13 00:40:29 +09:00
Tooru Fujisawa
08f43c0396 Bug 1021835 - Part 3: Use "iterator" instead of "iterable" in the error message for iterator. r=evilpie 2016-11-13 00:40:29 +09:00
Tooru Fujisawa
81b6c3004f Bug 1021835 - Part 2: Do not convert iterable[@@iterator]() value to object in ForOfIterator::init. r=till 2016-11-13 00:40:29 +09:00
Tooru Fujisawa
aead8a332b Bug 1021835 - Part 1: Emit JSOP_CHECKISOBJ after GetIterator in byte code. r=evilpie 2016-11-13 00:40:28 +09:00
Luke Wagner
57bcef4db9 Bug 1316651 - Baldr: rename Expr to Op (r=sunfish)
MozReview-Commit-ID: Bsn7uC1axkh
2016-11-11 13:53:15 -06:00
Luke Wagner
1197e12f31 Bug 1316651 - Baldr: change decoding of enumerated values (r=sunfish)
MozReview-Commit-ID: AUGzgO2rqyQ
2016-11-11 13:52:10 -06:00
Andrea Marchesini
2aba798852 Bug 1303518 - Remove the chrome only constructor for File, r=qdot 2016-11-11 18:56:44 +01:00
Luke Wagner
542fd41920 Bug 1313180 - Baldr: fix accidental disabling of asm.js when wasm is disabled (r=sunfish)
MozReview-Commit-ID: 3Fc7ywvmLif
2016-11-11 11:46:29 -06:00
Carsten "Tomcat" Book
cc5d30c616 Merge mozilla-central to mozilla-inbound
--HG--
extra : rebase_source : 658b3ffdfa71afff2d44129f50e50e2fbecbd06e
2016-11-11 16:43:07 +01:00
Jan de Mooij
877f6fdac6 Bug 1099054 - Fix bogus error messages caused by the decompiler falling back to the current pc. r=nbp 2016-11-11 12:52:33 +01:00
Lars T Hansen
0c67869ab8 Bug 1316843 - annotate TODO items with bugzilla references. r=me DONTBUILD
--HG--
extra : rebase_source : 39297b8f8443b18efd52ce40264dd2bccaa3bc01
extra : amend_source : 0c7881dcb6ee8282d0d6340c1b6001f96d46d42b
2016-11-11 12:47:27 +01:00
Tom Tromey
7a77ebc473 Bug 1254295 - add "flushregs" advice to unwinder instructions; r=nbp
MozReview-Commit-ID: A0jtO5yj4Og

--HG--
extra : rebase_source : acfd6020ea2f298583eefa5907ec08024622f423
2016-10-31 11:38:46 -06:00
Tom Tromey
d4e5a0320e Bug 1254295 - fix a few typos in JS headers; r=nbp
MozReview-Commit-ID: 3do0PIwCyOy

--HG--
extra : rebase_source : e1cd3c71ec4484837f7452d3cfcd241fd8f63973
2016-10-27 08:39:56 -06:00
Benjamin Bouvier
4bc86d8a6e Bug 1316635: Remove dead oldElems arguments; r=luke
MozReview-Commit-ID: KLRWsAC2Nbu
2016-11-10 18:43:51 +01:00
Benjamin Bouvier
ef4c3e27bd Bug 1316635: Remove AstDecode from AstDecodeGenerate{Ref,Name}; r=luke
MozReview-Commit-ID: FpmhtCQvUAj
2016-11-10 18:34:52 +01:00
Benjamin Bouvier
4b212ed3e3 Bug 1316635: Order declarations in WasmBinaryFormat.h; r=luke
MozReview-Commit-ID: EIiKmi9aNDt
2016-11-10 18:32:40 +01:00
Benjamin Bouvier
8c38469ab6 Bug 1316635: Factor out DecodeFunctionSection; r=luke
MozReview-Commit-ID: Ef8QRIPjbID
2016-11-10 18:26:25 +01:00
Benjamin Bouvier
1d252684c3 Bug 1316635: Factor out DecodeImportsSection; r=luke
MozReview-Commit-ID: 586kaHWXJvu
2016-11-08 19:36:43 +01:00
Benjamin Bouvier
e5df63666f Bug 1316635: Factor out DecodeTypeSection; r=luke
MozReview-Commit-ID: HOaUFi8npPN
2016-11-08 18:22:47 +01:00
Wes Kocher
4a1fa802c6 Backed out changeset d1b9fbbc9710 (bug 1314169) for jit failures a=backout 2016-11-10 16:14:14 -08:00
David Major
c1bd147f5e Bug 1314169: Leave the first VectoredExceptionHandler slot open for ASan. r=luke
Win64 ASan relies on a VectoredExceptionHandler to create shadow memory regions on demand. If WasmFaultHandler gets the exception first, it can itself fault while looking at shadow memory, leading to an infinite recursion.

MozReview-Commit-ID: 5MVik7kftxX

--HG--
extra : rebase_source : 10d281ad977af4de6890ad85e308500362f7b11e
2016-11-10 15:00:52 -06:00
Luke Wagner
a5994945fd Bug 1316625 - Baldr: tidy up WasmBinary*.h (r=bbouvier)
MozReview-Commit-ID: BUtoQpsKYF5

--HG--
rename : js/src/wasm/WasmBinary.h => js/src/wasm/WasmBinaryConstants.h
2016-11-10 14:54:39 -06:00
Luke Wagner
84acedae80 Bug 1316447 - Baldr: add WebAssembly.instantiate (r=bbouvier)
MozReview-Commit-ID: K5gVaOzkaCg

--HG--
extra : rebase_source : 3b3331ebd6531042c4069acb4dc4691f8025b90a
2016-11-10 10:19:14 -06:00
Luke Wagner
e1c34785aa Bug 1316447 - Baldr: hoist CanUseExtraThreads promise logic (r=bbouvier)
MozReview-Commit-ID: K8EMFhTwMLC

--HG--
extra : rebase_source : ec3562d1f65f88c5805f6c0c8a824812310f0335
2016-11-10 08:38:18 -06:00
Luke Wagner
ff97aa2532 Bug 1316447 - Baldr: add Module.{imports,exports} (r=bbouvier)
MozReview-Commit-ID: IZ2LjTgj2TN

--HG--
extra : rebase_source : 7435bd03acd9cfad029c70db433e59c835737006
2016-11-10 08:36:45 -06:00
Petr Sumbera
f3b1fc5388 Bug 1315956 - Use sincos() on more platforms. r=jandem
--HG--
extra : rebase_source : adccbda43f5ac217c1d14ae7db1e2971742b06e3
2016-11-08 05:24:10 -08:00
Nicolas B. Pierron
3c26921157 Bug 1315634 - Discard fallback resume points created on JSOP_CALLPROP if we are not inlining any function. r=h4writer 2016-11-10 13:44:31 +01:00
Benjamin Bouvier
441c9cc698 Bug 1316332: Release stack slots in case of explicit drops; r=lth
MozReview-Commit-ID: 2Jj0rzYPQ9J

--HG--
extra : rebase_source : ef09c35e422cd6419d86596a76871d79fc396488
2016-11-09 16:29:24 +01:00
Benjamin Bouvier
87f626a700 Bug 1316385: Add an env option to always enable wasm bounds check generation; r=luke
MozReview-Commit-ID: H5reiyGOCdC

--HG--
extra : rebase_source : e7b9aeb6ca5969878595e4fd0c17ad3bc8983920
2016-11-09 19:41:50 +01:00
Hannes Verschore
3b121e37e4 Bug 1314438: IonMonkey - Guard we don't remove instructions where we optimized based on its type, r=nbp 2016-11-07 09:38:05 +01:00
Hannes Verschore
e8ca0f577d Bug 1314900: IonMonkey - Add flag to IONFLAGS to spew the MIR expressions, r=jandem 2016-11-10 12:20:58 +01:00
Lars T Hansen
b2cf9b2d7e Bug 1316181 - proper stack adjustment for taken brIf. r=luke
--HG--
extra : rebase_source : e3009b32e6c78e94a2e688940c7bdff9de48bfba
2016-11-09 11:30:17 +01:00
Tooru Fujisawa
b2cc809361 Bug 1315943 - Part 1.1: Use class static const for bitfield size. r=shu 2016-11-10 18:22:12 +09:00
Jan de Mooij
e0c708c14f Bug 1127269 - Clean up some code in the ARM backend. r=sstangl 2016-11-10 10:14:17 +01:00
David Major
711c5c959f Backed out changeset d34efa945a20 (bug 1314169) for not fixing the bug. DONTBUILD
Doesn't affect any config that currently runs in CI.
2016-11-09 13:50:28 -06:00
André Bargull
18b95f0ad4 Bug 1230490 - Part 3: Disable test262 tests which expect Unicode 5.1 is used. r=arai
--HG--
extra : rebase_source : 715f8c02e424124064fe5a82b82762c859386149
2016-11-07 15:08:33 -08:00
André Bargull
30ac1aab0f Bug 1230490 - Part 2: Update JS Unicode support to 9.0.0. r=arai
--HG--
extra : rebase_source : 616e680ef053aeca4d48737d922de93514d80a75
2016-11-07 14:26:57 -08:00
André Bargull
eb7ed80d1d Bug 1230490 - Part 1: Remove support for separate Unicode version for case-folding from make_unicode. r=arai
--HG--
extra : rebase_source : 4033e4402c8287eed6bf011b7344dfc8b02a2af1
2016-11-07 14:26:43 -08:00
Robin Templeton
f09afd3bf5 Bug 1316230 - Update LIR type names for debugging output. r=bbouvier 2016-11-08 21:11:00 -05:00
Benjamin Bouvier
f114828dcf Bug 1313024: Pass binary.wast; r=luke
MozReview-Commit-ID: AdgZ3Jm5Pbg

--HG--
extra : rebase_source : 9a913eab99d4e48d7c022a8107ade9726bacbf1c
extra : amend_source : 2c87a37151ad6d382d68d317abc84d6fd922ee82
2016-11-09 18:39:14 +01:00
Benjamin Bouvier
741775d8f1 Bug 1304672: Undo the renaming of debuggerObservesAsmJS => Wasm; r=luke
MozReview-Commit-ID: 1vxk30n72Zf

--HG--
extra : rebase_source : a0c10b97e85866da3cbf97470949e053dc22c44b
extra : amend_source : 547f9565c5faf34bbb85562d2d0cb797890befa4
2016-11-09 17:31:54 +01:00
Benjamin Bouvier
7b122bb90d Bug 1316156: Use a constant-or-register for int64 pass-stack-arg; r=luke
MozReview-Commit-ID: 2ce0srABGpt

--HG--
extra : rebase_source : a57b0c001e6a11d1c3e852ec5f4ea74feaff7b45
extra : amend_source : d23d250355bc89063ce2865c1e20bd0a7c9bf8e4
2016-11-09 17:09:16 +01:00
Tooru Fujisawa
c7ca9ca9c6 Bug 1315242 - Part 1: Add errorLineNumber and errorColumnNumber property to debugger object to get line/column from JSErrorReport. r=jimb 2016-11-10 02:25:03 +09:00
Tooru Fujisawa
fdf5b915f2 Bug 1316164 - Remove unused/undefined NativeGetElement declaration. r=evilpie 2016-11-10 02:24:59 +09:00
Jan de Mooij
cc17e6fa50 Bug 1314545 - Fix Ion to handle stores to frozen elements correctly. r=nbp 2016-11-09 17:50:36 +01:00
Lars T Hansen
68056cc1c3 Bug 1313114 - bulk change to remove test-also-wasm-baseline directives; add directives.txt files. r=bbouvier
--HG--
extra : rebase_source : f3fd2830928d0a3891aa884383ec54457e16e2d2
2016-11-09 11:38:01 +01:00
Lars T Hansen
94be406301 Bug 1313114 - Make the wasm spec import script omit the baseline directive. r=bbouvier
--HG--
extra : rebase_source : a118b64687e225367b7d51d64aa3c1be8d2e9718
2016-11-08 16:56:55 +01:00
Lars T Hansen
ca83250210 Bug 1313114 - move test-also-wasm-baseline and test-also-noasmjs directives to directives.txt. r=bbouvier
--HG--
extra : rebase_source : 0a9a3a7157deb6015ae1aa10dff395cd6f4cbaca
2016-11-08 12:32:50 +01:00
Lars T Hansen
35a188d452 Bug 1313114 - remove hack for running wasm baseline tests when sniffing asm.js content from 'noasmjs'. r=bbouvier
--HG--
extra : rebase_source : 8a37f8a2e3f369ce83f08954856aeec2c72fd7de
2016-11-08 12:40:30 +01:00
Lars T Hansen
b561202d5d Bug 1277770 - look for jit-test directives in directives.txt. r=jonco
--HG--
extra : rebase_source : 1e309788903c30edd059b3bb105061f9f9e00630
2016-11-08 16:53:05 +01:00
Lars T Hansen
57590aaff3 Bug 1315901 - make MIPS simulators compile + reduce warnings a little. r=hev
--HG--
extra : rebase_source : 262284f73a5372b61e6bd7dac7776803e08364c6
2016-11-08 10:16:04 +01:00
Lars T Hansen
91481ddee5 Bug 1315901 - instantiate cmpPtrSet on MIPS64 for all operand types. r=nbp
--HG--
extra : rebase_source : 09f66bcf9343f885d9fb833a16791674da0ab8f5
2016-11-08 16:17:55 +01:00
Lars T Hansen
acfb141a50 Bug 1315901 - separate MIPS and ARM in wasm baseline compiler. r=nbp
--HG--
extra : rebase_source : 38e60bae75ed59f284b904dd7954f7e2f84c26c4
2016-11-08 10:13:42 +01:00
Masatoshi Kimura
5290ec0cba Bug 1313280 - Stop disabling MSVC warning C4819 and use the /utf-8 switch instead. r=glandium
MozReview-Commit-ID: IOOM6Gpz7rf

--HG--
extra : rebase_source : 0eae71e671a804128558df2941f18d5341b0475d
extra : source : 6bed9f127aa458a98c7572f6820868dc5ac08683
2016-10-28 05:07:45 +09:00
Masatoshi Kimura
4552a40d0a Bug 1313280 - Fix invalid non-UTF-8 bytes from js/. r=jandem
MozReview-Commit-ID: KG5kiE8QRcv

--HG--
extra : rebase_source : 935137885d8a7a3eb1eccf5428699fe3ec812c6c
extra : source : 794bd5fcfa1ee29112d1839bc7e264219c08aa1b
2016-10-28 22:14:51 +09:00
Jon Coppeard
4ed16b19e8 Bug 1315946 - Make heap checking zeal mode work again r=lth 2016-11-09 10:48:41 +00:00
Tooru Fujisawa
73b84e56c3 Bug 1315943 - Part 1: Fix NumClosedOverBindingsLimit value. r=till
--HG--
extra : amend_source : 99b256707e0970747f97f79ea683a767f9d37337
2016-11-09 17:54:26 +09:00
Emanuel Hoogeveen
e0a81d7503 Bug 1309573 - Part 2: Define MOZ_HAS_MOZGLUE in various places so that the crash reason gets used. r=glandium
--HG--
extra : rebase_source : d55e8dd75469759f333366bdf9662178ff0a2474
2016-11-08 03:53:00 -05:00
Daniel Holbert
aeb513840f Backed out changeset b1c5df3c47a4 (bug 1316079) for busting some builds
MozReview-Commit-ID: 36Bh8P9hkF
2016-11-08 16:25:54 -08:00
Daniel Holbert
47bb95d8fc Backed out changeset 0e53345bea4f (Bug 1316079 followup) for Werror failures on ARM SpiderMonkey build
MozReview-Commit-ID: EgyqzrKBU8N
2016-11-08 16:24:58 -08:00
Shu-yu Guo
31e7eccc71 Bug 1316079 - Followup: wrap forward decls of PropertyDescriptor with JS_PUBLIC_API. (r=me) 2016-11-08 15:46:05 -08:00
Shu-yu Guo
c2bdea9e4f Bug 1254893 - Forgot to commit test. 2016-11-08 15:46:05 -08:00
Shu-yu Guo
2b0e0ecf9d Bug 1312491 - Use correct JSScript getter when getting CallObject scripts during scope/env chain checks. (r=jandem) 2016-11-08 15:46:05 -08:00
Shu-yu Guo
98b40b2e41 Bug 1311316 - Fix global redeclaration check for prologue bailouts from Ion. (r=jandem) 2016-11-08 15:46:05 -08:00
Shu-yu Guo
2c0854ccc2 Bug 1308578 - Consider .this bindings of derived class constructors to be always observable. (r=jandem) 2016-11-08 15:46:05 -08:00
Bill McCloskey
4e78a26c74 Bug 792652 - Simplify IPDL type hierarchy (r=dvander)
Currently all our protocols inherit from IProtocolManager<IProtocol>. I have
no idea why. This patch switches everything over to IProtocol, without any
templates. I had to move ReadActor to the .cpp file to avoid redefinition
errors.
2016-11-08 15:22:34 -08:00
Tooru Fujisawa
598cdbaef5 Bug 1316141 - Support async function in dis shell function. r=till 2016-11-09 08:10:03 +09:00
Georg Kilzer
5f284377ce Bug 1316079 - Mark JS::PropertyDescriptor as JS_PUBLIC_API to fix linking. r=luke
--HG--
extra : rebase_source : d67baba845170db24e69238b1ea46d0d76ec8aea
2016-11-08 19:36:45 +01:00
Georg Kilzer
bcdcaf9881 Bug 1315842 - Replace reference to JS::AutoIdArray and JSIdArray. r=jonco
Both were removed in Bug 1191529.

--HG--
extra : rebase_source : bc6a45ea0d37084e9ebdda39b72c22dad08ebd02
2016-11-08 15:49:21 +01:00
Wes Kocher
41c087935b Merge m-c to inbound, a=merge 2016-11-08 14:08:34 -08:00
Wes Kocher
008fdd9329 Merge inbound to central, a=merge 2016-11-08 13:58:20 -08:00
Tom Schuster
3f4430c523 Bug 1015798 - Don't define properties on sub Error types. r=arai 2016-11-08 22:08:28 +01:00
Tom Schuster
488c1c6088 Bug 1015798 - Define BYTES_PER_ELEMENT on typed arrays via ClassSpec. r=arai 2016-11-08 22:08:28 +01:00
Tom Schuster
77bdad13e3 Bug 1015798 - Improve ClassSpec depedent behavior especially with inheritance. r=bz 2016-11-08 22:08:28 +01:00
Tom Schuster
63d908c446 Bug 1015798 - Add int32 type to PropertySpec. r=arai 2016-11-08 22:08:28 +01:00
Benjamin Bouvier
820f40d1d6 Bug 1315930: Spew instructions in release builds too; r=nbp
MozReview-Commit-ID: 94klMhO0bN8

--HG--
extra : rebase_source : 0a32fafb585dd84c3a84e1865ee06088832b2d0a
2016-11-08 12:18:17 +01:00
Phil Ringnalda
592b02e148 Merge m-c to m-i
MozReview-Commit-ID: 8cFOopE3aHd
2016-11-07 20:40:30 -08:00
Phil Ringnalda
2c7a3afd66 Merge m-i to m-c, a=merge
MozReview-Commit-ID: 5599Z7kxjk3
2016-11-07 20:38:29 -08:00
Phil Ringnalda
0b5f008629 Merge autoland to m-c, a=merge
MozReview-Commit-ID: CjyRb7vVnBV
2016-11-07 20:37:27 -08:00