Commit 48f7f214 authored by Jan de Mooij's avatar Jan de Mooij
Browse files

Bug 1805430 part 3 - Use replaceShape also for dictionary shapes in changeProperty. r=jonco 

Now that `replaceShape` also works for dictionary shapes, we don't need the `isShared` check anymore.

Depends on D164572

Differential Revision: https://phabricator.services.mozilla.com/D164575
parent ff54f31c

js/src/vm/Shape.cpp

+3 −9
Original line number Diff line number Diff line
@@ -536,18 +536,12 @@ bool NativeObject::changeProperty(JSContext* cx, Handle<NativeObject*> obj, 
  // If the property flags are not changing, the only thing we have to do is

  // update the object flags. This prevents a dictionary mode conversion below.

  if (oldProp.flags() == flags) {

    if (objectFlags == obj->shape()->objectFlags()) {

      *slotOut = oldProp.slot();

      return true;

    }

    if (map->isShared()) {

      if (!Shape::replaceShape(cx, obj, objectFlags, obj->shape()->proto(),

                               obj->shape()->numFixedSlots())) {

        return false;

      }

    *slotOut = oldProp.slot();

    if (objectFlags == obj->shape()->objectFlags()) {

      return true;

    }

    return Shape::replaceShape(cx, obj, objectFlags, obj->shape()->proto(),

                               obj->shape()->numFixedSlots());

  }



  const JSClass* clasp = obj->shape()->getObjectClass();