Merge pull request #1142 from MoonchildProductions/remove-unboxed

Remove unboxed objects

1 files changed, 3 insertions, 6 deletions

diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp
index 190b40bb2..fa9cc3019 100644
--- a/js/src/jit/MIR.cpp
+++ b/js/src/jit/MIR.cpp
@@ -4817,15 +4817,14 @@ MCreateThisWithTemplate::canRecoverOnBailout() const
 
 MObjectState::MObjectState(MObjectState* state)
   : numSlots_(state->numSlots_),
-    numFixedSlots_(state->numFixedSlots_),
-    operandIndex_(state->operandIndex_)
+    numFixedSlots_(state->numFixedSlots_)
 {
     // This instruction is only used as a summary for bailout paths.
     setResultType(MIRType::Object);
     setRecoveredOnBailout();
 }
 
-MObjectState::MObjectState(JSObject *templateObject, OperandIndexMap* operandIndex)
+MObjectState::MObjectState(JSObject* templateObject)
 {
     // This instruction is only used as a summary for bailout paths.
     setResultType(MIRType::Object);
@@ -4836,8 +4835,6 @@ MObjectState::MObjectState(JSObject *templateObject, OperandIndexMap* operandInd
     NativeObject* nativeObject = &templateObject->as<NativeObject>();
     numSlots_ = nativeObject->slotSpan();
     numFixedSlots_ = nativeObject->numFixedSlots();
-
-    operandIndex_ = operandIndex;
 }
 
 JSObject*
@@ -4897,7 +4894,7 @@ MObjectState::New(TempAllocator& alloc, MDefinition* obj)
     JSObject* templateObject = templateObjectOf(obj);
     MOZ_ASSERT(templateObject, "Unexpected object creation.");
 
-    MObjectState* res = new(alloc) MObjectState(templateObject, nullptr);
+    MObjectState* res = new(alloc) MObjectState(templateObject);
     if (!res || !res->init(alloc, obj))
         return nullptr;
     return res;