Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Unified Diff: src/objects.cc

Issue 735653003: Revert "Use a stub in crankshaft for grow store arrays." (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/objects.h ('k') | src/objects-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index ec31b72bd4bc20dbbc2717de2a0dc2e98ec508dc..96a1aa19c9adf0e90b6f97899203a16336f645cb 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -11267,8 +11267,10 @@ void Code::Disassemble(const char* name, std::ostream& os) { // NOLINT
#endif // ENABLE_DISASSEMBLER
-Handle<FixedArray> JSObject::SetFastElementsCapacity(
- Handle<JSObject> object, int capacity,
+Handle<FixedArray> JSObject::SetFastElementsCapacityAndLength(
+ Handle<JSObject> object,
+ int capacity,
+ int length,
SetFastElementsCapacitySmiMode smi_mode) {
// We should never end in here with a pixel or external array.
DCHECK(!object->HasExternalArrayElements());
@@ -11320,15 +11322,6 @@ Handle<FixedArray> JSObject::SetFastElementsCapacity(
object->GetElementsKind(), new_elements);
}
- return new_elements;
-}
-
-
-Handle<FixedArray> JSObject::SetFastElementsCapacityAndLength(
- Handle<JSObject> object, int capacity, int length,
- SetFastElementsCapacitySmiMode smi_mode) {
- Handle<FixedArray> new_elements =
- SetFastElementsCapacity(object, capacity, smi_mode);
if (object->IsJSArray()) {
Handle<JSArray>::cast(object)->set_length(Smi::FromInt(length));
}
@@ -11336,8 +11329,9 @@ Handle<FixedArray> JSObject::SetFastElementsCapacityAndLength(
}
-Handle<FixedArrayBase> JSObject::SetFastDoubleElementsCapacity(
- Handle<JSObject> object, int capacity) {
+void JSObject::SetFastDoubleElementsCapacityAndLength(Handle<JSObject> object,
+ int capacity,
+ int length) {
// We should never end in here with a pixel or external array.
DCHECK(!object->HasExternalArrayElements());
@@ -11367,18 +11361,9 @@ Handle<FixedArrayBase> JSObject::SetFastDoubleElementsCapacity(
object->GetElementsKind(), elems);
}
- return elems;
-}
-
-
-Handle<FixedArrayBase> JSObject::SetFastDoubleElementsCapacityAndLength(
- Handle<JSObject> object, int capacity, int length) {
- Handle<FixedArrayBase> new_elements =
- SetFastDoubleElementsCapacity(object, capacity);
if (object->IsJSArray()) {
Handle<JSArray>::cast(object)->set_length(Smi::FromInt(length));
}
- return new_elements;
}
@@ -13303,8 +13288,9 @@ void JSObject::GetElementsCapacityAndUsage(int* capacity, int* used) {
}
-bool JSObject::WouldConvertToSlowElements(uint32_t index) {
- if (HasFastElements()) {
+bool JSObject::WouldConvertToSlowElements(Handle<Object> key) {
+ uint32_t index;
+ if (HasFastElements() && key->ToArrayIndex(&index)) {
Handle<FixedArrayBase> backing_store(FixedArrayBase::cast(elements()));
uint32_t capacity = static_cast<uint32_t>(backing_store->length());
if (index >= capacity) {
« no previous file with comments | « src/objects.h ('k') | src/objects-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698