Merge branch 'master' into truffle-head

jruby · Sep 23, 2015 · c854d6e · c854d6e
2 parents d89439f + 1a98268
commit c854d6e
Showing 7 changed files with 46 additions and 10 deletions.
diff --git a/core/src/test/java/org/jruby/util/URLResourceTest.java b/core/src/test/java/org/jruby/util/URLResourceTest.java
@@ -83,13 +83,13 @@ public void testDirectoryWithTrailingClassloader()
         FileResource resource = URLResource.create((Ruby) null,
                 "uri:classloader:/somedir/", false);
 
-        assertNotNull( resource );
-        assertFalse( resource.isFile() );
-        assertTrue( resource.isDirectory() );
-        assertTrue( resource.exists() );
-        assertEquals( Arrays.asList( resource.list() ),
-                Arrays.asList( new String[] { ".", "dir_without_listing",
-                        "dir_with_listing" } ) );
+        assertNotNull(resource);
+        assertFalse(resource.isFile());
+        assertTrue(resource.isDirectory());
+        assertTrue(resource.exists());
+        assertEquals(Arrays.asList(resource.list()),
+                Arrays.asList(new String[]{".", "dir_without_listing",
+                        "dir_with_listing"}));
     }
 
     public void testNoneDirectoryClassloader()

diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -53,6 +53,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
+
 File file = new File(basedir, "bin/.jrubydir");
 if ( !file.exists() )
 {

diff --git a/test/truffle/pe/core/objectid_pe.rb b/test/truffle/pe/core/objectid_pe.rb
@@ -6,7 +6,7 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-tagged_example "nil.object_id"
+example "nil.object_id"
 
 example "true.object_id"
 

diff --git a/test/truffle/pe/language/ivar_pe.rb b/test/truffle/pe/language/ivar_pe.rb
@@ -0,0 +1,33 @@
+# Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+module IVarFixtures
+  class Foo
+    attr_reader :a
+
+    def initialize(a, b)
+      @a = a
+      @b = b
+    end
+
+    def b
+      @b
+    end
+
+    def reset_b(b)
+      @b = b
+      self
+    end
+  end
+end
+
+example "IVarFixtures::Foo.new(1,2).a"
+example "IVarFixtures::Foo.new(1,2).b"
+
+example "IVarFixtures::Foo.new(1,2).reset_b(42).b"
+example "IVarFixtures::Foo.new(1,2).reset_b([]).b.empty?"
diff --git a/test/truffle/pe/pe.rb b/test/truffle/pe/pe.rb
@@ -46,6 +46,7 @@ def tagged_example(code)
 require_relative 'language/controlflow_pe.rb'
 require_relative 'language/closures_pe.rb'
 require_relative 'language/constant_pe.rb'
+require_relative 'language/ivar_pe.rb'
 require_relative 'language/metaprogramming_pe.rb'
 require_relative 'language/super_pe.rb'
 require_relative 'core/truefalse_pe.rb'

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/WriteHeadObjectFieldNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/WriteHeadObjectFieldNode.java
@@ -129,7 +129,8 @@ protected Shape transitionWithNewField(Shape oldShape, Object value) {
                 return copy.getShape();
             }
         } else {
-            final Location location = oldShape.allocator().locationForValue(value, EnumSet.of(LocationModifier.NonNull));
+            final Location location = oldShape.allocator().locationForValue(value,
+                    EnumSet.of(LocationModifier.Final, LocationModifier.NonNull));
             final Property newProperty = Property.create(name, location, 0);
             return oldShape.addProperty(newProperty);
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java
@@ -83,7 +83,7 @@ public Object objectID(double value) {
             return ObjectIDOperations.floatToID(getContext(), value);
         }
 
-        @Specialization
+        @Specialization(guards = "!isNil(object)")
         public long objectID(DynamicObject object,
                 @Cached("createReadObjectIDNode()") ReadHeadObjectFieldNode readObjectIdNode,
                 @Cached("createWriteObjectIDNode()") WriteHeadObjectFieldNode writeObjectIdNode) {