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

Unified Diff: runtime/vm/class_finalizer.cc

Issue 11085003: Convert String to a class. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Merged to tip of bleeding_edge. Updated test expecteation 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 | « runtime/lib/string_patch.dart ('k') | runtime/vm/dart_api_message.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/class_finalizer.cc
diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc
index f2bb1dc372ac7b0717702cbe53167ee2459d1ce5..670d1cf8f8a1364d2c0a6a77e086797cc32da784 100644
--- a/runtime/vm/class_finalizer.cc
+++ b/runtime/vm/class_finalizer.cc
@@ -295,14 +295,17 @@ void ClassFinalizer::ResolveSuperType(const Class& cls) {
case kWeakPropertyCid:
is_error = true;
break;
- default:
+ default: {
// Special case: classes for which we don't have a known class id.
// TODO(regis): Why isn't comparing to kIntegerCid enough?
if (Type::Handle(Type::Double()).type_class() == super_class.raw() ||
- Type::Handle(Type::IntType()).type_class() == super_class.raw()) {
+ Type::Handle(Type::IntType()).type_class() == super_class.raw() ||
+ Type::Handle(
+ Type::StringType()).type_class() == super_class.raw()) {
is_error = true;
}
break;
+ }
}
if (is_error) {
const Script& script = Script::Handle(cls.script());
@@ -1392,7 +1395,7 @@ void ClassFinalizer::ResolveInterfaces(const Class& cls,
interface.IsNumberType() ||
interface.IsIntType() ||
interface.IsDoubleType() ||
- interface.IsStringInterface() ||
+ interface.IsStringType() ||
(interface.IsFunctionType() && !cls.IsSignatureClass()) ||
interface.IsDynamicType()) {
const Script& script = Script::Handle(cls.script());
« no previous file with comments | « runtime/lib/string_patch.dart ('k') | runtime/vm/dart_api_message.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698