Remove check for strscan in Kernel#require

PullRequest: truffleruby/700

Author: eregon

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -100,7 +100,6 @@
 import org.truffleruby.language.WarnNode;
 import org.truffleruby.language.arguments.ReadCallerFrameNode;
 import org.truffleruby.language.arguments.RubyArguments;
-import org.truffleruby.language.backtrace.Activation;
 import org.truffleruby.language.backtrace.Backtrace;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.CallDispatchHeadNode;
@@ -1372,32 +1371,10 @@ public RubyNode coerceFeatureToPath(RubyNode feature) {
         @Specialization(guards = "isRubyString(featureString)")
         public boolean require(DynamicObject featureString,
                 @Cached("create()") RequireNode requireNode) {
-
             String feature = StringOperations.getString(featureString);
-
-            // TODO CS 1-Mar-15 ERB will use strscan if it's there, but strscan is not yet complete, so we need to hide it
-            if (feature.equals("strscan") && callerIs("mri/erb.rb")) {
-                throw new RaiseException(getContext(), coreExceptions().loadErrorCannotLoad(feature, this));
-            }
-
             return requireNode.executeRequire(feature);
         }
 
-        @TruffleBoundary
-        private boolean callerIs(String caller) {
-            final Backtrace backtrace = getContext().getCallStack().getBacktrace(this);
-
-            for (Activation activation : backtrace.getActivations()) {
-                final Node callNode = activation.getCallNode();
-                final Source source = callNode == null ? null : callNode.getEncapsulatingSourceSection().getSource();
-
-                if (source != null && source.getName().endsWith(caller)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
     }
 
     @CoreMethod(names = "require_relative", isModuleFunction = true, required = 1)

test/mri/excludes/TestFiber.rb

@@ -6,3 +6,4 @@
 exclude :test_gc_root_fiber, "RubyVM-specific"
 exclude :test_many_fibers_with_threads, "needs investigation"
 exclude :test_to_s, "needs investigation"
+exclude :test_machine_stack_gc, "spurious"

tool/parse_mri_errors.rb

@@ -8,6 +8,8 @@
 # cd test/mri
 # ruby ../../tool/parse_mri_errors.rb output.txt
 
+REASON = ENV.fetch('REASON', 'needs investigation')
+
 contents = ARGF.read
 
 load_error_output = "0 tests, 0 assertions, 0 failures, 0 errors, 0 skips"
@@ -52,7 +54,7 @@
   unless result == "."
     FileUtils.mkdir_p(File.dirname(file))
     File.open(file, 'a') do |f|
-      f.puts "exclude #{test_method.strip.to_sym.inspect}, \"needs investigation\""
+      f.puts "exclude #{test_method.strip.to_sym.inspect}, #{REASON.inspect}"
     end
   end
 end