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

Unified Diff: src/compiler/js-native-context-specialization.cc

Issue 2064163002: Revert of [turbofan] Introduce a dedicated CheckBounds operator. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 6 months 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/compiler/effect-control-linearizer.cc ('k') | src/compiler/opcodes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/js-native-context-specialization.cc
diff --git a/src/compiler/js-native-context-specialization.cc b/src/compiler/js-native-context-specialization.cc
index f9d403e3baa3bad31fab800c56447c375752c6d2..d8c2254961e79f84e77185a0a1af2c985d3e7def 100644
--- a/src/compiler/js-native-context-specialization.cc
+++ b/src/compiler/js-native-context-specialization.cc
@@ -636,17 +636,6 @@
receiver, jsgraph()->HeapConstant(transition_target), context,
frame_state, transition_effect, transition_control);
}
-
- // TODO(turbofan): The effect/control linearization will not find a
- // FrameState after the StoreField or Call that is generated for the
- // elements kind transition above. This is because those operatos don't
- // have the kNoWrite flag on it, even tho they are not JavaScript
- // observable, but at the same time adding kNoWrite would make them
- // eliminatable during instruction selection (at least the Call one).
- transition_effect =
- graph()->NewNode(common()->Checkpoint(), frame_state,
- transition_effect, transition_control);
-
this_controls.push_back(transition_control);
this_effects.push_back(transition_effect);
}
@@ -664,13 +653,6 @@
this_effect =
graph()->NewNode(common()->EffectPhi(this_control_count),
this_control_count + 1, &this_effects.front());
-
- // TODO(turbofan): This is another work-around, which is necessary
- // in addition to the Checkpoint above, as the CheckpointElimination
- // is not really compositional. We really need a way to address the
- // "no-write" problem on non-side-effecting nodes.
- this_effect = graph()->NewNode(common()->Checkpoint(), frame_state,
- this_effect, this_control);
}
}
@@ -680,6 +662,30 @@
Handle<JSObject> holder;
if (access_info.holder().ToHandle(&holder)) {
AssumePrototypesStable(receiver_type, native_context, holder);
+ }
+
+ // Check that the {index} is actually a Number.
+ if (!NumberMatcher(this_index).HasValue()) {
+ Node* check =
+ graph()->NewNode(simplified()->ObjectIsNumber(), this_index);
+ this_control = this_effect =
+ graph()->NewNode(common()->DeoptimizeUnless(), check, frame_state,
+ this_effect, this_control);
+ this_index = graph()->NewNode(simplified()->TypeGuard(Type::Number()),
+ this_index, this_control);
+ }
+
+ // Convert the {index} to an unsigned32 value and check if the result is
+ // equal to the original {index}.
+ if (!NumberMatcher(this_index).IsInRange(0.0, kMaxUInt32)) {
+ Node* this_index32 =
+ graph()->NewNode(simplified()->NumberToUint32(), this_index);
+ Node* check = graph()->NewNode(simplified()->NumberEqual(), this_index32,
+ this_index);
+ this_control = this_effect =
+ graph()->NewNode(common()->DeoptimizeUnless(), check, frame_state,
+ this_effect, this_control);
+ this_index = this_index32;
}
// TODO(bmeurer): We currently specialize based on elements kind. We should
@@ -717,8 +723,10 @@
this_elements, this_effect, this_control);
// Check that the {index} is in the valid range for the {receiver}.
- this_index = this_effect =
- graph()->NewNode(simplified()->CheckBounds(), this_index, this_length,
+ Node* check = graph()->NewNode(simplified()->NumberLessThan(), this_index,
+ this_length);
+ this_control = this_effect =
+ graph()->NewNode(common()->DeoptimizeUnless(), check, frame_state,
this_effect, this_control);
// Compute the element access.
« no previous file with comments | « src/compiler/effect-control-linearizer.cc ('k') | src/compiler/opcodes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698