[GR-20433] Fix Struct#hash for keyword_init: true Struct.

PullRequest: truffleruby/1242

Author: eregon

CHANGELOG.md

@@ -55,6 +55,7 @@ Bug fixes:
 * Made `Kernel#caller_locations` accept a range argument, and return `nil` when appropriate.
 * Made `rb_respond_to` work with primitives (#1869, @chrisseaton).
 * Fixed issue with missing backtrace for `rescue $ERROR_INFO` (#1660).
+* Fixed `Struct#hash` for `keyword_init: true` `Struct`.
 
 Compatibility:
 

spec/ruby/core/struct/hash_spec.rb

@@ -19,6 +19,20 @@
     car.hash.should == similar_car.hash
   end
 
+  it "returns different hashes for structs with different values" do
+    s1 = StructClasses::Ruby.new('2.7.0', 'linux')
+    s2 = StructClasses::Ruby.new('2.7.0', 'macos')
+    s1.hash.should_not == s2.hash
+  end
+
+  it "returns different hashes for structs with different values when using keyword_init: true" do
+    key = :"1 non symbol member"
+    struct_class = Struct.new(key, keyword_init: true)
+    t1 = struct_class.new(key => 1)
+    t2 = struct_class.new(key => 2)
+    t1.hash.should_not == t2.hash
+  end
+
   it "allows for overriding methods in an included module" do
     mod = Module.new do
       def hash

src/main/ruby/truffleruby/core/struct.rb

@@ -309,7 +309,9 @@ def hash
     val = TrufflePrimitive.vm_hash_start(CLASS_SALT)
     val = TrufflePrimitive.vm_hash_update(val, size)
     return val if Thread.detect_outermost_recursion self do
-      _attrs.each { |var| TrufflePrimitive.vm_hash_update(val, TrufflePrimitive.object_hidden_var_get(self, var).hash) }
+      _attrs.each do |var|
+        val = TrufflePrimitive.vm_hash_update(val, TrufflePrimitive.object_hidden_var_get(self, var).hash)
+      end
     end
     TrufflePrimitive.vm_hash_end(val)
   end