| Index: pkg/front_end/lib/src/fasta/kernel/frontend_accessors.dart
|
| diff --git a/pkg/front_end/lib/src/fasta/kernel/frontend_accessors.dart b/pkg/front_end/lib/src/fasta/kernel/frontend_accessors.dart
|
| index 669e0f726575a9e28f8d1cd46a91015b61aaabb3..27ba25d99fe7e232857124c8c715c6a5b69fb81e 100644
|
| --- a/pkg/front_end/lib/src/fasta/kernel/frontend_accessors.dart
|
| +++ b/pkg/front_end/lib/src/fasta/kernel/frontend_accessors.dart
|
| @@ -511,7 +511,7 @@ class ThisIndexAccessor extends Accessor {
|
| : super(helper, token);
|
|
|
| Expression _makeSimpleRead() {
|
| - return new KernelMethodInvocation(new ThisExpression(), indexGetName,
|
| + return new KernelMethodInvocation(new KernelThisExpression(), indexGetName,
|
| new KernelArguments(<Expression>[index]),
|
| interfaceTarget: getter);
|
| }
|
| @@ -519,8 +519,8 @@ class ThisIndexAccessor extends Accessor {
|
| Expression _makeSimpleWrite(Expression value, bool voidContext,
|
| KernelComplexAssignment complexAssignment) {
|
| if (!voidContext) return _makeWriteAndReturn(value, complexAssignment);
|
| - var write = new KernelMethodInvocation(new ThisExpression(), indexSetName,
|
| - new KernelArguments(<Expression>[index, value]),
|
| + var write = new KernelMethodInvocation(new KernelThisExpression(),
|
| + indexSetName, new KernelArguments(<Expression>[index, value]),
|
| interfaceTarget: setter)
|
| ..fileOffset = offsetForToken(token);
|
| complexAssignment?.write = write;
|
| @@ -533,8 +533,8 @@ class ThisIndexAccessor extends Accessor {
|
| }
|
|
|
| Expression _makeRead(KernelComplexAssignment complexAssignment) {
|
| - var read = new KernelMethodInvocation(new ThisExpression(), indexGetName,
|
| - new KernelArguments(<Expression>[indexAccess()]),
|
| + var read = new KernelMethodInvocation(new KernelThisExpression(),
|
| + indexGetName, new KernelArguments(<Expression>[indexAccess()]),
|
| interfaceTarget: getter)
|
| ..fileOffset = offsetForToken(token);
|
| complexAssignment?.read = read;
|
| @@ -544,8 +544,8 @@ class ThisIndexAccessor extends Accessor {
|
| Expression _makeWrite(Expression value, bool voidContext,
|
| KernelComplexAssignment complexAssignment) {
|
| if (!voidContext) return _makeWriteAndReturn(value, complexAssignment);
|
| - var write = new KernelMethodInvocation(new ThisExpression(), indexSetName,
|
| - new KernelArguments(<Expression>[indexAccess(), value]),
|
| + var write = new KernelMethodInvocation(new KernelThisExpression(),
|
| + indexSetName, new KernelArguments(<Expression>[indexAccess(), value]),
|
| interfaceTarget: setter)
|
| ..fileOffset = offsetForToken(token);
|
| complexAssignment?.write = write;
|
| @@ -556,7 +556,7 @@ class ThisIndexAccessor extends Accessor {
|
| Expression value, KernelComplexAssignment complexAssignment) {
|
| var valueVariable = new VariableDeclaration.forValue(value);
|
| var write = new KernelMethodInvocation(
|
| - new ThisExpression(),
|
| + new KernelThisExpression(),
|
| indexSetName,
|
| new KernelArguments(
|
| <Expression>[indexAccess(), new VariableGet(valueVariable)]),
|
|
|