[Truffle] Remove old workaround for Encoding.

jruby · Aug 9, 2015 · 4a420c6 · 4a420c6
1 parent 57b24b1
commit 4a420c6
Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/...fle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantWithLexicalScopeNode.java b/...fle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantWithLexicalScopeNode.java
@@ -50,13 +50,6 @@ public Object readConstant(VirtualFrame frame, Object module, String name) {
 
     @Override
     public Object isDefined(VirtualFrame frame) {
-        CompilerDirectives.transferToInterpreter();
-
-        if (name.equals("Encoding")) {
-            // Work-around so I don't have to load the iconv library - runners/formatters/junit.rb.
-            return createString("constant");
-        }
-
         final RubyConstant constant;
         try {
             constant = lookupConstantNode.executeLookupConstant(frame);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadLiteralConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadLiteralConstantNode.java
@@ -37,19 +37,12 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public Object isDefined(VirtualFrame frame) {
-        CompilerDirectives.transferToInterpreter();
-
         final RubyContext context = getContext();
         final String name = (String) readConstantNode.nameNode.execute(frame);
 
-        if (name.equals("Encoding")) {
-            // Work-around so I don't have to load the iconv library - runners/formatters/junit.rb.
-            return createString("constant");
-        }
-
-        final Object moduleObject;
+        final Object module;
         try {
-            moduleObject = readConstantNode.moduleNode.execute(frame);
+            module = readConstantNode.moduleNode.execute(frame);
         } catch (RaiseException e) {
             /* If we are looking up a constant in a constant that is itself undefined, we return Nil
              * rather than raising the error. Eg.. defined?(Defined::Undefined1::Undefined2).
@@ -64,7 +57,7 @@ public Object isDefined(VirtualFrame frame) {
 
         final RubyConstant constant;
         try {
-            constant = readConstantNode.lookupConstantNode.executeLookupConstant(frame, moduleObject, name);
+            constant = readConstantNode.lookupConstantNode.executeLookupConstant(frame, module, name);
         } catch (RaiseException e) {
             if (((RubyBasicObject) e.getRubyException()).getLogicalClass() == context.getCoreLibrary().getTypeErrorClass()) {
                 // module is not a class/module