| Index: pkg/compiler/lib/src/kernel/kernel_visitor.dart
|
| diff --git a/pkg/compiler/lib/src/kernel/kernel_visitor.dart b/pkg/compiler/lib/src/kernel/kernel_visitor.dart
|
| index 460c12d0acd3e06e830e23ab42f80b74f434cbe1..c947b30e6949f55124222e55c10bd50fe064af67 100644
|
| --- a/pkg/compiler/lib/src/kernel/kernel_visitor.dart
|
| +++ b/pkg/compiler/lib/src/kernel/kernel_visitor.dart
|
| @@ -217,7 +217,7 @@ class KernelVisitor extends Object
|
| return node;
|
| }
|
|
|
| - ir.Node associateNode(ir.Node node, Node ast) {
|
| + N associateNode<N extends ir.Node>(N node, Node ast) {
|
| kernel.nodeToAst[node] = ast;
|
| return node;
|
| }
|
| @@ -1275,7 +1275,7 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.Expression visitClassTypeLiteralSet(
|
| - SendSet node, ConstantExpression constant, Node rhs, _) {
|
| + SendSet node, TypeConstantExpression constant, Node rhs, _) {
|
| return buildTypeLiteralSet(constant, rhs);
|
| }
|
|
|
| @@ -1412,7 +1412,7 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.Expression visitDynamicTypeLiteralSet(
|
| - SendSet node, ConstantExpression constant, Node rhs, _) {
|
| + SendSet node, TypeConstantExpression constant, Node rhs, _) {
|
| return buildTypeLiteralSet(constant, rhs);
|
| }
|
|
|
| @@ -2323,7 +2323,7 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.Expression handleStaticGetterSet(
|
| - SendSet node, FunctionElement getter, Node rhs, _) {
|
| + SendSet node, GetterElement getter, Node rhs, _) {
|
| return buildStaticAccessor(getter)
|
| .buildAssignment(visitForValue(rhs), voidContext: isVoidContext);
|
| }
|
| @@ -2359,7 +2359,7 @@ class KernelVisitor extends Object
|
| }
|
|
|
| @override
|
| - ir.SuperMethodInvocation visitSuperBinary(Send node, FunctionElement function,
|
| + ir.SuperMethodInvocation visitSuperBinary(Send node, MethodElement function,
|
| BinaryOperator operator, Node argument, _) {
|
| transformerFlags |= TransformerFlag.superCalls;
|
| return new ir.SuperMethodInvocation(
|
| @@ -2412,7 +2412,7 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.SuperMethodInvocation visitSuperEquals(
|
| - Send node, FunctionElement function, Node argument, _) {
|
| + Send node, MethodElement function, Node argument, _) {
|
| return buildSuperEquals(function, argument);
|
| }
|
|
|
| @@ -2519,8 +2519,7 @@ class KernelVisitor extends Object
|
| }
|
|
|
| @override
|
| - ir.SuperPropertyGet visitSuperGetterGet(
|
| - Send node, FunctionElement getter, _) {
|
| + ir.SuperPropertyGet visitSuperGetterGet(Send node, MethodElement getter, _) {
|
| return buildSuperPropertyAccessor(getter).buildSimpleRead();
|
| }
|
|
|
| @@ -2556,7 +2555,7 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.SuperMethodInvocation visitSuperIndex(
|
| - Send node, FunctionElement function, Node index, _) {
|
| + Send node, MethodElement function, Node index, _) {
|
| return buildSuperIndexAccessor(index, function).buildSimpleRead();
|
| }
|
|
|
| @@ -2617,14 +2616,14 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.Expression visitSuperMethodSet(
|
| - Send node, MethodElement method, Node rhs, _) {
|
| + SendSet node, MethodElement method, Node rhs, _) {
|
| return buildSuperPropertyAccessor(method)
|
| .buildAssignment(visitForValue(rhs), voidContext: isVoidContext);
|
| }
|
|
|
| @override
|
| ir.Not visitSuperNotEquals(
|
| - Send node, FunctionElement function, Node argument, _) {
|
| + Send node, MethodElement function, Node argument, _) {
|
| return new ir.Not(buildSuperEquals(function, argument));
|
| }
|
|
|
| @@ -2649,7 +2648,7 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.SuperMethodInvocation visitSuperUnary(
|
| - Send node, UnaryOperator operator, FunctionElement function, _) {
|
| + Send node, UnaryOperator operator, MethodElement function, _) {
|
| transformerFlags |= TransformerFlag.superCalls;
|
| return new ir.SuperMethodInvocation(kernel.irName(function.name, function),
|
| new ir.Arguments.empty(), kernel.functionToIr(function));
|
| @@ -2827,7 +2826,7 @@ class KernelVisitor extends Object
|
|
|
| @override
|
| ir.Expression visitTypedefTypeLiteralSet(
|
| - SendSet node, ConstantExpression constant, Node rhs, _) {
|
| + SendSet node, TypeConstantExpression constant, Node rhs, _) {
|
| return buildTypeLiteralSet(constant, rhs);
|
| }
|
|
|
|
|