[Truffle] Fix possible correctness issue for constant lookup.

jruby · May 15, 2015 · a26a3e9 · a26a3e9 · bjfish · May 16, 2015
1 parent 87ef166
commit a26a3e9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/SingletonClassNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/SingletonClassNode.java
@@ -93,6 +93,10 @@ protected RubyClass singletonClass(RubyBasicObject object) {
     public RubyClass getNormalObjectSingletonClass(RubyBasicObject object) {
         CompilerAsserts.neverPartOfCompilation();
 
+        if (object instanceof RubyClass) { // For the direct caller
+            return ((RubyClass) object).getSingletonClass();
+        }
+
         if (object.getMetaClass().isSingleton()) {
             return object.getMetaClass();
         }