[GR-28021] Backports for 21.0.0 batch1

PullRequest: truffleruby/2244

Author: gilles-duboscq

CHANGELOG.md

@@ -34,11 +34,13 @@ Compatibility:
 * `**kwargs` now accept non-Symbol keys like Ruby 2.7.
 * Updated the Unicode Emoji version (#2173, @wildmaples).
 * Added `Enumerator::Yielder#to_proc`.
+* Implemented `Enumerator::Lazy#eager`.
 
 Performance:
 
 * Refactor and implement more performant `MatchData#length` (#2147, @LillianZ).
 * Refactor and implement more performant `Array#sample` (#2148, @LillianZ).
+* `String#inspect` is now more efficient.
 
 Changes:
 

bench/micro/string/inspect.rb

@@ -0,0 +1,19 @@
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 2.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+result = ""
+simple = "abcdefghij\nklmnopqrst\nuvwxyz"
+utf8 = "abçdéfghîĵ\nklmñöpqrst\nuvwxyz"
+
+benchmark "core-string-inspect-simple" do
+  result = simple.inspect
+end
+
+benchmark "core-string-inspect-utf8" do
+  result = utf8.inspect
+end

spec/tags/command_line/dash_upper_w_tags.txt

@@ -3,5 +3,4 @@ slow:The -W command line option with 1 sets $VERBOSE to false
 slow:The -W command line option with 2 sets $VERBOSE to true
 slow:The -W command line option with :no-deprecated suppresses deprecation warnings
 slow:The -W command line option with :no-experimental suppresses experimental warnings
-fails:The -W command line option with :no-deprecated suppresses deprecation warnings
 fails:The -W command line option with :no-experimental suppresses experimental warnings

spec/tags/core/enumerator/lazy/eager_tags.txt

@@ -1,6 +1,5 @@
 slow:Warning.[]= emits and suppresses warnings for :deprecated
 slow:Warning.[]= emits and suppresses warnings for :experimental
-fails:Warning.[]= emits and suppresses warnings for :deprecated
 fails:Warning.[]= emits and suppresses warnings for :experimental
 slow:Warning.[]= :experimental emits and suppresses warnings for :experimental
 fails:Warning.[]= :experimental emits and suppresses warnings for :experimental

spec/tags/core/warning/element_set_tags.txt

@@ -6,8 +6,6 @@ slow:The predefined global constant ARGV contains Strings encoded in locale Enco
 slow:Global variable $0 is the path given as the main script and the same as __FILE__
 slow:Global variable $? is thread-local
 slow:Global variable $0 actually sets the program name
-fails:Predefined global $, warns if assigned non-nil
-fails:Predefined global $; warns if assigned non-nil
 fails:$LOAD_PATH.resolve_feature_path returns what will be loaded without actual loading, .rb file
 fails:$LOAD_PATH.resolve_feature_path returns what will be loaded without actual loading, .so file
 fails:$LOAD_PATH.resolve_feature_path raises LoadError if feature cannot be found

spec/tags/language/predefined_tags.txt

@@ -1,2 +1 @@
 fails:The rescue keyword raises SyntaxError when else is used without rescue and ensure
-fails:The rescue keyword inline form rescues with multiple assignment

spec/tags/language/rescue_tags.txt

@@ -340,26 +340,46 @@ private void processArgument() throws CommandLineException {
                     break;
                 case 'w':
                     config.setOption(OptionsCatalog.VERBOSITY, Verbosity.TRUE);
+                    setAllWarningCategories(true);
                     break;
                 case 'W': {
                     String temp = grabOptionalValue();
                     if (temp == null) {
-                        config.setOption(OptionsCatalog.VERBOSITY, Verbosity.TRUE);
+                        temp = "2";
+                    }
+                    if (temp.startsWith(":")) {
+                        switch (temp) {
+                            case ":deprecated":
+                                config.setOption(OptionsCatalog.WARN_DEPRECATED, true);
+                                break;
+                            case ":no-deprecated":
+                                config.setOption(OptionsCatalog.WARN_DEPRECATED, false);
+                                break;
+                            case ":experimental":
+                                config.setOption(OptionsCatalog.WARN_EXPERIMENTAL, true);
+                                break;
+                            case ":no-experimental":
+                                config.setOption(OptionsCatalog.WARN_EXPERIMENTAL, false);
+                                break;
+                            default:
+                                LOGGER.warning("unknown warning category: `" + temp.substring(1) + "'");
+                                break;
+                        }
                     } else {
                         switch (temp) {
                             case "0":
                                 config.setOption(OptionsCatalog.VERBOSITY, Verbosity.NIL);
-                                break;
-                            case "1":
-                                config.setOption(OptionsCatalog.VERBOSITY, Verbosity.FALSE);
+                                setAllWarningCategories(false);
                                 break;
                             case "2":
                                 config.setOption(OptionsCatalog.VERBOSITY, Verbosity.TRUE);
+                                setAllWarningCategories(true);
                                 break;
+                            case "1":
                             default:
-                                throw new CommandLineException(
-                                        getArgumentError(" -W must be followed by either 0, 1, 2 or nothing"),
-                                        true);
+                                config.setOption(OptionsCatalog.VERBOSITY, Verbosity.FALSE);
+                                config.setOption(OptionsCatalog.WARN_DEPRECATED, false);
+                                break;
                         }
                     }
                     break FOR;
@@ -466,6 +486,11 @@ private void processArgument() throws CommandLineException {
         }
     }
 
+    private void setAllWarningCategories(boolean value) {
+        config.setOption(OptionsCatalog.WARN_DEPRECATED, value);
+        config.setOption(OptionsCatalog.WARN_EXPERIMENTAL, value);
+    }
+
     private void enableDisableFeature(String name, boolean enable) {
         final BiConsumer<CommandLineParser, Boolean> feature = FEATURES.get(name);
 

src/launcher/java/org/truffleruby/launcher/CommandLineParser.java

@@ -82,7 +82,6 @@
 import org.truffleruby.shared.TruffleRuby;
 import org.truffleruby.shared.options.OptionsCatalog;
 import org.truffleruby.shared.options.RubyOptionTypes;
-import org.truffleruby.shared.options.Verbosity;
 import org.truffleruby.stdlib.CoverageManager;
 import org.truffleruby.stdlib.readline.ConsoleHolder;
 
@@ -177,8 +176,8 @@ public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
 
         options = createOptions(env, language.options);
 
-        warningCategoryDeprecated = new AssumedValue<>(options.VERBOSITY == Verbosity.TRUE);
-        warningCategoryExperimental = new AssumedValue<>(options.VERBOSITY != Verbosity.NIL);
+        warningCategoryDeprecated = new AssumedValue<>(options.WARN_DEPRECATED);
+        warningCategoryExperimental = new AssumedValue<>(options.WARN_EXPERIMENTAL);
 
         safepointManager = new SafepointManager(this, language);
         coreExceptions = new CoreExceptions(this, language);
@@ -294,6 +293,12 @@ protected boolean patch(Env newEnv) {
             return false;
         }
         this.options = newOptions;
+        if (newOptions.WARN_DEPRECATED != oldOptions.WARN_DEPRECATED) {
+            warningCategoryDeprecated.set(newOptions.WARN_DEPRECATED);
+        }
+        if (newOptions.WARN_EXPERIMENTAL != oldOptions.WARN_EXPERIMENTAL) {
+            warningCategoryExperimental.set(newOptions.WARN_EXPERIMENTAL);
+        }
         this.rubyHome = newHome;
         this.rubyHomeTruffleFile = newHome == null ? null : newEnv.getInternalTruffleFile(newHome);
 

src/main/java/org/truffleruby/RubyContext.java

@@ -529,4 +529,15 @@ protected long endHash(long hash) {
 
     }
 
+    @Primitive(name = "should_not_reach_here")
+    public abstract static class ShouldNotReachHereNode extends PrimitiveArrayArgumentsNode {
+
+        @Specialization(guards = "libString.isRubyString(message)")
+        protected Object shouldNotReachHere(Object message,
+                @CachedLibrary(limit = "2") RubyStringLibrary libString) {
+            throw CompilerDirectives.shouldNotReachHere(libString.getJavaString(message));
+        }
+
+    }
+
 }

src/main/java/org/truffleruby/core/VMPrimitiveNodes.java

@@ -121,6 +121,10 @@ public class Options {
     public final boolean CEXTS_LOG_LOAD;
     /** --cexts-log-warnings=false */
     public final boolean CEXTS_LOG_WARNINGS;
+    /** --warn-deprecated=false */
+    public final boolean WARN_DEPRECATED;
+    /** --warn-experimental=true */
+    public final boolean WARN_EXPERIMENTAL;
     /** --argv-globals=false */
     public final boolean ARGV_GLOBALS;
     /** --chomp-loop=false */
@@ -300,6 +304,8 @@ public Options(Env env, OptionValues options, LanguageOptions languageOptions) {
         METRICS_PROFILE_REQUIRE = options.get(OptionsCatalog.METRICS_PROFILE_REQUIRE_KEY);
         CEXTS_LOG_LOAD = options.get(OptionsCatalog.CEXTS_LOG_LOAD_KEY);
         CEXTS_LOG_WARNINGS = options.get(OptionsCatalog.CEXTS_LOG_WARNINGS_KEY);
+        WARN_DEPRECATED = options.get(OptionsCatalog.WARN_DEPRECATED_KEY);
+        WARN_EXPERIMENTAL = options.get(OptionsCatalog.WARN_EXPERIMENTAL_KEY);
         ARGV_GLOBALS = options.get(OptionsCatalog.ARGV_GLOBALS_KEY);
         CHOMP_LOOP = options.get(OptionsCatalog.CHOMP_LOOP_KEY);
         GETS_LOOP = options.get(OptionsCatalog.GETS_LOOP_KEY);
@@ -466,6 +472,10 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return CEXTS_LOG_LOAD;
             case "ruby.cexts-log-warnings":
                 return CEXTS_LOG_WARNINGS;
+            case "ruby.warn-deprecated":
+                return WARN_DEPRECATED;
+            case "ruby.warn-experimental":
+                return WARN_EXPERIMENTAL;
             case "ruby.argv-globals":
                 return ARGV_GLOBALS;
             case "ruby.chomp-loop":