summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-05-15 02:06:04 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-05-15 02:06:04 +0000
commit3b36a43e8ecc34199759691897e18168bbb261e2 (patch)
tree1f79bbf3a06d1b5229393b6d7d4e0658aa191621
parent9a3141515f051b6622f564ba75c171822854a7ac (diff)
downloadUXP-3b36a43e8ecc34199759691897e18168bbb261e2.tar
UXP-3b36a43e8ecc34199759691897e18168bbb261e2.tar.gz
UXP-3b36a43e8ecc34199759691897e18168bbb261e2.tar.lz
UXP-3b36a43e8ecc34199759691897e18168bbb261e2.tar.xz
UXP-3b36a43e8ecc34199759691897e18168bbb261e2.zip
Remove initial chunk of Unboxed Objects machinery part 2
-rw-r--r--js/src/vm/TypeInference.cpp5
-rw-r--r--js/src/vm/UnboxedObject.h7
2 files changed, 0 insertions, 12 deletions
diff --git a/js/src/vm/TypeInference.cpp b/js/src/vm/TypeInference.cpp
index 4775a2dea..fe89fac9c 100644
--- a/js/src/vm/TypeInference.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -3577,7 +3577,6 @@ PreliminaryObjectArrayWithTemplate::maybeAnalyze(ExclusiveContext* cx, ObjectGro
}
}
- TryConvertToUnboxedLayout(cx, enter, shape(), group, preliminaryObjects);
if (group->maybeUnboxedLayout())
return;
@@ -3861,10 +3860,6 @@ TypeNewScript::maybeAnalyze(JSContext* cx, ObjectGroup* group, bool* regenerate,
PodCopy(initializerList, initializerVector.begin(), initializerVector.length());
}
- // Try to use an unboxed representation for the group.
- if (!TryConvertToUnboxedLayout(cx, enter, templateObject()->lastProperty(), group, preliminaryObjects))
- return false;
-
js_delete(preliminaryObjects);
preliminaryObjects = nullptr;
diff --git a/js/src/vm/UnboxedObject.h b/js/src/vm/UnboxedObject.h
index ecff8be5b..779dd14c7 100644
--- a/js/src/vm/UnboxedObject.h
+++ b/js/src/vm/UnboxedObject.h
@@ -317,13 +317,6 @@ class UnboxedPlainObject : public JSObject
}
};
-// Try to construct an UnboxedLayout for each of the preliminary objects,
-// provided they all match the template shape. If successful, converts the
-// preliminary objects and their group to the new unboxed representation.
-bool
-TryConvertToUnboxedLayout(ExclusiveContext* cx, AutoEnterAnalysis& enter, Shape* templateShape,
- ObjectGroup* group, PreliminaryObjectArray* objects);
-
inline gc::AllocKind
UnboxedLayout::getAllocKind() const
{