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

Side by Side Diff: pkg/compiler/lib/src/js_backend/patch_resolver.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library dart2js.js_backend.patch_resolver; 5 library dart2js.js_backend.patch_resolver;
6 6
7 import '../common.dart'; 7 import '../common.dart';
8 import '../common/resolution.dart' show Resolution; 8 import '../common/resolution.dart' show Resolution;
9 import '../common/tasks.dart' show CompilerTask; 9 import '../common/tasks.dart' show CompilerTask;
10 import '../compiler.dart' show Compiler; 10 import '../compiler.dart' show Compiler;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 ParameterElementX originParameter = originParameters[index]; 47 ParameterElementX originParameter = originParameters[index];
48 ParameterElementX patchParameter = patchParameters[index]; 48 ParameterElementX patchParameter = patchParameters[index];
49 // TODO(johnniwinther): Remove the conditional patching when we never 49 // TODO(johnniwinther): Remove the conditional patching when we never
50 // resolve the same method twice. 50 // resolve the same method twice.
51 if (!originParameter.isPatched) { 51 if (!originParameter.isPatched) {
52 originParameter.applyPatch(patchParameter); 52 originParameter.applyPatch(patchParameter);
53 } else { 53 } else {
54 assert(invariant(origin, originParameter.patch == patchParameter, 54 assert(invariant(origin, originParameter.patch == patchParameter,
55 message: "Inconsistent repatch of $originParameter.")); 55 message: "Inconsistent repatch of $originParameter."));
56 } 56 }
57 DartType originParameterType = originParameter.computeType(resolution); 57 ResolutionDartType originParameterType =
58 DartType patchParameterType = patchParameter.computeType(resolution); 58 originParameter.computeType(resolution);
59 ResolutionDartType patchParameterType =
60 patchParameter.computeType(resolution);
59 if (originParameterType != patchParameterType) { 61 if (originParameterType != patchParameterType) {
60 reporter.reportError( 62 reporter.reportError(
61 reporter.createMessage( 63 reporter.createMessage(
62 originParameter, MessageKind.PATCH_PARAMETER_TYPE_MISMATCH, { 64 originParameter, MessageKind.PATCH_PARAMETER_TYPE_MISMATCH, {
63 'methodName': origin.name, 65 'methodName': origin.name,
64 'parameterName': originParameter.name, 66 'parameterName': originParameter.name,
65 'originParameterType': originParameterType, 67 'originParameterType': originParameterType,
66 'patchParameterType': patchParameterType 68 'patchParameterType': patchParameterType
67 }), 69 }),
68 <DiagnosticMessage>[ 70 <DiagnosticMessage>[
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 'originParameterCount': originSignature.optionalParameterCount, 173 'originParameterCount': originSignature.optionalParameterCount,
172 'patchParameterCount': patchSignature.optionalParameterCount 174 'patchParameterCount': patchSignature.optionalParameterCount
173 }); 175 });
174 }); 176 });
175 } else { 177 } else {
176 checkMatchingPatchParameters(origin, originSignature.optionalParameters, 178 checkMatchingPatchParameters(origin, originSignature.optionalParameters,
177 patchSignature.optionalParameters); 179 patchSignature.optionalParameters);
178 } 180 }
179 } 181 }
180 } 182 }
OLDNEW
« no previous file with comments | « pkg/compiler/lib/src/js_backend/namer.dart ('k') | pkg/compiler/lib/src/js_backend/runtime_types.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698