Reviewers: Benedikt Meurer,
Description:
[turbofan] Unify various bailout hacks for super call.
This removes various boilouts for super constructor calls from the
TurboFan pipeline and unifies them. It also disables and optimization
which breaks references to uninitialized const this variables.
[email protected]
Please review this at https://codereview.chromium.org/1222843004/
Base URL:
https://chromium.googlesource.com/v8/v8.git@local_cleanup-frame-constants-1
Affected files (+25, -19 lines):
M src/compiler/ast-graph-builder.cc
M src/compiler/pipeline.cc
Index: src/compiler/ast-graph-builder.cc
diff --git a/src/compiler/ast-graph-builder.cc
b/src/compiler/ast-graph-builder.cc
index
e802cd8399682122e6fbd1bfc64749f036551bbc..ca34d724a9c3c760b04fbf38fb9548700d74f574
100644
--- a/src/compiler/ast-graph-builder.cc
+++ b/src/compiler/ast-graph-builder.cc
@@ -2535,15 +2535,21 @@ void AstGraphBuilder::VisitCallRuntime(CallRuntime*
expr) {
return VisitCallJSRuntime(expr);
}
+ // TODO(mstarzinger): This bailout is a gigantic hack, the owner is
ashamed.
+ if (function->function_id == Runtime::kInlineGeneratorNext ||
+ function->function_id == Runtime::kInlineGeneratorThrow ||
+ function->function_id == Runtime::kInlineDefaultConstructorCallSuper
||
+ function->function_id == Runtime::kInlineCallSuperWithSpread) {
+ ast_context()->ProduceValue(jsgraph()->TheHoleConstant());
+ return SetStackOverflow();
+ }
+
// Evaluate all arguments to the runtime call.
ZoneList<Expression*>* args = expr->arguments();
VisitForValues(args);
// Create node to perform the runtime call.
Runtime::FunctionId functionId = function->function_id;
- // TODO(mstarzinger): This bailout is a gigantic hack, the owner is
ashamed.
- if (functionId == Runtime::kInlineGeneratorNext) SetStackOverflow();
- if (functionId == Runtime::kInlineGeneratorThrow) SetStackOverflow();
const Operator* call = javascript()->CallRuntime(functionId,
args->length());
FrameStateBeforeAndAfter states(this, expr->CallId());
Node* value = ProcessArguments(call, args->length());
@@ -2816,7 +2822,10 @@ void
AstGraphBuilder::VisitCompareOperation(CompareOperation* expr) {
}
-void AstGraphBuilder::VisitSpread(Spread* expr) { UNREACHABLE(); }
+void AstGraphBuilder::VisitSpread(Spread* expr) {
+ // Handled entirely by the parser itself.
+ UNREACHABLE();
+}
void AstGraphBuilder::VisitThisFunction(ThisFunction* expr) {
@@ -2827,20 +2836,21 @@ void
AstGraphBuilder::VisitThisFunction(ThisFunction* expr) {
void AstGraphBuilder::VisitSuperPropertyReference(
SuperPropertyReference* expr) {
- // TODO(turbofan): Implement super here.
- SetStackOverflow();
- ast_context()->ProduceValue(jsgraph()->UndefinedConstant());
+ // Handled entirely in VisitProperty and friends.
+ UNREACHABLE();
}
void AstGraphBuilder::VisitSuperCallReference(SuperCallReference* expr) {
- // TODO(turbofan): Implement super here.
- SetStackOverflow();
- ast_context()->ProduceValue(jsgraph()->UndefinedConstant());
+ // Handled entirely in VisitCall and friends.
+ UNREACHABLE();
}
-void AstGraphBuilder::VisitCaseClause(CaseClause* expr) { UNREACHABLE(); }
+void AstGraphBuilder::VisitCaseClause(CaseClause* expr) {
+ // Handled entirely in VisitSwitch.
+ UNREACHABLE();
+}
void AstGraphBuilder::VisitDeclarations(ZoneList<Declaration*>*
declarations) {
@@ -3271,9 +3281,12 @@ Node* AstGraphBuilder::BuildVariableLoad(Variable*
variable,
}
} else if (mode == LET || mode == CONST) {
// Perform check for uninitialized let/const variables.
+ // TODO(mstarzinger): For now we cannot use the below optimization
for
+ // the {this} parameter, because JSConstructStubForDerived
magically
+ // passes {the_hole} as a receiver.
if (value->op() == the_hole->op()) {
value = BuildThrowReferenceError(variable, bailout_id);
- } else if (value->opcode() == IrOpcode::kPhi) {
+ } else if (value->opcode() == IrOpcode::kPhi ||
variable->is_this()) {
value = BuildHoleCheckThrow(value, variable, value, bailout_id);
}
}
Index: src/compiler/pipeline.cc
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
index
ef9adc97451decf95db8d23f4dc9382f63de7136..55455690dded1f66cefa3c6e2fd883912c647c10
100644
--- a/src/compiler/pipeline.cc
+++ b/src/compiler/pipeline.cc
@@ -966,19 +966,12 @@ Handle<Code> Pipeline::GenerateCode() {
// TODO(mstarzinger): This is just a temporary hack to make TurboFan
work,
// the correct solution is to restore the context register after invoking
// builtins from full-codegen.
- Handle<SharedFunctionInfo> shared = info()->shared_info();
for (int i = 0; i < Builtins::NumberOfJavaScriptBuiltins(); i++) {
Builtins::JavaScript id = static_cast<Builtins::JavaScript>(i);
Object* builtin =
isolate()->js_builtins_object()->javascript_builtin(id);
if (*info()->closure() == builtin) return Handle<Code>::null();
}
- // TODO(dslomov): support turbo optimization of subclass constructors.
- if (IsSubclassConstructor(shared->kind())) {
- shared->DisableOptimization(kSuperReference);
- return Handle<Code>::null();
- }
-
ZonePool zone_pool;
SmartPointer<PipelineStatistics> pipeline_statistics;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
