Remove everything related to tainting

Author: eregon

lib/cext/include/ruby/internal/fl_type.h

@@ -468,9 +468,6 @@ void rb_freeze_singleton_class(VALUE klass);
 #ifdef TRUFFLERUBY
 int rb_tr_flags(VALUE value);
 void rb_tr_add_flags(VALUE value, int flags);
-bool rb_tr_obj_taintable_p(VALUE object);
-bool rb_tr_obj_tainted_p(VALUE object);
-void rb_tr_obj_infect(VALUE a, VALUE b);
 #endif
 RBIMPL_SYMBOL_EXPORT_END()
 

spec/tags/truffle/methods_tags.txt

@@ -100,12 +100,6 @@ fails:Public methods on IO should include timeout=
 fails:Public methods on IO should include to_path
 fails:Public methods on Integer should include ceildiv
 fails:Public methods on Kernel should not include =~
-fails:Public methods on Kernel should not include taint
-fails:Public methods on Kernel should not include tainted?
-fails:Public methods on Kernel should not include trust
-fails:Public methods on Kernel should not include untaint
-fails:Public methods on Kernel should not include untrust
-fails:Public methods on Kernel should not include untrusted?
 fails:Public methods on MatchData should include byteoffset
 fails:Public methods on MatchData should include deconstruct
 fails:Public methods on MatchData should include deconstruct_keys

src/main/c/cext/object.c

@@ -128,44 +128,6 @@ void rb_obj_call_init(VALUE object, int argc, const VALUE *argv) {
   RUBY_CEXT_INVOKE_NO_WRAP("rb_obj_call_init", object, rb_ary_new4(argc, argv), rb_block_proc());
 }
 
-// taint status
-
-VALUE rb_obj_tainted(VALUE obj) {
-  return rb_funcall(obj, rb_intern("tainted?"), 0);
-}
-
-VALUE rb_obj_taint(VALUE object) {
-  return RUBY_INVOKE(object, "taint");
-}
-
-VALUE rb_obj_untaint(VALUE obj) {
-  return rb_funcall(obj, rb_intern("untaint"), 0);
-}
-
-VALUE rb_obj_untrusted(VALUE obj) {
-  return rb_funcall(obj, rb_intern("untrusted?"), 0);
-}
-
-VALUE rb_obj_trust(VALUE obj) {
-  return rb_funcall(obj, rb_intern("trust"), 0);
-}
-
-VALUE rb_obj_untrust(VALUE obj) {
-  return rb_funcall(obj, rb_intern("untrust"), 0);
-}
-
-bool rb_tr_obj_taintable_p(VALUE object) {
-  return polyglot_as_boolean(RUBY_CEXT_INVOKE_NO_WRAP("RB_OBJ_TAINTABLE", object));
-}
-
-bool rb_tr_obj_tainted_p(VALUE object) {
-  return RTEST(rb_obj_tainted(object));
-}
-
-void rb_tr_obj_infect(VALUE a, VALUE b) {
-  rb_warning("rb_obj_infect is deprecated and will be removed in Ruby 3.2.");
-}
-
 // frozen status
 
 VALUE rb_obj_frozen_p(VALUE object) {

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

@@ -104,7 +104,6 @@
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.WarnNode;
-import org.truffleruby.language.WarningNode;
 import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.backtrace.Backtrace;
 import org.truffleruby.language.backtrace.BacktraceFormatter;
@@ -1738,70 +1737,6 @@ protected RubyArray globalVariables() {
 
     }
 
-    @CoreMethod(names = "taint")
-    public abstract static class KernelTaintNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        protected Object taint(Object object,
-                @Cached("new()") WarningNode warningNode) {
-            if (warningNode.shouldWarn()) {
-                warningNode.warningMessage(
-                        getSourceSection(),
-                        "Object#taint is deprecated and will be removed in Ruby 3.2.");
-            }
-            return object;
-        }
-
-    }
-
-    @CoreMethod(names = "trust")
-    public abstract static class KernelTrustNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        protected Object trust(Object object,
-                @Cached("new()") WarningNode warningNode) {
-            if (warningNode.shouldWarn()) {
-                warningNode.warningMessage(
-                        getSourceSection(),
-                        "Object#trust is deprecated and will be removed in Ruby 3.2.");
-            }
-            return object;
-        }
-
-    }
-
-    @CoreMethod(names = "tainted?")
-    public abstract static class KernelIsTaintedNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        protected boolean isTainted(Object object,
-                @Cached("new()") WarningNode warningNode) {
-            if (warningNode.shouldWarn()) {
-                warningNode.warningMessage(
-                        getSourceSection(),
-                        "Object#tainted? is deprecated and will be removed in Ruby 3.2.");
-            }
-            return false;
-        }
-
-    }
-
-    @CoreMethod(names = "untrusted?")
-    public abstract static class KernelIsUntrustedNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        protected boolean isUntrusted(Object object,
-                @Cached("new()") WarningNode warningNode) {
-            if (warningNode.shouldWarn()) {
-                warningNode.warningMessage(
-                        getSourceSection(),
-                        "Object#untrusted? is deprecated and will be removed in Ruby 3.2.");
-            }
-            return false;
-        }
-
-    }
-
     @Primitive(name = "kernel_to_hex")
     public abstract static class KernelToHexStringNode extends PrimitiveArrayArgumentsNode {
 
@@ -1898,38 +1833,6 @@ public static String uncachedBasicToS(RubyDynamicObject self) {
         }
     }
 
-    @CoreMethod(names = "untaint")
-    public abstract static class UntaintNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        protected Object untaint(Object object,
-                @Cached("new()") WarningNode warningNode) {
-            if (warningNode.shouldWarn()) {
-                warningNode.warningMessage(
-                        getSourceSection(),
-                        "Object#untaint is deprecated and will be removed in Ruby 3.2.");
-            }
-            return object;
-        }
-
-    }
-
-    @CoreMethod(names = "untrust")
-    public abstract static class UntrustNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        protected Object untrust(Object object,
-                @Cached("new()") WarningNode warningNode) {
-            if (warningNode.shouldWarn()) {
-                warningNode.warningMessage(
-                        getSourceSection(),
-                        "Object#untrust is deprecated and will be removed in Ruby 3.2.");
-            }
-            return object;
-        }
-
-    }
-
     @Primitive(name = "warning_get_category")
     public abstract static class WarningGetCategoryNode extends PrimitiveArrayArgumentsNode {