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

Unified Diff: runtime/vm/class_finalizer.cc

Issue 22819005: Make Null a public class of dart:core. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: rebase on dart2js's putback Created 7 years, 4 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: runtime/vm/class_finalizer.cc
diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc
index 8292928b130115bbd4a6623ccdf76da3059de1bd..5b4a3703586d0ece2b0b75899632abaee9e62071 100644
--- a/runtime/vm/class_finalizer.cc
+++ b/runtime/vm/class_finalizer.cc
@@ -1927,7 +1927,6 @@ void ClassFinalizer::ResolveSuperTypeAndInterfaces(
// Prevent extending core implementation classes.
bool is_error = false;
switch (interface_class.id()) {
- case kNullCid:
case kNumberCid:
case kIntegerCid: // Class Integer, not int.
case kSmiCid:
@@ -1939,6 +1938,7 @@ void ClassFinalizer::ResolveSuperTypeAndInterfaces(
case kExternalOneByteStringCid:
case kExternalTwoByteStringCid:
case kBoolCid:
+ case kNullCid:
case kArrayCid:
case kImmutableArrayCid:
case kGrowableObjectArrayCid:
@@ -2001,8 +2001,8 @@ void ClassFinalizer::ResolveSuperTypeAndInterfaces(
// The exception is signature classes, which are compiler generated and
// represent a function type, therefore implementing the Function interface.
if (!cls_belongs_to_core_lib) {
- if (interface.IsNullType() ||
- interface.IsBoolType() ||
+ if (interface.IsBoolType() ||
+ interface.IsNullType() ||
interface.IsNumberType() ||
interface.IsIntType() ||
interface.IsDoubleType() ||

Powered by Google App Engine
This is Rietveld 408576698