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

Unified Diff: sdk/lib/_internal/compiler/implementation/dart_types.dart

Issue 13467021: Register type for literal list/map. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 8 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/dart_types.dart
diff --git a/sdk/lib/_internal/compiler/implementation/dart_types.dart b/sdk/lib/_internal/compiler/implementation/dart_types.dart
index 96e52c8b50205ba5600ad2e1577b70380d505922..560bb531cd61bb72d0ec9bf4f711961b3a2d9c16 100644
--- a/sdk/lib/_internal/compiler/implementation/dart_types.dart
+++ b/sdk/lib/_internal/compiler/implementation/dart_types.dart
@@ -5,7 +5,8 @@
library dart_types;
import 'dart2jslib.dart' show Compiler, invariant, Script, Message;
-import 'elements/modelx.dart' show VoidElementX, LibraryElementX;
+import 'elements/modelx.dart'
+ show VoidElementX, LibraryElementX, BaseClassElementX;
import 'elements/elements.dart';
import 'scanner/scannerlib.dart' show SourceString;
import 'util/util.dart' show Link, LinkBuilder;
@@ -451,8 +452,8 @@ class InterfaceType extends GenericType {
assert(invariant(element, element.isDeclaration));
assert(invariant(element, element.thisType == null ||
typeArguments.slowLength() == element.typeVariables.slowLength(),
- message: 'Invalid type argument count on ${element.thisType}. '
- 'Provided type arguments: $typeArguments.'));
+ message: () => 'Invalid type argument count on ${element.thisType}. '
ngeoffray 2013/04/10 11:35:51 Why this change?
Johnni Winther 2013/04/10 11:43:27 Eager evaluation of the message could provoke a cr
+ 'Provided type arguments: $typeArguments.'));
}
InterfaceType.userProvidedBadType(this.element,
@@ -1087,11 +1088,11 @@ class Types {
final DynamicType dynamicType;
final SubtypeVisitor subtypeVisitor;
- factory Types(Compiler compiler, ClassElement dynamicElement) {
+ factory Types(Compiler compiler, BaseClassElementX dynamicElement) {
LibraryElement library = new LibraryElementX(new Script(null, null));
VoidType voidType = new VoidType(new VoidElementX(library));
DynamicType dynamicType = new DynamicType(dynamicElement);
- dynamicElement.rawType = dynamicElement.thisType = dynamicType;
+ dynamicElement.rawTypeCache = dynamicElement.thisType = dynamicType;
SubtypeVisitor subtypeVisitor =
new SubtypeVisitor(compiler, dynamicType, voidType);
return new Types.internal(compiler, voidType, dynamicType, subtypeVisitor);

Powered by Google App Engine
This is Rietveld 408576698