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

Unified Diff: pkg/compiler/lib/src/ssa/builder.dart

Issue 2239193002: Rerun formatter (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 4 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 | « pkg/compiler/lib/src/source_file_provider.dart ('k') | pkg/compiler/lib/src/ssa/codegen.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/ssa/builder.dart
diff --git a/pkg/compiler/lib/src/ssa/builder.dart b/pkg/compiler/lib/src/ssa/builder.dart
index 71485817e97deae67a04c71db30ed7d9a49f1689..77025b0cc96e44c2c2224bc462b7a3d62b9d76ad 100644
--- a/pkg/compiler/lib/src/ssa/builder.dart
+++ b/pkg/compiler/lib/src/ssa/builder.dart
@@ -206,8 +206,10 @@ class LocalsHandler {
LocalsHandler(
this.builder, this.executableContext, InterfaceType instanceType)
- : this.instanceType = instanceType == null ||
- instanceType.containsTypeVariables ? null : instanceType;
+ : this.instanceType =
+ instanceType == null || instanceType.containsTypeVariables
+ ? null
+ : instanceType;
/// Substituted type variables occurring in [type] into the context of
/// [contextClass].
@@ -2760,11 +2762,13 @@ class SsaBuilder extends ast.Visitor
visit(node.condition);
pushInvokeStatic(node, helpers.assertTest, [pop()]);
}
+
void fail() {
visit(node.message);
pushInvokeStatic(node, helpers.assertThrow, [pop()]);
pop();
}
+
handleIf(node, visitCondition: buildCondition, visitThen: fail);
}
@@ -3098,6 +3102,7 @@ class SsaBuilder extends ast.Visitor
pop();
}
}
+
HInstruction buildCondition() {
if (node.condition == null) {
return graph.addConstantBool(true, compiler);
@@ -3105,6 +3110,7 @@ class SsaBuilder extends ast.Visitor
visit(node.condition);
return popBoolified();
}
+
void buildUpdate() {
for (ast.Expression expression in node.update) {
visit(expression);
@@ -3114,9 +3120,11 @@ class SsaBuilder extends ast.Visitor
pop();
}
}
+
void buildBody() {
visit(node.body);
}
+
handleLoop(node, buildInitializer, buildCondition, buildUpdate, buildBody);
}
@@ -3126,6 +3134,7 @@ class SsaBuilder extends ast.Visitor
visit(node.condition);
return popBoolified();
}
+
handleLoop(node, () {}, buildCondition, () {}, () {
visit(node.body);
});
@@ -5666,8 +5675,10 @@ class SsaBuilder extends ast.Visitor
// Native behavior effects here are similar to native/behavior.dart.
// The return type is dynamic if we don't trust js-interop type
// declarations.
- nativeBehavior.typesReturned.add(compiler
- .options.trustJSInteropTypeAnnotations ? type : const DynamicType());
+ nativeBehavior.typesReturned.add(
+ compiler.options.trustJSInteropTypeAnnotations
+ ? type
+ : const DynamicType());
// The allocation effects include the declared type if it is native (which
// includes js interop types).
@@ -5801,6 +5812,7 @@ class SsaBuilder extends ast.Visitor
add(buildInvokeSuper(setterSelector, element, setterInputs));
}
}
+
if (identical(node.assignmentOperator.source, '=')) {
addDynamicSendArgumentsToList(node, setterInputs);
generateSuperSendSet();
@@ -6389,6 +6401,7 @@ class SsaBuilder extends ast.Visitor
stack.add(getterInstruction);
}
}
+
if (node.isConditional) {
// generate `e?.x op= e2` as:
// t1 = e
@@ -6639,6 +6652,7 @@ class SsaBuilder extends ast.Visitor
void loadLocal(ParameterElement parameter) {
inputs.add(localsHandler.readLocal(parameter));
}
+
void loadPosition(int position, ParameterElement optionalParameter) {
if (position < redirectingRequireds.length) {
loadLocal(redirectingRequireds[position]);
@@ -6927,6 +6941,7 @@ class SsaBuilder extends ast.Visitor
new TypeMask.subclass(coreClasses.objectClass, compiler.world)));
return popBoolified();
}
+
void buildBody() {
Selector call = Selectors.current;
TypeMask callMask = elements.getCurrentTypeMask(node);
@@ -7341,6 +7356,7 @@ class SsaBuilder extends ast.Visitor
visit(node.expression);
return pop();
}
+
Iterable<ConstantValue> getConstants(ast.SwitchCase switchCase) {
List<ConstantValue> constantList = <ConstantValue>[];
for (ast.Node labelOrCase in switchCase.labelsAndCases) {
@@ -7350,12 +7366,15 @@ class SsaBuilder extends ast.Visitor
}
return constantList;
}
+
bool isDefaultCase(ast.SwitchCase switchCase) {
return switchCase.isDefaultCase;
}
+
void buildSwitchCase(ast.SwitchCase node) {
visit(node.statements);
}
+
handleSwitch(node, jumpHandler, buildExpression, node.cases, getConstants,
isDefaultCase, buildSwitchCase);
jumpHandler.close();
@@ -7414,6 +7433,7 @@ class SsaBuilder extends ast.Visitor
visit(node.expression);
return pop();
}
+
Iterable<ConstantValue> getConstants(ast.SwitchCase switchCase) {
List<ConstantValue> constantList = <ConstantValue>[];
if (switchCase != null) {
@@ -7425,9 +7445,11 @@ class SsaBuilder extends ast.Visitor
}
return constantList;
}
+
bool isDefaultCase(ast.SwitchCase switchCase) {
return switchCase == null || switchCase.isDefaultCase;
}
+
void buildSwitchCase(ast.SwitchCase switchCase) {
if (switchCase != null) {
// Generate 'target = i; break;' for switch case i.
@@ -7441,6 +7463,7 @@ class SsaBuilder extends ast.Visitor
}
jumpTargets[switchTarget].generateBreak();
}
+
handleSwitch(node, jumpHandler, buildExpression, switchCases, getConstants,
isDefaultCase, buildSwitchCase);
jumpHandler.close();
@@ -7451,9 +7474,11 @@ class SsaBuilder extends ast.Visitor
HInstruction buildExpression() {
return localsHandler.readLocal(switchTarget);
}
+
Iterable<ConstantValue> getConstants(ast.SwitchCase switchCase) {
return <ConstantValue>[constantSystem.createInt(caseIndex[switchCase])];
}
+
void buildSwitchCase(ast.SwitchCase switchCase) {
visit(switchCase.statements);
if (!isAborted()) {
@@ -7462,6 +7487,7 @@ class SsaBuilder extends ast.Visitor
jumpTargets[switchTarget].generateBreak();
}
}
+
// Pass a [NullJumpHandler] because the target for the contained break
// is not the generated switch statement but instead the loop generated
// in the call to [handleLoop] below.
@@ -7490,6 +7516,7 @@ class SsaBuilder extends ast.Visitor
code, backend.boolType, [localsHandler.readLocal(switchTarget)],
nativeBehavior: native.NativeBehavior.PURE));
}
+
handleIf(node,
visitCondition: buildCondition,
visitThen: buildLoop,
@@ -7865,6 +7892,7 @@ class SsaBuilder extends ast.Visitor
addOptionalSuccessor(b1, b2) {
if (b2 != null) b1.addSuccessor(b2);
}
+
addExitTrySuccessor(successor) {
if (successor == null) return;
// Iterate over all blocks created inside this try/catch, and
« no previous file with comments | « pkg/compiler/lib/src/source_file_provider.dart ('k') | pkg/compiler/lib/src/ssa/codegen.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698