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

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

Issue 2603263002: Prefix resolution_types with Resolution. (Closed)
Patch Set: Rebased Created 3 years, 11 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/ssa/codegen_helpers.dart ('k') | pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/ssa/graph_builder.dart
diff --git a/pkg/compiler/lib/src/ssa/graph_builder.dart b/pkg/compiler/lib/src/ssa/graph_builder.dart
index f266b55e3a08da71de6f73dc780265222dded010..93700c80e5b75a5bf30767875c003b1229095bfd 100644
--- a/pkg/compiler/lib/src/ssa/graph_builder.dart
+++ b/pkg/compiler/lib/src/ssa/graph_builder.dart
@@ -201,13 +201,13 @@ abstract class GraphBuilder {
return new HSubExpressionBlockInformation(expression);
}
- HInstruction buildFunctionType(FunctionType type) {
+ HInstruction buildFunctionType(ResolutionFunctionType type) {
type.accept(new ReifiedTypeRepresentationBuilder(closedWorld), this);
return pop();
}
HInstruction buildFunctionTypeConversion(
- HInstruction original, DartType type, int kind);
+ HInstruction original, ResolutionDartType type, int kind);
/// Returns the current source element.
///
@@ -222,8 +222,8 @@ abstract class GraphBuilder {
localsHandler.directLocals[local] != null;
}
- HInstruction callSetRuntimeTypeInfoWithTypeArguments(
- DartType type, List<HInstruction> rtiInputs, HInstruction newObject) {
+ HInstruction callSetRuntimeTypeInfoWithTypeArguments(ResolutionDartType type,
+ List<HInstruction> rtiInputs, HInstruction newObject) {
if (!backend.classNeedsRti(type.element)) {
return newObject;
}
@@ -251,14 +251,16 @@ class ReifiedTypeRepresentationBuilder
ReifiedTypeRepresentationBuilder(this.closedWorld);
- void visit(DartType type, GraphBuilder builder) => type.accept(this, builder);
+ void visit(ResolutionDartType type, GraphBuilder builder) =>
+ type.accept(this, builder);
- void visitVoidType(VoidType type, GraphBuilder builder) {
+ void visitVoidType(ResolutionVoidType type, GraphBuilder builder) {
ClassElement cls = builder.backend.helpers.VoidRuntimeType;
builder.push(new HVoidType(type, new TypeMask.exact(cls, closedWorld)));
}
- void visitTypeVariableType(TypeVariableType type, GraphBuilder builder) {
+ void visitTypeVariableType(
+ ResolutionTypeVariableType type, GraphBuilder builder) {
ClassElement cls = builder.backend.helpers.RuntimeType;
TypeMask instructionType = new TypeMask.subclass(cls, closedWorld);
if (!builder.sourceElement.enclosingElement.isClosure &&
@@ -274,22 +276,22 @@ class ReifiedTypeRepresentationBuilder
}
}
- void visitFunctionType(FunctionType type, GraphBuilder builder) {
+ void visitFunctionType(ResolutionFunctionType type, GraphBuilder builder) {
type.returnType.accept(this, builder);
HInstruction returnType = builder.pop();
List<HInstruction> inputs = <HInstruction>[returnType];
- for (DartType parameter in type.parameterTypes) {
+ for (ResolutionDartType parameter in type.parameterTypes) {
parameter.accept(this, builder);
inputs.add(builder.pop());
}
- for (DartType parameter in type.optionalParameterTypes) {
+ for (ResolutionDartType parameter in type.optionalParameterTypes) {
parameter.accept(this, builder);
inputs.add(builder.pop());
}
- List<DartType> namedParameterTypes = type.namedParameterTypes;
+ List<ResolutionDartType> namedParameterTypes = type.namedParameterTypes;
List<String> names = type.namedParameters;
for (int index = 0; index < names.length; index++) {
ast.DartString dartString = new ast.DartString.literal(names[index]);
@@ -305,12 +307,12 @@ class ReifiedTypeRepresentationBuilder
}
void visitMalformedType(MalformedType type, GraphBuilder builder) {
- visitDynamicType(const DynamicType(), builder);
+ visitDynamicType(const ResolutionDynamicType(), builder);
}
- void visitInterfaceType(InterfaceType type, GraphBuilder builder) {
+ void visitInterfaceType(ResolutionInterfaceType type, GraphBuilder builder) {
List<HInstruction> inputs = <HInstruction>[];
- for (DartType typeArgument in type.typeArguments) {
+ for (ResolutionDartType typeArgument in type.typeArguments) {
typeArgument.accept(this, builder);
inputs.add(builder.pop());
}
@@ -324,13 +326,13 @@ class ReifiedTypeRepresentationBuilder
new HInterfaceType(inputs, type, new TypeMask.exact(cls, closedWorld)));
}
- void visitTypedefType(TypedefType type, GraphBuilder builder) {
- DartType unaliased = type.unaliased;
- if (unaliased is TypedefType) throw 'unable to unalias $type';
+ void visitTypedefType(ResolutionTypedefType type, GraphBuilder builder) {
+ ResolutionDartType unaliased = type.unaliased;
+ if (unaliased is ResolutionTypedefType) throw 'unable to unalias $type';
unaliased.accept(this, builder);
}
- void visitDynamicType(DynamicType type, GraphBuilder builder) {
+ void visitDynamicType(ResolutionDynamicType type, GraphBuilder builder) {
JavaScriptBackend backend = builder.compiler.backend;
ClassElement cls = backend.helpers.DynamicRuntimeType;
builder.push(new HDynamicType(type, new TypeMask.exact(cls, closedWorld)));
« no previous file with comments | « pkg/compiler/lib/src/ssa/codegen_helpers.dart ('k') | pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698