sdk/lib/_internal/compiler/implementation/compile_time_constants.dart - Issue 11412245: MalformedType used for all invalid type annotations.

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/compile_time_constants.dart

Issue 11412245: MalformedType used for all invalid type annotations. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 8 years, 1 month 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 | sdk/lib/_internal/compiler/implementation/dart_backend/placeholder_collector.dart » ('j') | sdk/lib/_internal/compiler/implementation/lib/js_helper.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/compile_time_constants.dart

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

index 975d4e510e16b9e3cf508dcee0246a52f3af35ec..0ac15099044b7911d906f218eff73773deb90479 100644

--- a/sdk/lib/_internal/compiler/implementation/compile_time_constants.dart

+++ b/sdk/lib/_internal/compiler/implementation/compile_time_constants.dart

@@ -133,7 +133,8 @@ class ConstantHandler extends CompilerTask {

&& element.isField()) {

ngeoffray 2012/11/30 12:00:40 Maybe try to have this method call potentiallyChec

Johnni Winther 2012/12/04 10:07:17 I found no clean way to refactor.

DartType elementType = element.computeType(compiler);

DartType constantType = value.computeType(compiler);

- if (!constantSystem.isSubtype(compiler, constantType, elementType)) {

+ if (elementType.isMalformed || constantType.isMalformed ||

+ !constantSystem.isSubtype(compiler, constantType, elementType)) {

if (isConst) {

MessageKind kind = MessageKind.NOT_ASSIGNABLE;

compiler.reportError(node, new CompileTimeConstantError(

@@ -713,7 +714,8 @@ class ConstructorEvaluator extends CompileTimeConstantEvaluator {

DartType constantType = constant.computeType(compiler);

// TODO(ngeoffray): Handle type parameters.

if (elementType.element.isTypeVariable()) return;

- if (!constantSystem.isSubtype(compiler, constantType, elementType)) {

+ if (elementType.isMalformed || constantType.isMalformed ||

+ !constantSystem.isSubtype(compiler, constantType, elementType)) {

MessageKind kind = MessageKind.NOT_ASSIGNABLE;

compiler.reportError(node, new CompileTimeConstantError(

kind, [elementType, constantType]));