jruby · Mar 14, 2015 · Mar 14, 2015 · Mar 14, 2015
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/puts_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/puts_tags.txt
@@ -13,3 +13,4 @@ fails:StringIO#puts when passed 1 or more objects prints a newline when passed n
 fails:StringIO#puts when passed no arguments returns nil
 fails:StringIO#puts when passed no arguments prints a newline
 fails:StringIO#puts when passed no arguments does not honor the global output record separator $\
+fails:StringIO#puts when passed 1 or more objects does not put a \n after each Objects that end in a newline
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/ungetbyte_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/ungetbyte_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java
@@ -85,9 +85,12 @@ public Object execute(VirtualFrame frame) {
                 // scenario is that the argument at that position is an UndefinedPlaceholder, which doesn't take up
                 // a space in the frame.
                 if (taintFromParameters[i] < RubyArguments.getUserArgumentsCount(frame.getArguments())) {
-                    final RubyBasicObject taintSource =
-                            (RubyBasicObject) RubyArguments.getUserArgument(frame.getArguments(), taintFromParameters[i]);
-                    maybeTaint(taintSource, result);
+                    final Object argument = RubyArguments.getUserArgument(frame.getArguments(), taintFromParameters[i]);
+
+                    if (argument instanceof RubyBasicObject) {
+                        final RubyBasicObject taintSource = (RubyBasicObject) argument;
+                        maybeTaint(taintSource, result);
+                    }
                 }
             }
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -231,8 +231,16 @@ public ConcatNode(ConcatNode prev) {
             super(prev);
         }
 
-        @CreateCast("other") public RubyNode coerceOtherToString(RubyNode other) {
-            return ToStrNodeFactory.create(getContext(), getSourceSection(), other);
+        @Specialization
+        public RubyString concat(RubyString string, int other) {
+            string.getByteList().append((byte) other);
+            return string;
+        }
+
+        @Specialization
+        public RubyString concat(RubyString string, long other) {
+            string.getByteList().append((byte) other);
+            return string;
         }
 
         @TruffleBoundary
@@ -259,6 +267,12 @@ public RubyString concat(RubyString string, RubyString other) {
 
             return string;
         }
+
+        @Specialization(guards = {"!isInteger(other)", "!isLong(other)", "!isRubyString(other)"})
+        public Object concat(VirtualFrame frame, RubyString string, Object other) {
+            notDesignedForCompilation();
+            return ruby(frame, "concat StringValue(other)", "other", other);
+        }
     }
 
     @CoreMethod(names = "%", required = 1, argumentsAsArray = true)