Patch the tk gem to use rb_hash_foreach.

Author: aardvark179

lib/truffle/truffle/cext_preprocessor.rb

@@ -10,6 +10,7 @@
 require_relative 'patches/nokogiri_patches'
 require_relative 'patches/oci8_patches'
 require_relative 'patches/pg_patches'
+require_relative 'patches/tk_patches'
 
 module Truffle
   module CExt
@@ -39,12 +40,13 @@ def self.add_gem_patches(patch_hash, gem_patches)
       add_gem_patches(PATCHED_FILES, ::NokogiriPatches::PATCHES)
       add_gem_patches(PATCHED_FILES, ::OCI8Patches::PATCHES)
       add_gem_patches(PATCHED_FILES, ::PgPatches::PATCHES)
+      add_gem_patches(PATCHED_FILES, ::TkPatches::PATCHES)
 
       def self.makefile_matcher(command1, command2)
         file_list = Hash.new { |h,k| h[k] = [] }
         PATCHED_FILES.each_pair do |file, patch|
           dir = if patch[:ext_dir]
-                  File.join(patch[:gem], 'ext', patch[:ext_dir])
+                  File.join('ext', patch[:ext_dir])
                 else
                   "/#{patch[:gem]}"
                 end
@@ -85,7 +87,7 @@ def self.makefile_matcher(command1, command2)
       def self.patch(file, contents, directory)
         if patched_file = PATCHED_FILES[File.basename(file)]
           matched = if patched_file[:ext_dir]
-                      directory.end_with?(File.join(patched_file[:gem], 'ext', patched_file[:ext_dir]))
+                      directory.end_with?('ext', patched_file[:ext_dir])
                     else
                       regexp = /^#{Regexp.escape(patched_file[:gem])}\b/
                       directory.split('/').last(3).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }

lib/truffle/truffle/patches/tk_patches.rb

@@ -0,0 +1,32 @@
+# Copyright (c) 2022 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 2.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+# Tested with tk version 0.4.0
+class TkPatches
+
+  PATCHES = {
+    gem: 'tk',
+    patches: {
+      ['tk/tkutil', 'tkutil.c'] => [
+        {
+          match: 'st_foreach_check(RHASH_TBL(keys), to_strkey, new_keys, Qundef)',
+          replacement: 'rb_hash_foreach(keys, to_strkey, new_keys)'
+        },
+        {
+          match: 'st_foreach_check(RHASH_TBL(hash), push_kv, args, Qundef)',
+          replacement: 'rb_hash_foreach(hash, push_kv, args)'
+        },
+        {
+          match: 'st_foreach_check(RHASH_TBL(hash), push_kv_enc, args, Qundef)',
+          replacement: 'rb_hash_foreach(hash, push_kv_enc, args)'
+        },
+      ]
+    }
+  }
+
+end