Avoid caching singleton classes.

Singleton classes reference the object.
rubinius · Oct 15, 2014 · 977fe2e · 977fe2e
1 parent d6c0dd2
commit 977fe2e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/vm/builtin/call_site.cpp b/vm/builtin/call_site.cpp
@@ -216,7 +216,13 @@ namespace rubinius {
     }
   }
 
-  void CallSite::empty_cache_updater(STATE, CallSite* call_site, Class* klass, Dispatch& dispatch) {
+  void CallSite::empty_cache_updater(STATE, CallSite* call_site, Class* klass,
+      Dispatch& dispatch)
+  {
+    if(SingletonClass* cls = try_as<SingletonClass>(klass)) {
+      if(!try_as<Class>(cls->attached_instance())) return;
+    }
+
     MonoInlineCache* cache = MonoInlineCache::create(state, call_site, klass, dispatch);
     call_site->update_call_site(state, cache);
   }

diff --git a/vm/builtin/mono_inline_cache.cpp b/vm/builtin/mono_inline_cache.cpp
@@ -97,6 +97,10 @@ namespace rubinius {
   void MonoInlineCache::mono_cache_updater(STATE, CallSite* call_site, Class* klass, Dispatch& dispatch) {
     MonoInlineCache* mono_cache = reinterpret_cast<MonoInlineCache*>(call_site);
 
+    if(SingletonClass* cls = try_as<SingletonClass>(klass)) {
+      if(!try_as<Class>(cls->attached_instance())) return;
+    }
+
     // If it's the same class, replace it since the old cache is
     // for an older version of the same class and we don't
     // want to go polymorphic in that case.

diff --git a/vm/builtin/object.cpp b/vm/builtin/object.cpp
@@ -860,11 +860,16 @@ namespace rubinius {
       if(RespondToCache* rct = try_as<RespondToCache>(existing)) {
         existing = rct->fallback_call_site();
       }
-      RespondToCache* cache = RespondToCache::create(state, existing,
-                                self, name, priv, responds, 1);
-      state->vm()->global_cache()->add_seen(state, name);
-      atomic::memory_barrier();
-      existing->update_call_site(state, cache);
+
+      SingletonClass* cls = try_as<SingletonClass>(self->direct_class(state));
+
+      if(!cls || try_as<Class>(cls->attached_instance())) {
+        RespondToCache* cache = RespondToCache::create(state, existing,
+                                  self, name, priv, responds, 1);
+        state->vm()->global_cache()->add_seen(state, name);
+        atomic::memory_barrier();
+        existing->update_call_site(state, cache);
+      }
     }
 
     return responds;

diff --git a/vm/builtin/poly_inline_cache.cpp b/vm/builtin/poly_inline_cache.cpp
@@ -135,6 +135,11 @@ namespace rubinius {
 
   void PolyInlineCache::inline_cache_updater(STATE, CallSite* call_site, Class* klass, Dispatch& dispatch) {
     PolyInlineCache* cache = reinterpret_cast<PolyInlineCache*>(call_site);
+
+    if(SingletonClass* cls = try_as<SingletonClass>(klass)) {
+      if(!try_as<Class>(cls->attached_instance())) return;
+    }
+
     InlineCacheEntry* entry = InlineCacheEntry::create(state, klass->data(), klass, dispatch, 1);
     cache->set_cache(state, entry);
   }