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

Unified Diff: runtime/vm/code_generator.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: 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/code_generator.cc
diff --git a/runtime/vm/code_generator.cc b/runtime/vm/code_generator.cc
index 7aaf5bc0cb39a1f88c90c58d377980cf6a1d6898..2f7247398acc1c3214b71ef162fb3d1350cf2231 100644
--- a/runtime/vm/code_generator.cc
+++ b/runtime/vm/code_generator.cc
@@ -1032,11 +1032,6 @@ DEFINE_RUNTIME_ENTRY(MegamorphicCacheMissHandler, 3) {
const MegamorphicCache& cache = MegamorphicCache::Handle(
isolate->megamorphic_cache_table()->Lookup(name, descriptor));
Class& cls = Class::Handle(receiver.clazz());
- const bool is_null = cls.IsNullClass();
- // For lookups treat null as an instance of class Object.
- if (is_null) {
- cls = isolate->object_store()->object_class();
- }
ASSERT(!cls.IsNull());
if (FLAG_trace_ic || FLAG_trace_ic_miss_in_optimized) {
OS::PrintErr("Megamorphic IC miss, class=%s, function=%s\n",
@@ -1064,8 +1059,7 @@ DEFINE_RUNTIME_ENTRY(MegamorphicCacheMissHandler, 3) {
if (instructions.IsNull()) return;
cache.EnsureCapacity();
- const Smi& class_id = Smi::Handle(Smi::New(
- is_null ? static_cast<intptr_t>(kNullCid) : cls.id()));
+ const Smi& class_id = Smi::Handle(Smi::New(cls.id()));
cache.Insert(class_id, target);
return;
}
@@ -1217,11 +1211,7 @@ DEFINE_RUNTIME_ENTRY(InstanceFunctionLookup, 4) {
const Array& args_descriptor = Array::CheckedHandle(arguments.ArgAt(2));
const Array& args = Array::CheckedHandle(arguments.ArgAt(3));
- Class& receiver_class = Class::Handle(receiver.clazz());
- // For lookups treat null as an instance of class Object.
- if (receiver_class.IsNullClass()) {
- receiver_class = isolate->object_store()->object_class();
- }
+ const Class& receiver_class = Class::Handle(receiver.clazz());
Lasse Reichstein Nielsen 2013/08/16 08:04:13 I like how this change makes code *simpler*! :)
const String& target_name = String::Handle(ic_data.target_name());
Object& result = Object::Handle();

Powered by Google App Engine
This is Rietveld 408576698