Remove Unboxed Object code from jit, Part 2.

1 files changed, 2 insertions, 199 deletions

diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
index 806a9db81..a96fb58a8 100644
--- a/js/src/vm/UnboxedObject.cpp
+++ b/js/src/vm/UnboxedObject.cpp
@@ -67,205 +67,8 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
 /* static */ bool
 UnboxedLayout::makeConstructorCode(JSContext* cx, HandleObjectGroup group)
 {
-    gc::AutoSuppressGC suppress(cx);
-
-    using namespace jit;
-
-    if (!cx->compartment()->ensureJitCompartmentExists(cx))
-        return false;
-
-    UnboxedLayout& layout = group->unboxedLayout();
-    MOZ_ASSERT(!layout.constructorCode());
-
-    UnboxedPlainObject* templateObject = UnboxedPlainObject::create(cx, group, TenuredObject);
-    if (!templateObject)
-        return false;
-
-    JitContext jitContext(cx, nullptr);
-
-    MacroAssembler masm;
-
-    Register propertiesReg, newKindReg;
-#ifdef JS_CODEGEN_X86
-    propertiesReg = eax;
-    newKindReg = ecx;
-    masm.loadPtr(Address(masm.getStackPointer(), sizeof(void*)), propertiesReg);
-    masm.loadPtr(Address(masm.getStackPointer(), 2 * sizeof(void*)), newKindReg);
-#else
-    propertiesReg = IntArgReg0;
-    newKindReg = IntArgReg1;
-#endif
-
-#ifdef JS_CODEGEN_ARM64
-    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-    masm.initStackPtr();
-#endif
-
-    MOZ_ASSERT(propertiesReg.volatile_());
-    MOZ_ASSERT(newKindReg.volatile_());
-
-    AllocatableGeneralRegisterSet regs(GeneralRegisterSet::All());
-    regs.take(propertiesReg);
-    regs.take(newKindReg);
-    Register object = regs.takeAny(), scratch1 = regs.takeAny(), scratch2 = regs.takeAny();
-
-    LiveGeneralRegisterSet savedNonVolatileRegisters = SavedNonVolatileRegisters(regs);
-    masm.PushRegsInMask(savedNonVolatileRegisters);
-
-    // The scratch double register might be used by MacroAssembler methods.
-    if (ScratchDoubleReg.volatile_())
-        masm.push(ScratchDoubleReg);
-
-    Label failure, tenuredObject, allocated;
-    masm.branch32(Assembler::NotEqual, newKindReg, Imm32(GenericObject), &tenuredObject);
-    masm.branchTest32(Assembler::NonZero, AbsoluteAddress(group->addressOfFlags()),
-                      Imm32(OBJECT_FLAG_PRE_TENURE), &tenuredObject);
-
-    // Allocate an object in the nursery
-    masm.createGCObject(object, scratch1, templateObject, gc::DefaultHeap, &failure,
-                        /* initFixedSlots = */ false);
-
-    masm.jump(&allocated);
-    masm.bind(&tenuredObject);
-
-    // Allocate an object in the tenured heap.
-    masm.createGCObject(object, scratch1, templateObject, gc::TenuredHeap, &failure,
-                        /* initFixedSlots = */ false);
-
-    // If any of the properties being stored are in the nursery, add a store
-    // buffer entry for the new object.
-    Label postBarrier;
-    for (size_t i = 0; i < layout.properties().length(); i++) {
-        const UnboxedLayout::Property& property = layout.properties()[i];
-        if (property.type == JSVAL_TYPE_OBJECT) {
-            Address valueAddress(propertiesReg, i * sizeof(IdValuePair) + offsetof(IdValuePair, value));
-            Label notObject;
-            masm.branchTestObject(Assembler::NotEqual, valueAddress, &notObject);
-            Register valueObject = masm.extractObject(valueAddress, scratch1);
-            masm.branchPtrInNurseryChunk(Assembler::Equal, valueObject, scratch2, &postBarrier);
-            masm.bind(&notObject);
-        }
-    }
-
-    masm.jump(&allocated);
-    masm.bind(&postBarrier);
-
-    LiveGeneralRegisterSet liveVolatileRegisters;
-    liveVolatileRegisters.add(propertiesReg);
-    if (object.volatile_())
-        liveVolatileRegisters.add(object);
-    masm.PushRegsInMask(liveVolatileRegisters);
-
-    masm.mov(ImmPtr(cx->runtime()), scratch1);
-    masm.setupUnalignedABICall(scratch2);
-    masm.passABIArg(scratch1);
-    masm.passABIArg(object);
-    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, PostWriteBarrier));
-
-    masm.PopRegsInMask(liveVolatileRegisters);
-
-    masm.bind(&allocated);
-
-    ValueOperand valueOperand;
-#ifdef JS_NUNBOX32
-    valueOperand = ValueOperand(scratch1, scratch2);
-#else
-    valueOperand = ValueOperand(scratch1);
-#endif
-
-    Label failureStoreOther, failureStoreObject;
-
-    for (size_t i = 0; i < layout.properties().length(); i++) {
-        const UnboxedLayout::Property& property = layout.properties()[i];
-        Address valueAddress(propertiesReg, i * sizeof(IdValuePair) + offsetof(IdValuePair, value));
-        Address targetAddress(object, UnboxedPlainObject::offsetOfData() + property.offset);
-
-        masm.loadValue(valueAddress, valueOperand);
-
-        if (property.type == JSVAL_TYPE_OBJECT) {
-            HeapTypeSet* types = group->maybeGetProperty(IdToTypeId(NameToId(property.name)));
-
-            Label notObject;
-            masm.branchTestObject(Assembler::NotEqual, valueOperand,
-                                  types->mightBeMIRType(MIRType::Null) ? &notObject : &failureStoreObject);
-
-            Register payloadReg = masm.extractObject(valueOperand, scratch1);
-
-            if (!types->hasType(TypeSet::AnyObjectType())) {
-                Register scratch = (payloadReg == scratch1) ? scratch2 : scratch1;
-                masm.guardObjectType(payloadReg, types, scratch, &failureStoreObject);
-            }
-
-            masm.storeUnboxedProperty(targetAddress, JSVAL_TYPE_OBJECT,
-                                      TypedOrValueRegister(MIRType::Object,
-                                                           AnyRegister(payloadReg)), nullptr);
-
-            if (notObject.used()) {
-                Label done;
-                masm.jump(&done);
-                masm.bind(&notObject);
-                masm.branchTestNull(Assembler::NotEqual, valueOperand, &failureStoreOther);
-                masm.storeUnboxedProperty(targetAddress, JSVAL_TYPE_OBJECT, NullValue(), nullptr);
-                masm.bind(&done);
-            }
-        } else {
-            masm.storeUnboxedProperty(targetAddress, property.type,
-                                      ConstantOrRegister(valueOperand), &failureStoreOther);
-        }
-    }
-
-    Label done;
-    masm.bind(&done);
-
-    if (object != ReturnReg)
-        masm.movePtr(object, ReturnReg);
-
-    // Restore non-volatile registers which were saved on entry.
-    if (ScratchDoubleReg.volatile_())
-        masm.pop(ScratchDoubleReg);
-    masm.PopRegsInMask(savedNonVolatileRegisters);
-
-    masm.abiret();
-
-    masm.bind(&failureStoreOther);
-
-    // There was a failure while storing a value which cannot be stored at all
-    // in the unboxed object. Initialize the object so it is safe for GC and
-    // return null.
-    masm.initUnboxedObjectContents(object, templateObject);
-
-    masm.bind(&failure);
-
-    masm.movePtr(ImmWord(0), object);
-    masm.jump(&done);
-
-    masm.bind(&failureStoreObject);
-
-    // There was a failure while storing a value to an object slot of the
-    // unboxed object. If the value is storable, the failure occurred due to
-    // incomplete type information in the object, so return a token to trigger
-    // regeneration of the jitcode after a new object is created in the VM.
-    {
-        Label isObject;
-        masm.branchTestObject(Assembler::Equal, valueOperand, &isObject);
-        masm.branchTestNull(Assembler::NotEqual, valueOperand, &failureStoreOther);
-        masm.bind(&isObject);
-    }
-
-    // Initialize the object so it is safe for GC.
-    masm.initUnboxedObjectContents(object, templateObject);
-
-    masm.movePtr(ImmWord(CLEAR_CONSTRUCTOR_CODE_TOKEN), object);
-    masm.jump(&done);
-
-    Linker linker(masm);
-    AutoFlushICache afc("UnboxedObject");
-    JitCode* code = linker.newCode<NoGC>(cx, OTHER_CODE);
-    if (!code)
-        return false;
-
-    layout.setConstructorCode(code);
-    return true;
+    // *** STUB ***
+    return false;
 }
 
 void