jruby · Aug 25, 2017 · Aug 25, 2017 · Aug 25, 2017 · Aug 25, 2017
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -4296,18 +4296,21 @@ public RubyInstanceConfig getInstanceConfig() {
         return config;
     }
 
+    @Deprecated
     public boolean is2_0() {
         return true;
     }
 
     /** GET_VM_STATE_VERSION */
+    @Deprecated // not used
     public long getGlobalState() {
         synchronized(this) {
             return globalState;
         }
     }
 
     /** INC_VM_STATE_VERSION */
+    @Deprecated // not used
     public void incGlobalState() {
         synchronized(this) {
             globalState = (globalState+1) & 0x8fffffff;

diff --git a/core/src/main/java/org/jruby/RubyGC.java b/core/src/main/java/org/jruby/RubyGC.java
@@ -116,8 +116,7 @@ public static IRubyObject count(ThreadContext context, IRubyObject recv) {
     }
 
     private static void emptyImplementationWarning(Ruby runtime, ID id, String name) {
-        runtime.getWarnings().warnOnce(id,
-                name + " does nothing on JRuby");
+        runtime.getWarnings().warnOnce(id, name + " does nothing on JRuby");
     }
 
     public static int getCollectionCount() {

diff --git a/core/src/main/java/org/jruby/RubyObjectSpace.java b/core/src/main/java/org/jruby/RubyObjectSpace.java
@@ -70,8 +70,7 @@ public static IRubyObject define_finalizer(IRubyObject recv, IRubyObject[] args,
         if (args.length == 2) {
             finalizer = args[1];
             if (!finalizer.respondsTo("call")) {
-                throw runtime.newArgumentError("wrong type argument "
-                        + finalizer.getType() + " (should be callable)");
+                throw runtime.newArgumentError("wrong type argument " + finalizer.getType() + " (should be callable)");
             }
         } else {
             finalizer = runtime.newProc(Block.Type.PROC, block);
@@ -91,10 +90,9 @@ public static IRubyObject undefine_finalizer(IRubyObject recv, IRubyObject obj,
     public static IRubyObject id2ref(IRubyObject recv, IRubyObject id) {
         final Ruby runtime = id.getRuntime();
         if (!(id instanceof RubyFixnum)) {
-            throw recv.getRuntime().newTypeError(id, recv.getRuntime().getFixnum());
+            throw runtime.newTypeError(id, runtime.getFixnum());
         }
-        RubyFixnum idFixnum = (RubyFixnum) id;
-        long longId = idFixnum.getLongValue();
+        long longId = ((RubyFixnum) id).getLongValue();
         if (longId == 0) {
             return runtime.getFalse();
         } else if (longId == 20) {
@@ -113,7 +111,7 @@ public static IRubyObject id2ref(IRubyObject recv, IRubyObject id) {
                 return object;
             } else {
                 runtime.getWarnings().warn("ObjectSpace is disabled; _id2ref only supports immediates, pass -X+O to enable");
-                throw recv.getRuntime().newRangeError(String.format("0x%016x is not id value", longId));
+                throw runtime.newRangeError(String.format("0x%016x is not id value", longId));
             }
         }
     }
@@ -214,6 +212,6 @@ public IRubyObject op_aref(ThreadContext context, IRubyObject key, IRubyObject v
             return context.runtime.newFixnum(System.identityHashCode(value));
         }
 
-        private final WeakValuedIdentityMap<IRubyObject, IRubyObject> map = new WeakValuedIdentityMap<IRubyObject, IRubyObject>();
+        private final WeakValuedIdentityMap<IRubyObject, IRubyObject> map = new WeakValuedIdentityMap<>();
     }
 }
diff --git a/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java b/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java
@@ -248,10 +248,11 @@ public static IRubyObject compile_ir(ThreadContext context, IRubyObject recv, IR
     }
 
     private static IRScriptBody compileIR(ThreadContext context, IRubyObject[] args, Block block) {
-        RootNode result = (RootNode) parseImpl(context, args, block);
+        RootNode node = (RootNode) parseImpl(context, args, block);
         IRManager manager = new IRManager(context.runtime.getInstanceConfig());
-        IRScriptBody scope = (IRScriptBody) IRBuilder.buildRoot(manager, result).getScope();
-        scope.setTopLevelBindingScope(result.getScope());
+        manager.setDryRun(true);
+        IRScriptBody scope = (IRScriptBody) IRBuilder.buildRoot(manager, node).getScope();
+        scope.setTopLevelBindingScope(node.getScope());
         return scope;
     }
 

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriter.java b/core/src/main/java/org/jruby/ir/persistence/IRWriter.java
@@ -10,16 +10,18 @@
 import org.jruby.parser.StaticScope;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 /**
- *  Write IR data out to persistent store.  IRReader is capable of re-reading this
+ * Write IR data out to persistent store.  IRReader is capable of re-reading this
  * information back into live IR data again.  This class knows the logical order of how
  * information will be written out but the IRWriterEncoder actually knows how to encode that
  * information.
  */
 public class IRWriter {
+
+    private IRWriter() { /* static methods only, for now */ }
+
     public static void persist(IRWriterEncoder file, IRScope script) throws IOException {
         file.startEncoding(script);
         persistScopeInstructions(file, script); // recursive dump of all scopes instructions

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriterAnalyzer.java b/core/src/main/java/org/jruby/ir/persistence/IRWriterAnalyzer.java
@@ -166,7 +166,7 @@ public void endEncoding(IRScope script) {
 
     private void increment(Operand operand) {
         Integer count = operandCounts.get(operand);
-        if (count == null) count = new Integer(0);
+        if (count == null) count = Integer.valueOf(0);
 
         operandCounts.put(operand, count + 1);
     }