Add support for FFI while leaving legacy implementations intact

.gitignore

@@ -166,6 +166,17 @@ vendor/
 /bazel-*
 
 # ruby test output
+ruby/lib/google/protobuf/any_pb.rb
+ruby/lib/google/protobuf/api_pb.rb
+ruby/lib/google/protobuf/descriptor_pb.rb
+ruby/lib/google/protobuf/duration_pb.rb
+ruby/lib/google/protobuf/empty_pb.rb
+ruby/lib/google/protobuf/field_mask_pb.rb
+ruby/lib/google/protobuf/source_context_pb.rb
+ruby/lib/google/protobuf/struct_pb.rb
+ruby/lib/google/protobuf/timestamp_pb.rb
+ruby/lib/google/protobuf/type_pb.rb
+ruby/lib/google/protobuf/wrappers_pb.rb
 ruby/tests/basic_test_pb.rb
 ruby/tests/basic_test_proto2_pb.rb
 ruby/tests/generated_code_pb.rb

conformance/BUILD.bazel

@@ -24,6 +24,7 @@ exports_files([
     "failure_list_python_cpp.txt",
     "failure_list_ruby.txt",
     "failure_list_jruby.txt",
+    "failure_list_jruby_ffi.txt",
     "text_format_failure_list_cpp.txt",
     "text_format_failure_list_csharp.txt",
     "text_format_failure_list_java.txt",
@@ -34,6 +35,7 @@ exports_files([
     "text_format_failure_list_python_cpp.txt",
     "text_format_failure_list_ruby.txt",
     "text_format_failure_list_jruby.txt",
+    "text_format_failure_list_jruby_ffi.txt",
 ])
 
 cc_proto_library(
@@ -326,12 +328,12 @@ ruby_binary(
     name = "conformance_ruby",
     testonly = True,
     srcs = ["conformance_ruby.rb"],
+    visibility = ["//ruby:__subpackages__"],
     deps = [
         ":conformance_ruby_proto",
         "//:test_messages_proto2_ruby_proto",
-        "//:test_messages_proto3_ruby_proto",        
+        "//:test_messages_proto3_ruby_proto",
     ],
-    visibility = ["//ruby:__subpackages__"],
 )
 
 ################################################################################

conformance/failure_list_jruby_ffi.txt

@@ -0,0 +1,2 @@
+Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput
+Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInRepeatedField.ProtobufOutput

protobuf_deps.bzl

@@ -110,8 +110,8 @@ def protobuf_deps():
         _github_archive(
             name = "rules_ruby",
             repo = "https://github.com/protocolbuffers/rules_ruby",
-            commit = "8fca842a3006c3d637114aba4f6bf9695bb3a432",
-            sha256 = "2619f9a23cee6f6a198d9ef284b6f6cbc901545ee9a9aac9ffa6b83dbf17cf0c",
+            commit = "b7f3e9756f3c45527be27bc38840d5a1ba690436",
+            sha256 = "347927fd8de6132099fcdc58e8f7eab7bde4eb2fd424546b9cd4f1c6f8f8bad8",
         )
 
     if not native.existing_rule("rules_jvm_external"):

ruby/.gitignore

@@ -6,4 +6,9 @@ protobuf-jruby.iml
 target/
 pkg/
 tmp/
-tests/google/
+tests/google/
+/ext/google/protobuf_c/utf8_range.h
+/ext/google/protobuf_c/range2-sse.c
+/ext/google/protobuf_c/range2-neon.c
+/ext/google/protobuf_c/naive.c
+/ext/google/x86_64-darwin/

ruby/BUILD.bazel

@@ -2,6 +2,8 @@
 #
 # See also code generation logic under /src/google/protobuf/compiler/ruby.
 
+load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
 load("@rules_ruby//ruby:defs.bzl", "ruby_library")
 load("//build_defs:internal_shell.bzl", "inline_sh_binary")
@@ -13,12 +15,67 @@ load("//:protobuf_version.bzl", "PROTOBUF_RUBY_VERSION")
 # Ruby Runtime
 ################################################################################
 
+string_flag(
+    name = "ffi",
+    build_setting_default = "disabled",
+    values = [
+        "enabled",
+        "disabled",
+    ],
+)
+
+config_setting(
+    name = "ffi_enabled",
+    flag_values = {
+        ":ffi": "enabled",
+    },
+)
+
+config_setting(
+    name = "ffi_disabled",
+    flag_values = {
+        ":ffi": "disabled",
+    },
+)
+
+selects.config_setting_group(
+    name = "jruby_ffi",
+    match_all = [
+        ":ffi_enabled",
+        "@rules_ruby//ruby/runtime:config_jruby",
+    ],
+)
+
+selects.config_setting_group(
+    name = "jruby_native",
+    match_all = [
+        ":ffi_disabled",
+        "@rules_ruby//ruby/runtime:config_jruby",
+    ],
+)
+
+selects.config_setting_group(
+    name = "ruby_ffi",
+    match_all = [
+        ":ffi_enabled",
+        "@rules_ruby//ruby/runtime:config_ruby",
+    ],
+)
+
+selects.config_setting_group(
+    name = "ruby_native",
+    match_all = [
+        ":ffi_disabled",
+        "@rules_ruby//ruby/runtime:config_ruby",
+    ],
+)
+
 ruby_library(
     name = "protobuf",
-    deps = ["//ruby/lib/google:protobuf_lib"],
     visibility = [
         "//visibility:public",
     ],
+    deps = ["//ruby/lib/google:protobuf_lib"],
 )
 
 # Note: these can be greatly simplified using inline_sh_binary in Bazel 6,
@@ -27,12 +84,12 @@ ruby_library(
 genrule(
     name = "jruby_release",
     srcs = [
-      "//ruby/lib/google:copy_jar",
-      "//ruby/lib/google:dist_files",
-      "//:well_known_ruby_protos",
-      "google-protobuf.gemspec",
+        "//ruby/lib/google:copy_jar",
+        "//ruby/lib/google:dist_files",
+        "//:well_known_ruby_protos",
+        "google-protobuf.gemspec",
     ],
-    outs = ["google-protobuf-"+PROTOBUF_RUBY_VERSION+"-java.gem"],
+    outs = ["google-protobuf-" + PROTOBUF_RUBY_VERSION + "-java.gem"],
     cmd = """
         set -eux
         mkdir tmp
@@ -59,14 +116,14 @@ genrule(
 genrule(
     name = "ruby_release",
     srcs = [
-      "@utf8_range//:utf8_range_srcs",
-      "@utf8_range//:LICENSE",
-      "//:well_known_ruby_protos",
-      "//ruby/ext/google/protobuf_c:dist_files",
-      "//ruby/lib/google:dist_files",
-      "google-protobuf.gemspec",
+        "@utf8_range//:utf8_range_srcs",
+        "@utf8_range//:LICENSE",
+        "//:well_known_ruby_protos",
+        "//ruby/ext/google/protobuf_c:dist_files",
+        "//ruby/lib/google:dist_files",
+        "google-protobuf.gemspec",
     ],
-    outs = ["google-protobuf-"+PROTOBUF_RUBY_VERSION+".gem"],
+    outs = ["google-protobuf-" + PROTOBUF_RUBY_VERSION + ".gem"],
     cmd = """
         set -eux
         mkdir tmp
@@ -102,7 +159,6 @@ filegroup(
     tags = ["manual"],
 )
 
-
 ################################################################################
 # Tests
 ################################################################################
@@ -111,34 +167,65 @@ filegroup(
 internal_ruby_proto_library(
     name = "test_ruby_protos",
     srcs = ["//ruby/tests:test_protos"],
-    deps = ["//:well_known_ruby_protos"],
-    includes = [".", "src", "ruby/tests"],
+    includes = [
+        ".",
+        "ruby/tests",
+        "src",
+    ],
     visibility = [
         "//ruby:__subpackages__",
     ],
+    deps = ["//:well_known_ruby_protos"],
 )
 
-
 conformance_test(
     name = "conformance_test",
     failure_list = "//conformance:failure_list_ruby.txt",
+    target_compatible_with = select({
+        ":ruby_native": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
     testee = "//conformance:conformance_ruby",
     text_format_failure_list = "//conformance:text_format_failure_list_ruby.txt",
+)
+
+conformance_test(
+    name = "conformance_test_ffi",
+    env = {
+        "PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION": "ffi",
+    },
+    failure_list = "//conformance:failure_list_ruby.txt",
     target_compatible_with = select({
-        "@rules_ruby//ruby/runtime:config_ruby": [],
+        ":ruby_ffi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
+    testee = "//conformance:conformance_ruby",
+    text_format_failure_list = "//conformance:text_format_failure_list_ruby.txt",
 )
 
 conformance_test(
     name = "conformance_test_jruby",
     failure_list = "//conformance:failure_list_jruby.txt",
+    target_compatible_with = select({
+        ":jruby_native": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
     testee = "//conformance:conformance_ruby",
     text_format_failure_list = "//conformance:text_format_failure_list_jruby.txt",
+)
+
+conformance_test(
+    name = "conformance_test_jruby_ffi",
+    env = {
+        "PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION": "ffi",
+    },
+    failure_list = "//conformance:failure_list_jruby_ffi.txt",
     target_compatible_with = select({
-        "@rules_ruby//ruby/runtime:config_jruby": [],
+        ":jruby_ffi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
+    testee = "//conformance:conformance_ruby",
+    text_format_failure_list = "//conformance:text_format_failure_list_jruby.txt",
 )
 
 ################################################################################
@@ -148,15 +235,15 @@ conformance_test(
 pkg_files(
     name = "dist_files",
     srcs = [
-        "//ruby/ext/google/protobuf_c:dist_files",
-        "//ruby/lib/google:dist_files",
-        "//ruby/src/main/java:dist_files",
-        "//ruby/tests:dist_files",
         ".gitignore",
         "BUILD.bazel",
         "Gemfile",
-        "Rakefile",
         "README.md",
+        "Rakefile",
+        "//ruby/ext/google/protobuf_c:dist_files",
+        "//ruby/lib/google:dist_files",
+        "//ruby/src/main/java:dist_files",
+        "//ruby/tests:dist_files",
     ],
     strip_prefix = strip_prefix.from_root(""),
     visibility = ["//pkg:__pkg__"],