Commit Graph

49831 Commits

Author SHA1 Message Date
Andrew McCreight
10dd21a3ef Bug 886459, part 3 - Remove simple uses of nsIJSRuntimeService to get the JSRuntime. r=bholley 2015-06-26 18:44:14 -07:00
Andrew McCreight
fd7600ed25 Bug 886459, part 2 - Remove context callbacks from XPCJSRuntime. r=bholley
These are unused.
2015-06-26 18:44:13 -07:00
Terrence Cole
165e8bff6f Bug 1176890 - Start running jstests faster on windows; r=sfink
--HG--
extra : rebase_source : 1eda1a026436d6d0b641019edc5e5bf0a9e3fc77
2015-06-25 15:10:00 -07:00
Marty Rosenberg
5ecd7db10b Bug 988463 - Add in support for tracelogging on ARM. r=h4writer 2015-06-26 11:52:50 -07:00
Aleksandar Zlicic
4c729d7055 Bug 1165793 - Add executableCopy() back for MIPS. r=sstangl
IonAssemblerBuffer::executableCopy() was erroneously removed
in Bug 1163168.
2015-06-15 19:55:55 +02:00
Nicolas B. Pierron
66cf1e0a16 Back out 3 changesets (Bug 1165348, Bug 1175397, Bug 1174322) for some website bustages. 2015-06-26 07:05:33 +02:00
Ryan VanderMeulen
5f5c327690 Backed out changeset 8b4e4083639e (bug 1171931) for B2G debug emulator bustage. 2015-06-25 19:48:42 -04:00
Juan Gomez
702a59d135 Bug 1171931 - Refactor duplicated code using XRE_IsParent/ContentProcess. r=froydnj
--HG--
extra : rebase_source : 2ecbe6c1dd8a7ad8dc529b53349ad431cf1116c9
2015-06-24 14:11:00 -04:00
Florian Merz
6abe46252a Bug 1155211 - SIMD: Rename lane mutators - with -> replaceLane. r=bbouvier
--HG--
rename : js/src/jit-test/tests/SIMD/with.js => js/src/jit-test/tests/SIMD/replacelane.js
rename : js/src/tests/ecma_7/SIMD/with.js => js/src/tests/ecma_7/SIMD/replaceLane.js
extra : rebase_source : 9c911b68761987650a741ce38e66641b08952899
2015-06-16 23:10:12 +02:00
Wes Kocher
535b1965fa Backed out changeset efe724729178 (bug 1175556) for mass build bustage in assembler code CLOSED TREE 2015-06-25 12:11:55 -07:00
Sean Stangl
425c550cf5 Bug 1175556 - ARM64: Land miscellaneous changes. r=evilpie 2015-06-25 11:37:22 -07:00
Jan de Mooij
29598180a9 Bug 1175466 - Allocate arguments objects in the nursery. r=terrence 2015-06-20 21:30:12 -07:00
Terrence Cole
5a9f8568bd Backout ea281f1bffcb (Bug 1174319) for possibly regressing octane.
--HG--
extra : rebase_source : 8081c7a43fa766aac1b96b4b4db2998959bcab84
2015-06-24 16:28:01 -07:00
Terrence Cole
7de7e518c2 Backout 9c891ea3949c (Bug 1174850) for possibly regressing octane.
--HG--
extra : rebase_source : bbd782ba1cd192595bf2ef2d6b42b23622345305
2015-06-24 16:27:09 -07:00
Terrence Cole
929078d8c7 Backout 6b847a10bbb1 (Bug 1175642) for being on top of a regression.
--HG--
extra : rebase_source : a87230e8b9ffe2e09cba41874e60f44bc0aa7e16
2015-06-24 16:25:12 -07:00
Terrence Cole
8ebb5a1b72 Backout e0e69237df5b (Bug 1174873) for causing intermittent failures.
--HG--
extra : rebase_source : 4c4d2dce1f9c1fb6aa89ccdae044cc96858ec8ab
2015-06-24 16:21:57 -07:00
Terrence Cole
203f1d029f Backout 7959ffacd30f (Bug 1176090) for being on top of a regression.
--HG--
extra : rebase_source : d1705d445efcf914bc92fb6bfb2cf501ee823538
2015-06-24 16:20:31 -07:00
Brian Hackett
04d31b315b Bug 1175535 - Don't require objects embedded in MIR nodes to always be tenured, r=jandem. 2015-06-24 16:08:39 -07:00
Brian Hackett
22f3ab89dd Bug 1176075 - Add a missing check for nursery objects during Ion compilation, r=jandem. 2015-06-24 16:02:04 -07:00
Nicolas B. Pierron
d32ebf03b8 Bug 1173764 - Disable JitSpew argument computation in optimizied builds. r=bhackett 2015-06-24 22:46:02 +02:00
Nicolas B. Pierron
32c276bf87 Bug 1173764 - Enable LAllocation/LUse serialization in optimized builds. r=bhackett 2015-06-24 22:46:02 +02:00
Jason Orendorff
461581c95f Bug 1125624, part 3 - Remove js::StandardDefineProperty and js::DefineOwnProperty. r=Waldo.
--HG--
extra : rebase_source : afcc8c4461b1ea744e2beea948370c3c20ff70af
extra : source : 94f14d6b26d5e6c060e965c0982708e63d27db66
2015-05-29 16:48:26 -05:00
Jason Orendorff
cc139ad82a Bug 1125624, part 2 - Change js::StandardDefineProperty to forward to js::DefineProperty. r=Waldo.
--HG--
extra : rebase_source : 6ad706b7e98e87c8b553aa43cdc5315385eb6c08
extra : source : c1534aaff6c69a542d980e940f0624ee2f286881
2015-05-29 17:31:43 -05:00
Ryan VanderMeulen
2900e47cec Backed out changeset fe813debcd79 (bug 1172498) for crashes.
CLOSED TREE
2015-06-23 16:27:49 -04:00
Magnus Melin
9ccc5bb1d7 Bug 1176749. nsIScriptError.idl should use nsStringGlue.h, not nsString.h. r=mrbkap 2015-06-23 20:31:17 +03:00
Eric Faust
08d01a67bb Bug 1172498 - Properly mark ion frame new.target values. (r=jandem) 2015-06-23 09:19:36 -07:00
Steve Singer
f0737417db Bug 1176629 - Add visitRandom to the none backend. r=sstangl 2015-06-22 18:39:00 +02:00
Steve Singer
9c0d5d800d Bug 1176631 - Predeclare TempAllocator for non-ion platforms. r=nbp 2015-06-21 17:24:00 +02:00
Steve Singer
799b9dc224 Bug 1176633 - Add more Operand constructors to the none backend. r=nbp 2015-06-21 17:30:00 +02:00
Johannes Schulte
9d7a893a5f Bug 1153458 - Fix decompiler issue with DoCallNativeGetter. r=efaust 2015-04-11 02:17:28 +02:00
Shu-yu Guo
f8e8f4c4c3 Bug 1171177 - Remove UNQUALIFIED_VAROBJ Shape flags in favor of Class-checking. (r=luke) 2015-06-21 11:49:58 -07:00
Shu-yu Guo
61e4b5f605 Bug 1171177 - Remove VAROBJFIX. (r=luke) 2015-06-21 11:49:58 -07:00
Shu-yu Guo
1ac506b1ce Bug 1165486 - Debug function to dump static scope chain of scripts. (r=efaust) 2015-06-21 11:49:58 -07:00
Shu-yu Guo
4274b54bf8 Bug 1165486 - Detect with scopes at parse time using the static scope chain for non-function scripts. Also cache static scope properties on SharedGlobalContext. (r=efaust) 2015-06-21 11:49:58 -07:00
Shu-yu Guo
b841e668ac Bug 1165486 - Use JS::CompileForNonSyntacticScope in Gecko where we used to set polluted global scope. (r=bz, rs=bholley) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
3d1844d0b2 Bug 1165486 - Split JS::Compile into JS::Compile and JS::CompileForNonSyntacticScope. (r=luke) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
0789632878 Bug 1165486 - Replace the PlainObj varobj with NonSyntacticVariablesObject. (r=luke) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
b1fcbaad83 Bug 1165486 - Rebase yield offsets when cloning scripts. (r=jandem) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
9e0436ca20 Bug 1165486 - Restructure function and script cloning in light of PollutingGlobal scope changes. (r=Waldo)
CloneFunctionObject is split into the following:

  - CloneFunctionAndScript, which deep clones the function and its
    script, giving the cloned script a new static scope chain. This is
    used for cloning singleton lambdas and JSAPI cloning. For singleton
    lambdas, the original and the clone script have the same static
    scope chain. For JSAPI cloning, a new static scope is provided
    (either null, for a clean global, or StaticPollutingGlobalObject,
    for a polluted global).

  - CloneFunctionReuseScript, which clones the function but reuses the
    script, and thus keeps the same static scope chain.

CloneScript is split into the following:

  - CloneGlobalScript, which clones a script with and gives it a new
    static scope.

  - CloneScriptIntoFunction, which clones a script into a JSFunction and
    gives it a new static scope. Cloning a script into a new function
    container requires slightly different logic to hook up the static
    scope chain before cloning inner scripts.
2015-06-21 11:49:57 -07:00
Shu-yu Guo
b115880b5d Bug 1165486 - Remove PollutedGlobalScopeOption in favor of using the static scope chain to detect non-syntactic scopes. (r=luke) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
07ba1c64c9 Bug 1165486 - Detect with scopes at parse time using the static scope chain instead of treating it as a polluted global. (r=luke) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
075270190b Bug 1165486 - Add StaticNonSyntacticScopeObjects and teach scope iterators about it. (r=luke) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
ada742106c Bug 1165486 - Rename hasPollutedGlobalScope to hasNonSyntacticScope. (r=luke) 2015-06-21 11:49:57 -07:00
Shu-yu Guo
4553e4705c Bug 1165486 - Cleanup: use standard object allocation functions when allocating scope objects. (r=terrence) 2015-06-21 11:49:56 -07:00
Shu-yu Guo
279240ce9a Bug 1165486 - Cleanup: rename staticEvalScope to topStaticScope to prepare for the static top-level lexical scope. (r=luke) 2015-06-21 11:49:56 -07:00
Terrence Cole
ccfcf336f9 Bug 1176090 - Change all RelocatablePtr to HeapPtr and remove the |using|; r=jonco
--HG--
extra : rebase_source : f1a03643383c8111faae39ffed8fca861256665b
2015-06-20 10:55:26 -07:00
Terrence Cole
3c22027368 Bug 1174873 - Remove HeapPtr and rename RelocatablePtr to HeapPtr; r=jonco
--HG--
extra : rebase_source : a69fe56222f7417fea65d2a26fedf501b755a4f0
2015-06-20 10:54:32 -07:00
Jan de Mooij
03af0d59a2 Backout 67296c6ede81 (bug 1175466) on a CLOSED TREE. 2015-06-20 22:38:18 -07:00
Jan de Mooij
38328fd6ab Bug 1175466 - Allocate arguments objects in the nursery. r=terrence 2015-06-20 21:30:12 -07:00
Terrence Cole
629acf9edc Bug 1175642 - Fix the interface that RelocatablePtr uses to interact with the StoreBuffer; r=jonco
--HG--
extra : rebase_source : 974375bcb15e889187f7138c82f23c60021e9d21
2015-06-18 10:23:49 -07:00
Terrence Cole
86d691dd69 Bug 1052728 - Add telemetry to record GC phases that cause jank; r=sfink
--HG--
extra : rebase_source : 8d12acf7caab36f15543c95d52d15508835f3636
2015-06-04 13:17:35 -07:00
Terrence Cole
74ef54de73 Bug 1176064 - Do processing of the jstest's skiplist inline; r=sfink
--HG--
extra : rebase_source : 90fb25c8bdf624049764837ac372aa449d417385
2015-06-20 10:14:22 -07:00
Terrence Cole
13d32dff93 Bug 1176028 - Use the jstest's task generator directly; r=sfink
--HG--
extra : rebase_source : ececc4e31a22a3e266698eb49d8e7747f84a3d3c
2015-06-18 11:42:21 -07:00
Terrence Cole
cad2b5be71 Bug 1176004 - Make jstest's unix task runner a generator; r=sfink
--HG--
extra : rebase_source : a01c0c9cedd5cc1bd0e65bf8464d053df2a5e77d
2015-06-17 13:57:02 -07:00
Terrence Cole
7c8f671ec7 Bug 1175636 - Do not spawn a watchdog for each test on Windows; r=sfink
--HG--
extra : rebase_source : 70b54d0a1e0710685cf4dcf3bd644b7bdb7d72a4
2015-06-17 11:54:35 -07:00
Brian Hackett
8f9683d9d7 Bug 1175761 - Avoid using types in the nursery during optimization tracking, r=shu. 2015-06-20 09:13:23 -07:00
Ms2ger
57cef36682 Bug 1175513 - Improve code style in nsXPCWrappedJSClass::CleanupOutparams; r=bholley
--HG--
extra : commitid : ASx6NewBYHr
2015-06-20 09:16:51 +02:00
Ms2ger
27ef40f2a6 Bug 1175513 - Factor out nsXPCWrappedJSClass::CleanupOutparams; r=bholley
--HG--
extra : commitid : 717du1vkDbv
2015-06-20 09:16:51 +02:00
Ms2ger
b02f933359 Bug 1175513 - Make some private nsXPCWrappedJSClass const or static; r=bholley
--HG--
extra : commitid : 81tExfNt2dH
2015-06-20 09:16:51 +02:00
Bill McCloskey
a2c6c7d4bf Bug 1143006 - Show warning for http-on-* in child process (r=mrbkap) 2015-06-19 17:35:06 -07:00
Jeff Walden
c34c27f410 Bug 1146136 - Parenthesized "destructuring patterns" shouldn't actually be destructuring patterns. r=efaust, a=KWierso 2015-06-16 23:53:04 -07:00
Ryan VanderMeulen
1135142546 Backed out 13 changesets (bug 1165486) for ASAN jsreftest crashes.
Backed out changeset 24966b67d232 (bug 1165486)
Backed out changeset 4a65eeea4d9a (bug 1165486)
Backed out changeset c5301aa7a2ae (bug 1165486)
Backed out changeset fea908d8a836 (bug 1165486)
Backed out changeset ca9561cbcd29 (bug 1165486)
Backed out changeset 91a3217d4cd0 (bug 1165486)
Backed out changeset e74163801eef (bug 1165486)
Backed out changeset ec5df87d2ee5 (bug 1165486)
Backed out changeset 17d21020a786 (bug 1165486)
Backed out changeset 6318eba2d3fe (bug 1165486)
Backed out changeset a103caa36183 (bug 1165486)
Backed out changeset 18c025c16bed (bug 1165486)
Backed out changeset b32fcdc115b6 (bug 1165486)

CLOSED TREE

--HG--
extra : amend_source : 356c5bf7944d6ebb36dfb6642bc280ee8ef5ba90
2015-06-19 10:56:48 -04:00
Ryan VanderMeulen
bd6c8de819 Backed out changesets b41a69e1b81c and 04f4fec38c9d (bug 1171177) for ASAN jsreftest crashes. 2015-06-19 10:56:01 -04:00
Ryan VanderMeulen
b9d6aebbc2 Backed out changesets 0aa70076583f and 13a9a4428a68 (bug 1173764) for bustage. 2015-06-19 10:52:30 -04:00
Nicolas B. Pierron
f58abbc7af Bug 1173764 - Disable JitSpew argument computation in optimizied builds. r=bhackett 2015-06-19 15:17:25 +02:00
Nicolas B. Pierron
7cb68936ca Bug 1173764 - Enable LAllocation/LUse serialization in optimized builds. r=bhackett 2015-06-19 15:17:24 +02:00
Shu-yu Guo
f40b85b6bc Bug 1171177 - Remove UNQUALIFIED_VAROBJ Shape flags in favor of Class-checking. (r=luke) 2015-06-19 01:21:14 -07:00
Shu-yu Guo
1ecb21abbd Bug 1171177 - Remove VAROBJFIX. (r=luke) 2015-06-19 01:21:14 -07:00
Shu-yu Guo
6470d92916 Bug 1165486 - Debug function to dump static scope chain of scripts. (r=efaust) 2015-06-19 01:21:14 -07:00
Shu-yu Guo
f32a260690 Bug 1165486 - Detect with scopes at parse time using the static scope chain for non-function scripts. Also cache static scope properties on SharedGlobalContext. (r=efaust) 2015-06-19 01:21:14 -07:00
Shu-yu Guo
349f34fcd3 Bug 1165486 - Use JS::CompileForNonSyntacticScope in Gecko where we used to set polluted global scope. (r=bz, rs=bholley) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
47757a1f1c Bug 1165486 - Split JS::Compile into JS::Compile and JS::CompileForNonSyntacticScope. (r=luke) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
5b3bb1e73e Bug 1165486 - Replace the PlainObj varobj with NonSyntacticVariablesObject. (r=luke) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
18c62b0b38 Bug 1165486 - Rebase yield offsets when cloning scripts. (r=jandem) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
4d706abba9 Bug 1165486 - Restructure function and script cloning in light of PollutingGlobal scope changes. (r=Waldo)
CloneFunctionObject is split into the following:

  - CloneFunctionAndScript, which deep clones the function and its
    script, giving the cloned script a new static scope chain. This is
    used for cloning singleton lambdas and JSAPI cloning. For singleton
    lambdas, the original and the clone script have the same static
    scope chain. For JSAPI cloning, a new static scope is provided
    (either null, for a clean global, or StaticPollutingGlobalObject,
    for a polluted global).

  - CloneFunctionReuseScript, which clones the function but reuses the
    script, and thus keeps the same static scope chain.

CloneScript is split into the following:

  - CloneGlobalScript, which clones a script with and gives it a new
    static scope.

  - CloneScriptIntoFunction, which clones a script into a JSFunction and
    gives it a new static scope. Cloning a script into a new function
    container requires slightly different logic to hook up the static
    scope chain before cloning inner scripts.
2015-06-19 01:21:13 -07:00
Shu-yu Guo
978c1c172b Bug 1165486 - Remove PollutedGlobalScopeOption in favor of using the static scope chain to detect non-syntactic scopes. (r=luke) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
7bdf7f20fe Bug 1165486 - Detect with scopes at parse time using the static scope chain instead of treating it as a polluted global. (r=luke) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
d55d4294b8 Bug 1165486 - Add StaticNonSyntacticScopeObjects and teach scope iterators about it. (r=luke) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
ae74146e00 Bug 1165486 - Rename hasPollutedGlobalScope to hasNonSyntacticScope. (r=luke) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
7ba00f5270 Bug 1165486 - Cleanup: use standard object allocation functions when allocating scope objects. (r=terrence) 2015-06-19 01:21:13 -07:00
Shu-yu Guo
59524ee71b Bug 1165486 - Cleanup: rename staticEvalScope to topStaticScope to prepare for the static top-level lexical scope. (r=luke) 2015-06-19 01:21:13 -07:00
Benoit Girard
59ad1c9d28 Bug 1172186 - Make the profiler build standalone. r=mstange
--HG--
extra : commitid : BTYjbUK8Kkf
extra : rebase_source : 48b78ab373d4019fb42cc39cdc66586da33eb069
2015-06-18 01:05:42 -04:00
Benoit Girard
2c6df6a9a9 Bug 858927 - Move the mozilla::TimeStamp into mozglue. r=glandium
--HG--
rename : xpcom/ds/TimeStamp.cpp => mozglue/misc/TimeStamp.cpp
rename : xpcom/ds/TimeStamp.h => mozglue/misc/TimeStamp.h
rename : xpcom/ds/TimeStamp_darwin.cpp => mozglue/misc/TimeStamp_darwin.cpp
rename : xpcom/ds/TimeStamp_posix.cpp => mozglue/misc/TimeStamp_posix.cpp
rename : xpcom/ds/TimeStamp_windows.cpp => mozglue/misc/TimeStamp_windows.cpp
rename : xpcom/ds/TimeStamp_windows.h => mozglue/misc/TimeStamp_windows.h
extra : commitid : 2MSXRaRzXEd
extra : rebase_source : 45ded19677e8557deb3b9203777656f5a13f6c04
2015-06-05 16:03:11 -04:00
Nicholas Nethercote
c4e89cce87 Bug 1174594 (part 3) - Remove ShutdownData. r=mrbkap.
It's written to but never read from.
2015-06-18 15:34:27 -07:00
Nicholas Nethercote
8f06725812 Bug 1174594 (part 2) - Use a more sensible type for UNMARK_{ONLY,AND_SWEEP}. r=mrbkap. 2015-06-18 15:34:26 -07:00
Nicholas Nethercote
5c65b79f27 Bug 1174594 (part 1) - Remove uses of PL_DHashTableEnumerate from XPConnect. r=mrbkap.
Each PLDHashTable-based map class in XPCMaps has its Enumerate() function
replaced with an Iterator and/or a RemovingIterator.
2015-06-18 15:34:25 -07:00
Terrence Cole
5fcd7850db Bug 1174850 - Remove the explicitly relocatable store buffers; r=jonco 2015-06-16 16:03:11 -07:00
Terrence Cole
416467340d Bug 1174319 - Remove the intermediate store buffer buffer; r=jonco 2015-06-16 16:03:02 -07:00
Ryan VanderMeulen
7b7e4f1c9b Merge inbound to m-c. a=merge
CLOSED TREE
2015-06-18 16:03:38 -04:00
Terrence Cole
6e6ad85afd Bug 1175708 - Followup to fix windows jstests.py bustage on a CLOSED TREE; r=meow
--HG--
extra : rebase_source : c60a073f01072fec9ccb4aaf3324e518efa18283
2015-06-18 10:33:34 -07:00
Ryan VanderMeulen
3a61e232f7 Backed out 14 changesets (bug 1165486) for causing frequent crashes/asserts in automation.
Backed out changeset 1db9723f1617 (bug 1165486)
Backed out changeset 662ec8b0561e (bug 1165486)
Backed out changeset 97352c48fb98 (bug 1165486)
Backed out changeset 4143cca42cc7 (bug 1165486)
Backed out changeset 5abb37cb0495 (bug 1165486)
Backed out changeset 7b157964c572 (bug 1165486)
Backed out changeset 5c01ab1d9790 (bug 1165486)
Backed out changeset 0e00d8a3ca1d (bug 1165486)
Backed out changeset 5e88d482f5e8 (bug 1165486)
Backed out changeset 513bbca6fb6c (bug 1165486)
Backed out changeset 64fa28f0255a (bug 1165486)
Backed out changeset 7a404929c74c (bug 1165486)
Backed out changeset 1dc0d6adf6ed (bug 1165486)
Backed out changeset 381003ca79a3 (bug 1165486)

CLOSED TREE
2015-06-18 13:05:10 -04:00
Ryan VanderMeulen
55eddb2445 Backed out changesets 83954c7df8ab and 0a3b1cd87c26 (bug 1171177) for causing frequent crashes/asserts in automation. 2015-06-18 13:02:49 -04:00
Terrence Cole
bc6c310e53 Bug 1175708 - Eliminate some horrid action-at-a-distance global state in jstests.py; r=sfink 2015-06-17 14:29:53 -07:00
d630ad6c
63671ec61f Bug 915805 - Don't treat unbound names in Function() code as globals when the Function() code contains a direct eval or similarly-extensible scope. r=jorendorff 2015-06-18 08:35:24 -07:00
Eric Faust
6b52fba97b Bug 1169736 - Temporarily disallow eval and arrow functions inside derived class constructors. (r=jorendorff) 2015-06-17 14:38:23 -07:00
Carsten "Tomcat" Book
78ccc28817 merge mozilla-inbound to mozilla-central a=merge 2015-06-18 15:13:19 +02:00
Tom Tromey
c32fef3104 Bug 1159506 - Make GC events use TimeStamp. r=terrence 2015-06-17 15:14:00 -04:00
Tom Tromey
0b980d99e6 Bug 1159507 - make allocation times consistent with timeline; r=fitzgen,mccr8 2015-06-17 13:01:27 -07:00
Ryan VanderMeulen
ecd42728d8 Merge m-c to fx-team. a=merge 2015-06-17 15:05:37 -04:00
Daniel Holbert
073458590c Bug 1165486 followup: Annotate toObjectBox() impls as 'override'. rs=ehsan 2015-06-15 23:21:51 -07:00