[GR-14735] Do not suppress the stacktrace of internal exceptions.

PullRequest: truffleruby/896

Author: eregon

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

@@ -16,6 +16,7 @@
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
 import org.truffleruby.shared.options.OptionsCatalog;
 import org.truffleruby.shared.TruffleRuby;
 import org.truffleruby.shared.Metrics;
@@ -102,7 +103,7 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
             }
 
         } catch (CommandLineException commandLineException) {
-            System.err.println(TruffleRuby.SIMPLE_NAME + ": " + commandLineException.getMessage());
+            System.err.println("truffleruby: " + commandLineException.getMessage());
             if (commandLineException.isUsageError()) {
                 printHelp(System.err);
             }
@@ -171,7 +172,7 @@ protected void printHelp(OptionCategory maxCategory) {
     @Override
     protected AbortException abortUnrecognizedArgument(String argument) {
         throw abortInvalidArgument(argument,
-                TruffleRuby.SIMPLE_NAME + ": invalid option " + argument + "  (Use --help for usage instructions.)");
+                "truffleruby: invalid option " + argument + "  (Use --help for usage instructions.)");
     }
 
     private int runRubyMain(Context.Builder contextBuilder, CommandLineOptions config) {
@@ -209,7 +210,13 @@ private int runRubyMain(Context.Builder contextBuilder, CommandLineOptions confi
                         TruffleRuby.BOOT_SOURCE_NAME).internal(true).buildLiteral();
 
                 config.executionAction = ExecutionAction.FILE;
-                config.toExecute = context.eval(source).execute(config.toExecute).asString();
+                final Value file = context.eval(source).execute(config.toExecute);
+                if (file.isString()) {
+                    config.toExecute = file.asString();
+                } else {
+                    System.err.println("truffleruby: No such file or directory -- " + config.toExecute + " (LoadError)");
+                    return 1;
+                }
             }
 
             final Source source = Source.newBuilder(TruffleRuby.LANGUAGE_ID,
@@ -222,7 +229,7 @@ private int runRubyMain(Context.Builder contextBuilder, CommandLineOptions confi
             Metrics.printTime("after-run");
             return exitCode;
         } catch (PolyglotException e) {
-            System.err.println(TruffleRuby.SIMPLE_NAME + ": " + e.getMessage());
+            e.printStackTrace();
             return 1;
         }
     }

src/main/java/org/truffleruby/RubyLanguage.java

@@ -21,7 +21,6 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
-import org.graalvm.options.OptionDescriptor;
 import org.graalvm.options.OptionDescriptors;
 import org.truffleruby.cext.ValueWrapper;
 import org.truffleruby.core.kernel.TraceManager;
@@ -38,9 +37,8 @@
 import org.truffleruby.platform.Platform;
 import org.truffleruby.stdlib.CoverageManager;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 
 @TruffleLanguage.Registration(
         name = "Ruby",
@@ -211,14 +209,7 @@ protected SourceSection findSourceLocation(RubyContext context, Object value) {
 
     @Override
     protected OptionDescriptors getOptionDescriptors() {
-        final OptionDescriptor[] allDescriptions = OptionsCatalog.allDescriptors();
-        final List<OptionDescriptor> options = new ArrayList<>(allDescriptions.length);
-
-        for (OptionDescriptor descriptor : allDescriptions) {
-            options.add(descriptor);
-        }
-
-        return OptionDescriptors.create(options);
+        return OptionDescriptors.create(Arrays.asList(OptionsCatalog.allDescriptors()));
     }
 
     @Override

src/main/java/org/truffleruby/language/TruffleBootNodes.java

@@ -95,7 +95,6 @@ public abstract static class MainNode extends CoreMethodArrayArgumentsNode {
         @Specialization
         public int main(DynamicObject kind, DynamicObject toExecute,
                 @Cached("create()") IndirectCallNode callNode,
-                @Cached("createPrivate()") CallDispatchHeadNode findSFile,
                 @Cached("createPrivate()") CallDispatchHeadNode checkSyntax,
                 @Cached("create()") StringNodes.MakeStringNode makeStringNode) {
 
@@ -105,7 +104,7 @@ public int main(DynamicObject kind, DynamicObject toExecute,
 
             try {
                 source = loadMainSourceSettingDollarZero(
-                        findSFile, makeStringNode,
+                        makeStringNode,
                         StringOperations.getString(kind),
                         StringOperations.getString(toExecute).intern());
             } catch (RaiseException e) {
@@ -170,7 +169,7 @@ private void setArgvGlobals(StringNodes.MakeStringNode makeStringNode) {
             }
         }
 
-        private RubySource loadMainSourceSettingDollarZero(CallDispatchHeadNode findSFile, StringNodes.MakeStringNode makeStringNode, String kind, String toExecute) {
+        private RubySource loadMainSourceSettingDollarZero(StringNodes.MakeStringNode makeStringNode, String kind, String toExecute) {
             final RubySource source;
             final Object dollarZeroValue;
             try {

src/main/java/org/truffleruby/language/backtrace/BacktraceFormatter.java

@@ -102,7 +102,7 @@ public void printRubyExceptionMessageOnEnvStderr(DynamicObject rubyException) {
         } else {
             messageString = message.toString();
         }
-        printer.println(TruffleRuby.SIMPLE_NAME + ": " + messageString);
+        printer.println("truffleruby: " + messageString);
     }
 
     @TruffleBoundary

src/main/ruby/truffleruby/core/truffle/boot.rb

@@ -44,8 +44,8 @@ def self.find_s_file(name)
     path = find_in_environment_paths(name, ENV['PATH']) and return path
     return name if File.exist?(name)
 
-    # Fail otherwise
-    raise LoadError, "No such file or directory -- #{name}"
+    # Not found, let the RubyLauncher print the error
+    nil
   end
 
   def self.find_in_environment_paths(name, env_value)

src/shared/java/org/truffleruby/shared/TruffleRuby.java

@@ -12,7 +12,6 @@
 public class TruffleRuby {
 
     public static final String FORMAL_NAME = "TruffleRuby";
-    public static final String SIMPLE_NAME = "truffleruby";
     public static final String LANGUAGE_ID = "ruby";
     public static final String MIME_TYPE = "application/x-ruby";
     public static final String EXTENSION = ".rb";