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

Unified Diff: sdk/lib/_internal/compiler/implementation/resolution/members.dart

Issue 266193004: Clean patch implementation. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated cf. comments. Created 6 years, 7 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
Index: sdk/lib/_internal/compiler/implementation/resolution/members.dart
diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
index 4c3b88cee65ef56f6fd2be3d6c3738ef4b4ad89a..2e6ae95ab226867f084c913802a7ad0f9f556cb9 100644
--- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart
+++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -322,18 +322,7 @@ class ResolverTask extends CompilerTask {
while (!originParameters.isEmpty) {
ParameterElementX originParameter = originParameters.head;
ParameterElementX patchParameter = patchParameters.head;
- // TODO(johnniwinther): Remove the case for reassignment of
- // [patch]/[origin] when resolution is ensure to be done only once.
- assert(invariant(originParameter, originParameter.origin == null));
- assert(invariant(originParameter,
- originParameter.patch == null ||
- originParameter.patch == patchParameter));
- originParameter.patch = patchParameter;
- assert(invariant(patchParameter,
- patchParameter.origin == null ||
- patchParameter.origin == originParameter));
- assert(invariant(patchParameter, patchParameter.patch == null));
- patchParameter.origin = originParameter;
+ originParameter.applyPatch(patchParameter);
DartType originParameterType = originParameter.computeType(compiler);
DartType patchParameterType = patchParameter.computeType(compiler);
if (originParameterType != patchParameterType) {

Powered by Google App Engine
This is Rietveld 408576698