From eb360ed94bebb7c41125632c5e8a2b0547e2ca6e Mon Sep 17 00:00:00 2001 From: Ted Campbell Date: Fri, 19 Apr 2019 20:35:16 +0000 Subject: [PATCH] Bug 1545798 - Remove comments still referring to UnboxedObject. r=mgaudet Depends on D28209 Differential Revision: https://phabricator.services.mozilla.com/D28210 --HG-- extra : moz-landing-system : lando --- js/src/builtin/Object.cpp | 6 ++---- js/src/jit/MIR.h | 2 +- js/src/vm/JSObject.cpp | 3 +-- js/src/vm/ObjectGroup.h | 14 ++++++-------- js/src/vm/TypeSet.h | 6 ------ 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/js/src/builtin/Object.cpp b/js/src/builtin/Object.cpp index 0e4e3ee43c87..135bbaa5dfbc 100644 --- a/js/src/builtin/Object.cpp +++ b/js/src/builtin/Object.cpp @@ -797,8 +797,7 @@ static bool TryAssignNative(JSContext* cx, HandleObject to, HandleObject from, shape = shapes[i - 1]; nextKey = shape->propid(); - // Ensure |from| is still native: a getter/setter might have turned - // |from| or |to| into an unboxed object or it could have been swapped + // Ensure |from| is still native: a getter/setter might have been swapped // with a non-native object. if (MOZ_LIKELY(from->isNative() && from->as().lastProperty() == fromShape && @@ -1436,8 +1435,7 @@ static bool TryEnumerableOwnPropertiesNative(JSContext* cx, HandleObject obj, Shape* shape = shapes[i - 1]; id = shape->propid(); - // Ensure |obj| is still native: a getter might have turned it - // into an unboxed object or it could have been swapped with a + // Ensure |obj| is still native: a getter might have been swapped with a // non-native object. if (obj->isNative() && obj->as().lastProperty() == objShape && diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 342cd4ca59fc..9b78fe067785 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -337,7 +337,7 @@ class AliasSet { Element = 1 << 1, // A Value member of obj->elements or // a typed object. UnboxedElement = 1 << 2, // An unboxed scalar or reference member of - // typed object or unboxed object. + // typed object. DynamicSlot = 1 << 3, // A Value member of obj->slots. FixedSlot = 1 << 4, // A Value member of obj->fixedSlots(). DOMProperty = 1 << 5, // A DOM property diff --git a/js/src/vm/JSObject.cpp b/js/src/vm/JSObject.cpp index 5125b0f99953..4f7b568eec55 100644 --- a/js/src/vm/JSObject.cpp +++ b/js/src/vm/JSObject.cpp @@ -3975,8 +3975,7 @@ void JSObject::addSizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf, } size_t JSObject::sizeOfIncludingThisInNursery() const { - // This function doesn't concern itself yet with typed objects (bug 1133593) - // nor unboxed objects (bug 1133592). + // This function doesn't concern itself yet with typed objects (bug 1133593). MOZ_ASSERT(!isTenured()); diff --git a/js/src/vm/ObjectGroup.h b/js/src/vm/ObjectGroup.h index df5574361b8e..4169ae1e547c 100644 --- a/js/src/vm/ObjectGroup.h +++ b/js/src/vm/ObjectGroup.h @@ -114,10 +114,9 @@ class ObjectGroup : public gc::TenuredCell { * The type sets in the properties of a group describe the possible values * that can be read out of that property in actual JS objects. In native * objects, property types account for plain data properties (those with a - * slot and no getter or setter hook) and dense elements. In typed objects - * and unboxed objects, property types account for object and value - * properties and elements in the object, and expando properties in unboxed - * objects. + * slot and no getter or setter hook) and dense elements. In typed objects, + * property types account for object and value properties and elements in the + * object. * * For accesses on these properties, the correspondence is as follows: * @@ -140,10 +139,9 @@ class ObjectGroup : public gc::TenuredCell { * 2. Array lengths are special cased by the compiler and VM and are not * reflected in property types. * - * 3. In typed objects (but not unboxed objects), the initial values of - * properties (null pointers and undefined values) are not reflected in - * the property types. These values are always possible when reading the - * property. + * 3. In typed objects, the initial values of properties (null pointers and + * undefined values) are not reflected in the property types. These values + * are always possible when reading the property. * * We establish these by using write barriers on calls to setProperty and * defineProperty which are on native properties, and on any jitcode which diff --git a/js/src/vm/TypeSet.h b/js/src/vm/TypeSet.h index 0d295e70a945..9da565a2840a 100644 --- a/js/src/vm/TypeSet.h +++ b/js/src/vm/TypeSet.h @@ -255,12 +255,6 @@ class TemporaryTypeSet; * the new group. When this occurs, the properties of the old and new group * will both be marked as unknown, which will prevent Ion from optimizing * based on the object's type information. - * - * - If an unboxed object is converted to a native object, its group will also - * change and type sets containing the old group will not necessarily contain - * the new group. Unlike the above case, this will not degrade property type - * information, but Ion will no longer optimize unboxed objects with the old - * group. */ class TypeSet { protected: