jruby · Nov 12, 2014 · Nov 12, 2014 · Nov 12, 2014
Showing with 20 additions and 15 deletions.

+1 −1 core/src/main/java/org/jruby/ir/targets/JVMVisitor.java

+5 −0 core/src/main/java/org/jruby/runtime/ObjectSpace.java

+11 −11 core/src/test/java/org/jruby/test/TestObjectSpace.java

+3 −3 spec/compiler/general_spec.rb
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1631,7 +1631,7 @@ public void RuntimeHelperCall(RuntimeHelperCall runtimehelpercall) {
             case CHECK_FOR_LJE:
                 jvmMethod().loadContext();
                 jvmLoadLocal(DYNAMIC_SCOPE);
-                jvmMethod().pushBoolean(((Boolean)runtimehelpercall.getArgs()[0]).isTrue());
+                jvmAdapter().ldc(((Boolean)runtimehelpercall.getArgs()[0]).isTrue());
                 jvmMethod().loadBlockType();
                 jvmAdapter().invokestatic(p(IRRuntimeHelpers.class), "checkForLJE", sig(void.class, ThreadContext.class, DynamicScope.class, boolean.class, Block.Type.class));
                 break;

diff --git a/core/src/main/java/org/jruby/runtime/ObjectSpace.java b/core/src/main/java/org/jruby/runtime/ObjectSpace.java
@@ -127,6 +127,11 @@ public void removeFinalizers(long id) {
 
     public void add(IRubyObject object) {
         if (true && object.getMetaClass() != null && !(object instanceof JavaProxy)) {
+            // If the object is already frozen when we encounter it, it's pre-frozen.
+            // Since this only (currently) applies to objects created outside the
+            // normal routes of construction, we don't show it in ObjectSpace.
+            if (object.isFrozen()) return;
+
             getObjectGroup().add(object);
         } else {
             addIndividualWeakReference(object);

diff --git a/core/src/test/java/org/jruby/test/TestObjectSpace.java b/core/src/test/java/org/jruby/test/TestObjectSpace.java
@@ -76,30 +76,30 @@ public void testIdentities() {
     }
 
     public void testObjectSpace() {
-        IRubyObject o1 = runtime.newFixnum(10);
-        IRubyObject o2 = runtime.newFixnum(20);
-        IRubyObject o3 = runtime.newFixnum(30);
+        IRubyObject o1 = runtime.newArray(10);
+        IRubyObject o2 = runtime.newArray(20);
+        IRubyObject o3 = runtime.newArray(30);
         IRubyObject o4 = runtime.newString("hello");
 
         target.add(o1);
         target.add(o2);
         target.add(o3);
         target.add(o4);
 
-        List storedFixnums = new ArrayList(3);
-        storedFixnums.add(o1);
-        storedFixnums.add(o2);
-        storedFixnums.add(o3);
+        List storedArrays = new ArrayList(3);
+        storedArrays.add(o1);
+        storedArrays.add(o2);
+        storedArrays.add(o3);
 
         Iterator strings = target.iterator(runtime.getString());
         assertSame(o4, strings.next());
         assertNull(strings.next());
 
-        Iterator numerics = target.iterator(runtime.getNumeric());
+        Iterator array = target.iterator(runtime.getArray());
         for (int i = 0; i < 3; i++) {
-            Object item = numerics.next();
-            assertTrue(storedFixnums.contains(item));
+            Object item = array.next();
+            assertTrue(storedArrays.contains(item));
         }
-        assertNull(numerics.next());
+        assertNull(array.next());
     }
 }
diff --git a/spec/compiler/general_spec.rb b/spec/compiler/general_spec.rb
@@ -87,13 +87,13 @@ def compile_run(src, filename, line)
 modes << InterpreterSpecUtils unless (ENV['INTERPRETER_TEST'] == 'false')
 modes << JITSpecUtils unless (ENV['COMPILER_TEST'] == 'false')
 
+Block = org.jruby.runtime.Block
+IRubyObject = org.jruby.runtime.builtin.IRubyObject
+
 modes.each do |mode|
   describe "JRuby's #{mode.name}" do
     include mode
 
-    Block = org.jruby.runtime.Block
-    IRubyObject = org.jruby.runtime.builtin.IRubyObject
-
     it "assigns literal values to locals" do
       run("a = 5; a") {|result| expect(result).to eq 5 }
       run("a = 5.5; a") {|result| expect(result).to eq 5.5 }