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

Unified Diff: pkg/kernel/lib/analyzer/ast_from_analyzer.dart

Issue 2710783004: Fix two issues with modular compilation in dartk. (Closed)
Patch Set: Merge Created 3 years, 10 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 | « no previous file | pkg/kernel/lib/analyzer/loader.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/kernel/lib/analyzer/ast_from_analyzer.dart
diff --git a/pkg/kernel/lib/analyzer/ast_from_analyzer.dart b/pkg/kernel/lib/analyzer/ast_from_analyzer.dart
index 44aca4a40902acc0da81b8c7bd0e11188e20b7ba..b48b93addbdd4b14d4ac4545c941b779f318b8dd 100644
--- a/pkg/kernel/lib/analyzer/ast_from_analyzer.dart
+++ b/pkg/kernel/lib/analyzer/ast_from_analyzer.dart
@@ -438,15 +438,19 @@ class TypeScope extends ReferenceScope {
// Initialize type parameters in two passes: put them into scope,
// and compute the bounds afterwards while they are all in scope.
var typeParameters = <ast.TypeParameter>[];
+ var typeParameterElements =
+ element is ConstructorElement && element.isFactory
+ ? element.enclosingElement.typeParameters
+ : element.typeParameters;
if (strongMode || element is ConstructorElement) {
- for (var parameter in element.typeParameters) {
+ for (var parameter in typeParameterElements) {
var parameterNode = new ast.TypeParameter(parameter.name);
typeParameters.add(parameterNode);
localTypeParameters[parameter] = parameterNode;
}
}
for (int i = 0; i < typeParameters.length; ++i) {
- var parameter = element.typeParameters[i];
+ var parameter = typeParameterElements[i];
var parameterNode = typeParameters[i];
parameterNode.bound = parameter.bound == null
? defaultTypeParameterBound
« no previous file with comments | « no previous file | pkg/kernel/lib/analyzer/loader.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698