[Truffle] Tidy up IsANode.

jruby · Feb 21, 2016 · 149bdf9 · eregon · Feb 24, 2016 · pitr-ch
1 parent cdd764c
commit 149bdf9
Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -1039,6 +1039,7 @@ public DynamicObject typeErrorCantCreateInstanceOfSingletonClass(Node currentNod
         return typeError("can't create instance of singleton class", currentNode, null);
     }
 
+    @TruffleBoundary
     public DynamicObject typeError(String message, Node currentNode) {
         return typeError(message, currentNode, null);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java
@@ -34,19 +34,21 @@ public abstract class IsANode extends RubyNode {
 
     public IsANode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
-        metaClassNode = MetaClassNodeGen.create(context, sourceSection, null);
     }
 
     public abstract boolean executeIsA(Object self, DynamicObject module);
 
     @Specialization(
             limit = "getCacheLimit()",
-            guards = { "isRubyModule(cachedModule)",
-                    "metaClass(self) == cachedMetaClass", "module == cachedModule" },
+            guards = {
+                    "isRubyModule(cachedModule)",
+                    "getMetaClass(self) == cachedMetaClass",
+                    "module == cachedModule"
+            },
             assumptions = "getUnmodifiedAssumption(cachedModule)")
     public boolean isACached(Object self,
             DynamicObject module,
-            @Cached("metaClass(self)") DynamicObject cachedMetaClass,
+            @Cached("getMetaClass(self)") DynamicObject cachedMetaClass,
             @Cached("module") DynamicObject cachedModule,
             @Cached("isA(cachedMetaClass, cachedModule)") boolean result) {
         return result;
@@ -58,12 +60,11 @@ public Assumption getUnmodifiedAssumption(DynamicObject module) {
 
     @Specialization(guards = "isRubyModule(module)")
     public boolean isAUncached(Object self, DynamicObject module) {
-        return isA(metaClass(self), module);
+        return isA(getMetaClass(self), module);
     }
 
     @Specialization(guards = "!isRubyModule(module)")
     public boolean isATypeError(Object self, DynamicObject module) {
-        CompilerDirectives.transferToInterpreter();
         throw new RaiseException(coreLibrary().typeError("class or module required", this));
     }
 
@@ -72,7 +73,12 @@ protected boolean isA(DynamicObject metaClass, DynamicObject module) {
         return ModuleOperations.assignableTo(metaClass, module);
     }
 
-    protected DynamicObject metaClass(Object object) {
+    protected DynamicObject getMetaClass(Object object) {
+        if (metaClassNode == null) {
+            CompilerDirectives.transferToInterpreter();
+            metaClassNode = insert(MetaClassNodeGen.create(getContext(), getSourceSection(), null));
+        }
+
         return metaClassNode.executeMetaClass(object);
     }