jruby · Jun 18, 2015 · Jun 18, 2015
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -1913,7 +1913,7 @@ protected void receiveBlockArg(final ArgsNode argsNode) {
      */
     private void prepareImplicitState() {
         // Receive self
-        addInstr(new ReceiveSelfInstr(buildSelf()));
+        addInstr(manager.getReceiveSelfInstr());
 
         // used for yields; metaclass body (sclass) inherits yield var from surrounding, and accesses it as implicit
         if (scope instanceof IRMethod || scope instanceof IRMetaClassBody) {

diff --git a/core/src/main/java/org/jruby/ir/IRManager.java b/core/src/main/java/org/jruby/ir/IRManager.java
@@ -4,6 +4,7 @@
 import org.jruby.RubyInstanceConfig;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.instructions.LineNumberInstr;
+import org.jruby.ir.instructions.ReceiveSelfInstr;
 import org.jruby.ir.listeners.IRScopeListener;
 import org.jruby.ir.listeners.InstructionsListener;
 import org.jruby.ir.operands.*;
@@ -194,6 +195,12 @@ public LineNumberInstr newLineNumber(int line) {
 
     }
 
+    private ReceiveSelfInstr receiveSelfInstr = new ReceiveSelfInstr(Self.SELF);
+
+    public ReceiveSelfInstr getReceiveSelfInstr() {
+        return receiveSelfInstr;
+    }
+
     private LineNumberInstr[] lineNumbers = new LineNumberInstr[3000];
 
     protected LineNumberInstr[] growLineNumbersPool(int index) {

diff --git a/core/src/main/java/org/jruby/ir/instructions/ReceiveSelfInstr.java b/core/src/main/java/org/jruby/ir/instructions/ReceiveSelfInstr.java
@@ -4,6 +4,7 @@
 import org.jruby.ir.Operation;
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.persistence.IRReaderDecoder;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.ir.transformations.inlining.SimpleCloneInfo;
 
@@ -24,8 +25,13 @@ public Instr clone(CloneInfo info) {
         return null;
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        e.encode(getOperation());
+    }
+
     public static ReceiveSelfInstr decode(IRReaderDecoder d) {
-        return new ReceiveSelfInstr(d.decodeVariable());
+        return d.getCurrentScope().getManager().getReceiveSelfInstr();
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/operands/TemporaryBooleanVariable.java b/core/src/main/java/org/jruby/ir/operands/TemporaryBooleanVariable.java
@@ -37,7 +37,7 @@
 public class TemporaryBooleanVariable extends TemporaryLocalVariable {
     public static final String PREFIX = "%b_";
     public TemporaryBooleanVariable(int offset) {
-        super(PREFIX+offset, offset);
+        super(offset);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/operands/TemporaryClosureVariable.java b/core/src/main/java/org/jruby/ir/operands/TemporaryClosureVariable.java
@@ -8,7 +8,7 @@ public class TemporaryClosureVariable extends TemporaryLocalVariable {
     private final int closureId;
 
     public TemporaryClosureVariable(int closureId, int offset) {
-        super("%cl_" + closureId + "_" + offset, offset);
+        super(offset);  // Do not save name to prevent constructing string
 
         this.closureId = closureId;
     }

diff --git a/core/src/main/java/org/jruby/ir/operands/TemporaryFixnumVariable.java b/core/src/main/java/org/jruby/ir/operands/TemporaryFixnumVariable.java
@@ -38,7 +38,7 @@
 public class TemporaryFixnumVariable extends TemporaryLocalVariable {
     public static final String PREFIX = "%i_";
     public TemporaryFixnumVariable(int offset) {
-        super(PREFIX+offset, offset);
+        super(offset);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/operands/TemporaryFloatVariable.java b/core/src/main/java/org/jruby/ir/operands/TemporaryFloatVariable.java
@@ -38,7 +38,7 @@
 public class TemporaryFloatVariable extends TemporaryLocalVariable {
     public static final String PREFIX = "%f_";
     public TemporaryFloatVariable(int offset) {
-        super(PREFIX+offset, offset);
+        super(offset);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/operands/TemporaryLocalReplacementVariable.java b/core/src/main/java/org/jruby/ir/operands/TemporaryLocalReplacementVariable.java
@@ -12,7 +12,7 @@ public class TemporaryLocalReplacementVariable extends TemporaryLocalVariable im
     private final String oldName;
 
     public TemporaryLocalReplacementVariable(String oldName, int offset) {
-        super(PREFIX + oldName + "_" + offset, offset);
+        super(offset);
 
         this.oldName = oldName;
     }
@@ -24,7 +24,7 @@ public Variable clone(SimpleCloneInfo ii) {
 
     @Override
     public String getPrefix() {
-        return "%t_" + oldName + "_";
+        return PREFIX + oldName + "_";
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/operands/TemporaryLocalVariable.java b/core/src/main/java/org/jruby/ir/operands/TemporaryLocalVariable.java
@@ -17,14 +17,14 @@ public class TemporaryLocalVariable extends TemporaryVariable {
     public static final String PREFIX = "%v_";
     public final int offset;
 
-    public TemporaryLocalVariable(String name, int offset) {
-        super(name);
+    public TemporaryLocalVariable(int offset) {
+        super();
 
         this.offset = offset;
     }
 
-    public TemporaryLocalVariable(int offset) {
-        this(PREFIX + offset, offset);
+    public String getName() {
+        return getPrefix() + offset;
     }
 
     public int getOffset() {

diff --git a/core/src/main/java/org/jruby/ir/operands/TemporaryVariable.java b/core/src/main/java/org/jruby/ir/operands/TemporaryVariable.java
@@ -3,22 +3,17 @@
 import org.jruby.ir.IRVisitor;
 
 public abstract class TemporaryVariable extends Variable {
-    private final String name;
-
-    public TemporaryVariable(String name) {
+    public TemporaryVariable() {
         super(OperandType.TEMPORARY_VARIABLE);
-
-        this.name = name;
     }
 
     /**
      * Differentiates between different types of TemporaryVariables (useful for switch and persistence).
      */
     public abstract TemporaryVariableType getType();
 
-    public String getName() {
-        return name;
-    }
+    public abstract String getName();
+
 
     @Override
     public int hashCode() {