sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart - Issue 147743005: classes with call-methods were not recognized as Functions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart

Issue 147743005: classes with call-methods were not recognized as Functions. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Forgot to update analyzer2 status file. Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sdk/lib/_internal/compiler/implementation/elements/elements.dart ('k') | tests/language/function_propagation_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart

diff --git a/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart b/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart

index 1938dfc58aec14c0abb81a11fa3369f9633a1808..3cf1dbf6e9ef3802c7868e86624e31b78b853e40 100644

--- a/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart

+++ b/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart

@@ -603,7 +603,12 @@ class FlatTypeMask implements TypeMask {

static bool isSubtypeOf(ClassElement x, ClassElement y, Compiler compiler) {

assert(x.isDeclaration && y.isDeclaration);

Set<ClassElement> subtypes = compiler.world.subtypesOf(y);

- return (subtypes != null) ? subtypes.contains(x) : false;

+ if (subtypes != null && subtypes.contains(x)) return true;

+ if (y != compiler.functionClass) return false;

+ // TODO(johnniwinther): Clean this up (function inheritance).

+ Member member =

+ x.lookupInterfaceMember(const PublicName(Compiler.CALL_OPERATOR_NAME));

+ return member != null && member.isMethod;

}

static Set<ClassElement> commonContainedClasses(FlatTypeMask x,

« no previous file with comments | « sdk/lib/_internal/compiler/implementation/elements/elements.dart ('k') | tests/language/function_propagation_test.dart » ('j') | no next file with comments »