jruby · Mar 11, 2015 · Mar 11, 2015 · Mar 11, 2015 · Mar 11, 2015
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -27,6 +27,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.*;
+import org.jruby.util.StringSupport;
 
 import static org.jruby.ir.instructions.RuntimeHelperCall.Methods.*;
 
@@ -1006,7 +1007,7 @@ public Operand buildCall(CallNode callNode) {
         // check for "string".freeze
         if (receiverNode instanceof StrNode && callNode.getName().equals("freeze")) {
             // frozen string optimization
-            return new FrozenString(((StrNode)receiverNode).getValue());
+            return new FrozenString(((StrNode)receiverNode).getValue(), StringSupport.CR_7BIT);
         }
 
         // Though you might be tempted to move this build into the CallInstr as:

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -220,6 +220,7 @@ protected void addChildScope(IRScope scope) {
     }
 
     public List<IRScope> getLexicalScopes() {
+        if (lexicalChildren == null) lexicalChildren = new ArrayList<>();
         return lexicalChildren;
     }
 

diff --git a/core/src/main/java/org/jruby/ir/instructions/ResultBaseInstr.java b/core/src/main/java/org/jruby/ir/instructions/ResultBaseInstr.java
@@ -22,7 +22,6 @@ public ResultBaseInstr(Operation operation, Variable result, Operand[] operands)
     @Override
     public void encode(IRWriterEncoder e) {
         super.encode(e);
-
         e.encode(getResult());
     }
 

diff --git a/core/src/main/java/org/jruby/ir/operands/Array.java b/core/src/main/java/org/jruby/ir/operands/Array.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
@@ -94,6 +95,12 @@ public Operand cloneForInlining(CloneInfo ii) {
         return new Array(newElts);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(getElts());
+    }
+
     @Override
     public Object retrieve(ThreadContext context, IRubyObject self, StaticScope currScope, DynamicScope currDynScope, Object[] temp) {
         IRubyObject[] elements = new IRubyObject[elts.length];

diff --git a/core/src/main/java/org/jruby/ir/operands/AsString.java b/core/src/main/java/org/jruby/ir/operands/AsString.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
@@ -49,6 +50,12 @@ public void visit(IRVisitor visitor) {
         visitor.AsString(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(getSource());
+    }
+
     @Override
     public String toString() {
         return "#{" + source + "}";

diff --git a/core/src/main/java/org/jruby/ir/operands/Backref.java b/core/src/main/java/org/jruby/ir/operands/Backref.java
@@ -2,6 +2,7 @@
 
 import org.jruby.RubyRegexp;
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -42,6 +43,12 @@ public void visit(IRVisitor visitor) {
         visitor.Backref(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(type);
+    }
+
     @Override
     public String toString() {
         return "$" + "'" + type + "'";

diff --git a/core/src/main/java/org/jruby/ir/operands/Bignum.java b/core/src/main/java/org/jruby/ir/operands/Bignum.java
@@ -2,6 +2,7 @@
 
 import org.jruby.RubyBignum;
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.runtime.ThreadContext;
 
 import java.math.BigInteger;
@@ -44,6 +45,12 @@ public void visit(IRVisitor visitor) {
         visitor.Bignum(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(value.toString());
+    }
+
     @Override
     public String toString() {
         return "Bignum:" + value;

diff --git a/core/src/main/java/org/jruby/ir/operands/Boolean.java b/core/src/main/java/org/jruby/ir/operands/Boolean.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.runtime.ThreadContext;
 
 public class Boolean extends ImmutableLiteral {
@@ -40,6 +41,12 @@ public void visit(IRVisitor visitor) {
         visitor.Boolean(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(isTrue());
+    }
+
     @Override
     public String toString() {
         return isTrue() ? "true" : "false";

diff --git a/core/src/main/java/org/jruby/ir/operands/ClosureLocalVariable.java b/core/src/main/java/org/jruby/ir/operands/ClosureLocalVariable.java
@@ -2,6 +2,7 @@
 
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.SimpleCloneInfo;
 
 /**
@@ -62,6 +63,12 @@ public void visit(IRVisitor visitor) {
         visitor.ClosureLocalVariable(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(definedLocally);
+    }
+
     @Override
     public String toString() {
         return "<" + name + "(" + scopeDepth + ":" + offset + ":local=" + definedLocally + ")>";

diff --git a/core/src/main/java/org/jruby/ir/operands/Complex.java b/core/src/main/java/org/jruby/ir/operands/Complex.java
@@ -2,6 +2,7 @@
 
 import org.jruby.RubyComplex;
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
@@ -33,6 +34,12 @@ public void visit(IRVisitor visitor) {
         visitor.Complex(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(number);
+    }
+
     public Operand getNumber() {
         return number;
     }

diff --git a/core/src/main/java/org/jruby/ir/operands/CurrentScope.java b/core/src/main/java/org/jruby/ir/operands/CurrentScope.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.ir.IRVisitor;
@@ -73,6 +74,12 @@ public void visit(IRVisitor visitor) {
         visitor.CurrentScope(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(getScopeNestingDepth());
+    }
+
     @Override
     public String toString() {
         return "scope<" + scopeNestingDepth + ">";

diff --git a/core/src/main/java/org/jruby/ir/operands/DynamicSymbol.java b/core/src/main/java/org/jruby/ir/operands/DynamicSymbol.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
@@ -50,6 +51,12 @@ public void visit(IRVisitor visitor) {
         visitor.DynamicSymbol(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(symbolName);
+    }
+
     @Override
     public String toString() {
         return ":" + symbolName.toString();

diff --git a/core/src/main/java/org/jruby/ir/operands/Fixnum.java b/core/src/main/java/org/jruby/ir/operands/Fixnum.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.runtime.ThreadContext;
 
 import java.math.BigInteger;
@@ -61,6 +62,12 @@ public long getValue() {
         return value;
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(value);
+    }
+
     @Override
     public String toString() {
         return "Fixnum:" + value;

diff --git a/core/src/main/java/org/jruby/ir/operands/Float.java b/core/src/main/java/org/jruby/ir/operands/Float.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.runtime.ThreadContext;
 
 public class Float extends ImmutableLiteral {
@@ -27,6 +28,12 @@ public void visit(IRVisitor visitor) {
         visitor.Float(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(value);
+    }
+
     public double getValue() {
         return value;
     }

diff --git a/core/src/main/java/org/jruby/ir/operands/FrozenString.java b/core/src/main/java/org/jruby/ir/operands/FrozenString.java
@@ -2,17 +2,13 @@
 
 import org.jruby.RubyString;
 import org.jruby.ir.IRVisitor;
-import org.jruby.ir.transformations.inlining.CloneInfo;
+import org.jruby.ir.persistence.IRReaderDecoder;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
-import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
-import java.nio.charset.UnsupportedCharsetException;
-import java.util.List;
-
 /**
  * Represents a literal string value.
  *
@@ -21,8 +17,8 @@
  * This is not like a Java string.
  */
 public class FrozenString extends StringLiteral {
-    public FrozenString(ByteList byteList) {
-        super(byteList);
+    public FrozenString(ByteList byteList, int cr) {
+        super(byteList, cr);
     }
 
     public FrozenString(String s) {
@@ -48,4 +44,8 @@ public String toString() {
     public void visit(IRVisitor visitor) {
         visitor.FrozenString(this);
     }
+
+    public static FrozenString decode(IRReaderDecoder d) {
+       return new FrozenString(d.decodeByteList(), d.decodeInt());
+    }
 }
diff --git a/core/src/main/java/org/jruby/ir/operands/Hash.java b/core/src/main/java/org/jruby/ir/operands/Hash.java
@@ -3,6 +3,7 @@
 import org.jruby.Ruby;
 import org.jruby.RubyHash;
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
@@ -123,6 +124,16 @@ public void visit(IRVisitor visitor) {
         visitor.Hash(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(pairs.size());
+        for (KeyValuePair<Operand, Operand> pair: pairs) {
+            e.encode(pair.getKey());
+            e.encode(pair.getValue());
+        }
+    }
+
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();

diff --git a/core/src/main/java/org/jruby/ir/operands/IRException.java b/core/src/main/java/org/jruby/ir/operands/IRException.java
@@ -3,6 +3,7 @@
 import org.jruby.Ruby;
 import org.jruby.RubyLocalJumpError;
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 
 import java.util.List;
@@ -74,6 +75,12 @@ public void visit(IRVisitor visitor) {
         visitor.IRException(this);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode((byte) getType().ordinal());
+    }
+
     @Override
     public String toString() {
         return "LocalJumpError:" + getType();

diff --git a/core/src/main/java/org/jruby/ir/operands/Label.java b/core/src/main/java/org/jruby/ir/operands/Label.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 
 import java.util.List;
@@ -76,6 +77,13 @@ public int getTargetPC() {
         return this.targetPC;
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(prefix);
+        e.encode(id);
+    }
+
     @Override
     public void visit(IRVisitor visitor) {
         visitor.Label(this);

diff --git a/core/src/main/java/org/jruby/ir/operands/LocalVariable.java b/core/src/main/java/org/jruby/ir/operands/LocalVariable.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.operands;
 
 import org.jruby.ir.IRVisitor;
+import org.jruby.ir.persistence.IRWriterEncoder;
 import org.jruby.ir.transformations.inlining.SimpleCloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
@@ -89,6 +90,13 @@ public LocalVariable cloneForDepth(int n) {
         return new LocalVariable(name, n, offset);
     }
 
+    @Override
+    public void encode(IRWriterEncoder e) {
+        super.encode(e);
+        e.encode(getName());
+        e.encode(getScopeDepth());
+    }
+
     @Override
     public void visit(IRVisitor visitor) {
         visitor.LocalVariable(this);