jruby · Jan 22, 2015 · Jan 22, 2015 · Jan 22, 2015 · Jan 22, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
@@ -2970,6 +2970,31 @@ public RubyArray pushIntegerFixnumSingleIntegerFixnum(RubyArray array, Object...
             return array;
         }
 
+        @Specialization(guards = { "isIntegerFixnum", "!isSingleIntegerFixnum", "!isSingleLongFixnum" })
+        public RubyArray pushIntegerFixnum(RubyArray array, Object... values) {
+            final int oldSize = array.getSize();
+            final int newSize = oldSize + values.length;
+
+            int[] oldStore = (int[]) array.getStore();
+            final Object[] store;
+
+            if (oldStore.length < newSize) {
+                extendBranch.enter();
+                store = ArrayUtils.box(oldStore, ArrayUtils.capacity(oldStore.length, newSize) - oldStore.length);
+            } else {
+                store = ArrayUtils.box(oldStore);
+            }
+
+            array.setStore(store, oldSize);
+
+            for (int n = 0; n < values.length; n++) {
+                store[oldSize + n] = values[n];
+            }
+
+            array.setSize(newSize);
+            return array;
+        }
+
         @Specialization(guards = {"isLongFixnum", "isSingleIntegerFixnum"})
         public RubyArray pushLongFixnumSingleIntegerFixnum(RubyArray array, Object... values) {
             final int oldSize = array.getSize();
@@ -3074,13 +3099,21 @@ public RubyArray pushIntegerFixnumIntegerFixnum(RubyArray array, int value) {
             return array;
         }
 
-        @Specialization(guards = "isIntegerFixnum")
+        @Specialization(guards = { "isIntegerFixnum", "!isInteger(arguments[1])" })
         public RubyArray pushIntegerFixnumObject(RubyArray array, Object value) {
             final int oldSize = array.getSize();
             final int newSize = oldSize + 1;
 
             final int[] oldStore = (int[]) array.getStore();
-            final Object[] newStore = ArrayUtils.box(oldStore, newSize);
+            final Object[] newStore;
+
+            if (oldStore.length < newSize) {
+                extendBranch.enter();
+                newStore = ArrayUtils.box(oldStore, ArrayUtils.capacity(oldStore.length, newSize) - oldStore.length);
+            } else {
+                newStore = ArrayUtils.box(oldStore);
+            }
+
             newStore[oldSize] = value;
             array.setStore(newStore, newSize);
             return array;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1006,17 +1006,19 @@ public InstanceVariableGetNode(InstanceVariableGetNode prev) {
         }
 
         @Specialization
-        public Object isInstanceVariableGet(RubyBasicObject object, RubyString name) {
-            notDesignedForCompilation();
-
-            return object.getInstanceVariable(RubyContext.checkInstanceVariableName(getContext(), name.toString(), this));
+        public Object instanceVariableGet(RubyBasicObject object, RubyString name) {
+            return instanceVariableGet(object, name.toString());
         }
 
         @Specialization
-        public Object isInstanceVariableGet(RubyBasicObject object, RubySymbol name) {
+        public Object instanceVariableGet(RubyBasicObject object, RubySymbol name) {
+            return instanceVariableGet(object, name.toString());
+        }
+
+        private Object instanceVariableGet(RubyBasicObject object, String name) {
             notDesignedForCompilation();
 
-            return object.getInstanceVariable(RubyContext.checkInstanceVariableName(getContext(), name.toString(), this));
+            return object.getInstanceVariable(RubyContext.checkInstanceVariableName(getContext(), name, this));
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/SymbolNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/SymbolNodes.java
@@ -186,7 +186,7 @@ public ToSNode(ToSNode prev) {
         public RubyString toS(RubySymbol symbol) {
             notDesignedForCompilation();
 
-            return getContext().makeString(symbol.getJRubySymbol().to_s().asString().decodeString());
+            return getContext().makeString(symbol.getSymbolBytes().dup());
         }
 
     }
@@ -203,7 +203,7 @@ public InspectNode(InspectNode prev) {
         }
 
         @Specialization
-        public RubyString toS(RubySymbol symbol) {
+        public RubyString inspect(RubySymbol symbol) {
             notDesignedForCompilation();
 
             return getContext().makeString(symbol.getJRubySymbol().inspect(getContext().getRuntime().getCurrentContext()).asString().decodeString());

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubySymbol.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubySymbol.java
@@ -58,6 +58,10 @@ public RubyProc toProc(SourceSection sourceSection, final RubyNode currentNode)
                 callTarget, callTarget, null, null, null, getContext().getCoreLibrary().getNilObject(), null);
     }
 
+    public ByteList getSymbolBytes() {
+        return symbolBytes;
+    }
+
     public org.jruby.RubySymbol getJRubySymbol() {
         RubyNode.notDesignedForCompilation();