Bug 1160884 followup - Fix merge conflicts that were not qreffed. r=me, a=me
authorJan de Mooij <jdemooij@mozilla.com>
Wed, 03 Jun 2015 11:50:57 +0200
changeset 325149 7e5ed21c9ce0de7ddbe89bc6b7ebf18aa1625396
parent 325148 2c90c279e3a721a584faa6f65dfb1cdc57e6aa32
child 325150 55d5ac1c472f19c3878dbd6f3d99d03407dd4f6d
push id9971
push userpaul@paul.cx
push dateMon, 25 Jan 2016 13:03:35 +0000
reviewersme, me
bugs1160884
milestone38.0.1esrpre
Bug 1160884 followup - Fix merge conflicts that were not qreffed. r=me, a=me
js/src/jit/shared/Lowering-shared.h
js/src/vm/TraceLoggingTypes.h
--- a/js/src/jit/shared/Lowering-shared.h
+++ b/js/src/jit/shared/Lowering-shared.h
@@ -100,16 +100,17 @@ class LIRGeneratorShared : public MDefin
     // slots on X86, and only registers on ARM.
     inline LAllocation useAny(MDefinition* mir);
     inline LAllocation useAnyOrConstant(MDefinition* mir);
     // "Storable" is architecture dependend, and will include registers and
     // constants on X86 and only registers on ARM.  This is a generic "things
     // we can expect to write into memory in 1 instruction".
     inline LAllocation useStorable(MDefinition* mir);
     inline LAllocation useStorableAtStart(MDefinition* mir);
+    inline LAllocation useKeepalive(MDefinition* mir);
     inline LAllocation useKeepaliveOrConstant(MDefinition* mir);
     inline LAllocation useRegisterOrConstant(MDefinition* mir);
     inline LAllocation useRegisterOrConstantAtStart(MDefinition* mir);
     inline LAllocation useRegisterOrNonNegativeConstantAtStart(MDefinition* mir);
     inline LAllocation useRegisterOrNonDoubleConstant(MDefinition* mir);
 
     inline LUse useRegisterForTypedLoad(MDefinition* mir, MIRType type);
 
--- a/js/src/vm/TraceLoggingTypes.h
+++ b/js/src/vm/TraceLoggingTypes.h
@@ -48,16 +48,17 @@
     _(GVN)                                            \
     _(LICM)                                           \
     _(RangeAnalysis)                                  \
     _(LoopUnrolling)                                  \
     _(EffectiveAddressAnalysis)                       \
     _(EliminateDeadCode)                              \
     _(EdgeCaseAnalysis)                               \
     _(EliminateRedundantChecks)                       \
+    _(AddKeepAliveInstructions)                       \
     _(GenerateLIR)                                    \
     _(RegisterAllocation)                             \
     _(GenerateCode)
 
 #define TRACELOGGER_LOG_ITEMS(_)                      \
     _(Bailout)                                        \
     _(Disable)                                        \
     _(Enable)                                         \