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

Unified Diff: src/hydrogen.cc

Issue 368263003: Use a stub in crankshaft for grow store arrays. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Rebase. 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/hydrogen.h ('k') | src/hydrogen-instructions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index 21ef8c019fb410b26214f1751c53e27e3a8579fb..d188cb886fe94a36a7c7c33a7ffe4df718c582da 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -1297,6 +1297,20 @@ HValue* HGraphBuilder::BuildWrapReceiver(HValue* object, HValue* function) {
}
+HValue* HGraphBuilder::BuildCheckAndGrowElementsCapacity(
+ HValue* object, HValue* elements, ElementsKind kind, HValue* length,
+ HValue* capacity, HValue* key) {
+ HValue* max_gap = Add<HConstant>(static_cast<int32_t>(JSObject::kMaxGap));
+ HValue* max_capacity = AddUncasted<HAdd>(capacity, max_gap);
+ Add<HBoundsCheck>(key, max_capacity);
+
+ HValue* new_capacity = BuildNewElementsCapacity(key);
+ HValue* new_elements = BuildGrowElementsCapacity(object, elements, kind, kind,
+ length, new_capacity);
+ return new_elements;
+}
+
+
HValue* HGraphBuilder::BuildCheckForCapacityGrow(
HValue* object,
HValue* elements,
@@ -1320,17 +1334,26 @@ HValue* HGraphBuilder::BuildCheckForCapacityGrow(
Token::GTE);
capacity_checker.Then();
- HValue* max_gap = Add<HConstant>(static_cast<int32_t>(JSObject::kMaxGap));
- HValue* max_capacity = AddUncasted<HAdd>(current_capacity, max_gap);
-
- Add<HBoundsCheck>(key, max_capacity);
-
- HValue* new_capacity = BuildNewElementsCapacity(key);
- HValue* new_elements = BuildGrowElementsCapacity(object, elements,
- kind, kind, length,
- new_capacity);
+ // BuildCheckAndGrowElementsCapacity could de-opt without profitable feedback,
+ // therefore we defer calling it to a stub in optimized functions. It is
+ // okay to call directly in a code stub though, because a bailout to the
+ // runtime is tolerable in the corner cases.
+ if (top_info()->IsStub()) {
+ environment()->Push(BuildCheckAndGrowElementsCapacity(
+ object, elements, kind, length, current_capacity, key));
+ } else {
+ GrowArrayElementsStub stub(isolate(), is_js_array, kind);
+ GrowArrayElementsDescriptor descriptor(isolate());
+ HConstant* target = Add<HConstant>(stub.GetCode());
+ HValue* op_vals[] = {context(), object, key, current_capacity};
+ HValue* new_elements = Add<HCallWithDescriptor>(
+ target, 0, descriptor, Vector<HValue*>(op_vals, 4));
+ // If the object changed to a dictionary, GrowArrayElements will return a
+ // smi to signal that deopt is required.
+ Add<HCheckHeapObject>(new_elements);
+ environment()->Push(new_elements);
+ }
- environment()->Push(new_elements);
capacity_checker.Else();
environment()->Push(elements);
« no previous file with comments | « src/hydrogen.h ('k') | src/hydrogen-instructions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698