Merge remote-tracking branch 'origin/main' into alignas-fix

protocolbuffers · Dec 15, 2022 · 496af77 · 496af77
2 parents 146eef8 + 08ad73b
commit 496af77
Show file tree

Hide file tree

Showing 169 changed files with 5,420 additions and 4,472 deletions.
diff --git a/build_defs/arch_tests.bzl b/build_defs/arch_tests.bzl
@@ -24,13 +24,12 @@ def _arch_test_impl(
         name = name,
         tools = bazel_binaries,
         cmd = """
-          for binary in "$(rootpaths %s) %s"; do
+          for binary in "%s"; do
             (file -L $$binary | grep -q "%s") \
                 || (echo "Test binary is not an %s binary: "; file -L $$binary; exit 1)
           done
         """ % (
-            " ".join(bazel_binaries),
-            " ".join(system_binaries),
+            " ".join(["$(rootpaths %s)" % b for b in bazel_binaries] + system_binaries),
             file_platform,
             platform,
         ),
@@ -44,13 +43,13 @@ def _arch_test_impl(
 def aarch64_test(**kwargs):
     _arch_test_impl(
         platform = "aarch64",
-        file_platform = "ELF 64-bit LSB executable, ARM aarch64",
+        file_platform = "ELF 64-bit LSB.* ARM aarch64",
         **kwargs
     )
 
 def x86_64_test(**kwargs):
     _arch_test_impl(
         platform = "x86_64",
-        file_platform = "ELF 64-bit LSB executable, ARM x86_64",
+        file_platform = "ELF 64-bit LSB.*, ARM x86_64",
         **kwargs
     )
diff --git a/build_defs/internal_shell.bzl b/build_defs/internal_shell.bzl
@@ -9,7 +9,6 @@ def inline_sh_binary(
         tools = [],
         deps = [],
         cmd = "",
-        testonly = None,
         **kwargs):
     """Bazel rule to wrap up an inline bash script in a binary.
 
@@ -28,8 +27,6 @@ def inline_sh_binary(
       deps: a list of dependency labels that are required to run this binary.
       cmd: the inline sh command to run.
       **kwargs: other keyword arguments that are passed to sh_binary.
-      testonly: common rule attribute (see:
-          https://bazel.build/reference/be/common-definitions#common-attributes)
     """
 
     native.genrule(
@@ -38,15 +35,16 @@ def inline_sh_binary(
         exec_tools = tools,
         outs = [name + ".sh"],
         cmd = "cat <<'EOF' >$(OUTS)\n#!/bin/bash -exu\n%s\nEOF\n" % cmd,
-        testonly = testonly,
         visibility = ["//visibility:private"],
+        tags = kwargs["tags"] if "tags" in kwargs else None,
+        target_compatible_with = kwargs["target_compatible_with"] if "target_compatible_with" in kwargs else None,
+        testonly = kwargs["testonly"] if "testonly" in kwargs else None,
     )
 
     native.sh_binary(
         name = name,
         srcs = [name + "_genrule"],
         data = srcs + tools + deps,
-        testonly = testonly,
         **kwargs
     )
 
@@ -83,6 +81,9 @@ def inline_sh_test(
         outs = [name + ".sh"],
         cmd = "cat <<'EOF' >$(OUTS)\n#!/bin/bash -exu\n%s\nEOF\n" % cmd,
         visibility = ["//visibility:private"],
+        tags = kwargs["tags"] if "tags" in kwargs else None,
+        target_compatible_with = kwargs["target_compatible_with"] if "target_compatible_with" in kwargs else None,
+        testonly = kwargs["testonly"] if "testonly" in kwargs else None,
     )
 
     native.sh_test(

diff --git a/conformance/conformance_test_runner.cc b/conformance/conformance_test_runner.cc
@@ -77,7 +77,7 @@ using std::vector;
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
-#define GOOGLE_CHECK_SYSCALL(call)                            \
+#define CHECK_SYSCALL(call)                            \
   if (call < 0) {                                      \
     perror(#call " " __FILE__ ":" TOSTRING(__LINE__)); \
     exit(1);                                           \
@@ -289,22 +289,22 @@ void ForkPipeRunner::SpawnTestProgram() {
 
   if (pid) {
     // Parent.
-    GOOGLE_CHECK_SYSCALL(close(toproc_pipe_fd[0]));
-    GOOGLE_CHECK_SYSCALL(close(fromproc_pipe_fd[1]));
+    CHECK_SYSCALL(close(toproc_pipe_fd[0]));
+    CHECK_SYSCALL(close(fromproc_pipe_fd[1]));
     write_fd_ = toproc_pipe_fd[1];
     read_fd_ = fromproc_pipe_fd[0];
     child_pid_ = pid;
   } else {
     // Child.
-    GOOGLE_CHECK_SYSCALL(close(STDIN_FILENO));
-    GOOGLE_CHECK_SYSCALL(close(STDOUT_FILENO));
-    GOOGLE_CHECK_SYSCALL(dup2(toproc_pipe_fd[0], STDIN_FILENO));
-    GOOGLE_CHECK_SYSCALL(dup2(fromproc_pipe_fd[1], STDOUT_FILENO));
+    CHECK_SYSCALL(close(STDIN_FILENO));
+    CHECK_SYSCALL(close(STDOUT_FILENO));
+    CHECK_SYSCALL(dup2(toproc_pipe_fd[0], STDIN_FILENO));
+    CHECK_SYSCALL(dup2(fromproc_pipe_fd[1], STDOUT_FILENO));
 
-    GOOGLE_CHECK_SYSCALL(close(toproc_pipe_fd[0]));
-    GOOGLE_CHECK_SYSCALL(close(fromproc_pipe_fd[1]));
-    GOOGLE_CHECK_SYSCALL(close(toproc_pipe_fd[1]));
-    GOOGLE_CHECK_SYSCALL(close(fromproc_pipe_fd[0]));
+    CHECK_SYSCALL(close(toproc_pipe_fd[0]));
+    CHECK_SYSCALL(close(fromproc_pipe_fd[1]));
+    CHECK_SYSCALL(close(toproc_pipe_fd[1]));
+    CHECK_SYSCALL(close(fromproc_pipe_fd[0]));
 
     std::unique_ptr<char[]> executable(new char[executable_.size() + 1]);
     memcpy(executable.get(), executable_.c_str(), executable_.size());
@@ -319,7 +319,7 @@ void ForkPipeRunner::SpawnTestProgram() {
     }
     argv.push_back(nullptr);
     // Never returns.
-    GOOGLE_CHECK_SYSCALL(execv(executable.get(), const_cast<char **>(argv.data())));
+    CHECK_SYSCALL(execv(executable.get(), const_cast<char **>(argv.data())));
   }
 }
 

diff --git a/docs/options.md b/docs/options.md
@@ -451,3 +451,8 @@ with info about your project (name and website) so we can add an entry for you.
 
     *   Website: http://connect.build/
     *   Extension: 1167-1176
+
+1.  protocel
+
+    *   Website: https://github.com/Neakxs/protocel
+    *   Extension: 1177-1178
diff --git a/docs/third_party.md b/docs/third_party.md
@@ -7,110 +7,103 @@ If you have a project that should be listed here, please
 
 ## Programming Languages
 
-These are projects we know about implementing Protocol Buffers for other programming languages:
-* Action Script: https://code.google.com/p/protobuf-actionscript3/
-* Action Script: https://code.google.com/p/protoc-gen-as3/
-* Action Script: https://github.com/matrix3d/JProtoc
-* Action Script: https://github.com/zhongfq/protobuf-as3/
-* Ada: https://github.com/reznikmm/protobuf
-* C: https://github.com/protobuf-c/protobuf-c
-* C: https://koti.kapsi.fi/jpa/nanopb/
-* C: https://github.com/cloudwu/pbc/
-* C: https://github.com/haberman/upb/wiki
-* C: https://github.com/squidfunk/protobluff
-* C: https://github.com/eerimoq/pbtools
-* C++: https://github.com/protocolbuffers/protobuf (Google-official implementation)
-* C++: https://EmbeddedProto.com
-* C/C++: http://spbc.sf.net/
-* C#: https://code.google.com/p/protobuf-csharp-port
-* C#: https://silentorbit.com/protobuf/
-* C#/.NET/WCF/VB: https://code.google.com/p/protobuf-net/
-* Clojure: http://github.com/ninjudd/clojure-protobuf
-* Clojure: https://github.com/clojusc/protobuf
-* Clojure: https://protojure.readthedocs.io
-* Common Lisp: http://github.com/brown/protobuf
-* Common Lisp: http://github.com/qitab/cl-protobuf
-* D: https://github.com/dcarp/protobuf-d
-* D: https://github.com/msoucy/dproto
-* D: https://github.com/opticron/ProtocolBuffer
-* Dart: https://github.com/dart-lang/dart-protobuf (runtime) https://github.com/dart-lang/dart-protoc-plugin (code generator)
-* Delphi: http://sourceforge.net/projects/protobuf-delphi/
-* Delphi: http://fundementals.sourceforge.net/dl.html
-* Elixir: https://github.com/jeremyong/exprotoc
-* Elixir: https://github.com/tony612/protobuf-elixir
-* Elixir: https://github.com/ahamez/protox
-* Elm: https://github.com/tiziano88/elm-protobuf
-* Erlang: https://github.com/tomas-abrahamsson/gpb
-* Erlang: http://piqi.org/
-* Erlang: https://github.com/basho/erlang_protobuffs (no longer maintained, use gpb instead)
-* Hacklang/HHVM: https://github.com/y3llowcake/proto-hack
-* GDScript: https://github.com/oniksan/godobuf (Godot v3 engine plugin)
-* Go: https://github.com/golang/protobuf (Google-official implementation)
-* Go: https://github.com/akunspy/gopbuf
-* Go: https://github.com/gogo/protobuf
-* GopherJS: https://github.com/johanbrandhorst/protobuf
-* Haskell: https://hackage.haskell.org/package/hprotoc
-* Haskell: https://github.com/google/proto-lens (Google-unofficial implementation)
-* Haskell: https://github.com/awakesecurity/proto3-suite (code generator) https://github.com/awakesecurity/proto3-wire (binary serializer/deserializer)
-* Haxe: https://github.com/Atry/protoc-gen-haxe
-* Java: https://github.com/protocolbuffers/protobuf (Google-official implementation)
-* Java/Android: https://github.com/square/wire
-* Java: https://github.com/HebiRobotics/QuickBuffers/
-* Java ME: https://code.google.com/p/protobuf-javame/
-* Java ME: http://swingme.sourceforge.net/encode.shtml
-* Javascript: https://code.google.com/p/protobuf-js/
-* Javascript: http://github.com/sirikata/protojs
-* Javascript: https://github.com/dcodeIO/ProtoBuf.js
-* Javascript: https://code.google.com/p/protobuf-for-node/
-* Javascript: https://code.google.com/p/protostuff/
-* Javascript: https://github.com/seishun/node-protoc-plugin (Node.js port of plugin.h)
-* Javascript: https://github.com/seishun/node-protoc-gen-javascript (Node.js port of the Google-official implementation)
-* Javascript: https://github.com/ButterCam/sisyphus-js
-* Julia: https://github.com/tanmaykm/ProtoBuf.jl
-* Kotlin: https://github.com/marcoferrer/kroto-plus
-* Kotlin: https://github.com/Kotlin/kotlinx.serialization
-* Kotlin: https://github.com/ButterCam/sisyphus
-* Kotlin: https://github.com/open-toast/protokt
-* Kotlin Multiplatform: https://github.com/streem/pbandk
-* Lua: https://code.google.com/p/protoc-gen-lua/
-* Lua: http://github.com/indygreg/lua-protobuf
-* Lua: https://github.com/Neopallium/lua-pb
-* Matlab: https://code.google.com/p/protobuf-matlab/
-* Mercury: https://code.google.com/p/protobuf-mercury/
-* Objective C: https://code.google.com/p/protobuf-objc/
-* Objective C: https://github.com/alexeyxo/protobuf-objc
-* OCaml: http://piqi.org/
-* Perl: http://groups.google.com/group/protobuf-perl
-* Perl: https://metacpan.org/pod/Google::ProtocolBuffers
-* Perl: https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
-* Perl/XS: https://code.google.com/p/protobuf-perlxs/
-* PHP: https://code.google.com/p/pb4php/
-* PHP: https://github.com/allegro/php-protobuf/
-* PHP: https://github.com/chobie/php-protocolbuffers
-* Prolog: http://www.swi-prolog.org/pldoc/package/protobufs.html
-* Purescript: https://github.com/xc-jp/purescript-protobuf
-* Python: https://github.com/protocolbuffers/protobuf (Google-official implementation)
-* Python: https://github.com/eigenein/protobuf
-* Python: https://github.com/danielgtaylor/python-betterproto
-* R: http://cran.r-project.org/package=RProtoBuf
-* Ruby: https://code.google.com/p/ruby-protobuf/
-* Ruby: http://github.com/mozy/ruby-protocol-buffers
-* Ruby: https://github.com/bmizerany/beefcake/tree/master/lib/beefcake
-* Ruby: https://github.com/localshred/protobuf
-* Rust: https://github.com/tokio-rs/prost
-* Rust: https://github.com/stepancheg/rust-protobuf/
-* Rust: https://github.com/tafia/quick-protobuf
-* Scala: http://github.com/jeffplaisance/scala-protobuf
-* Scala: https://code.google.com/p/protobuf-scala
-* Scala: https://github.com/SandroGrzicic/ScalaBuff
-* Scala: https://scalapb.github.io
-* Solidity: https://github.com/celer-network/pb3-gen-sol
-* Swift: https://github.com/alexeyxo/protobuf-swift
-* Swift: https://github.com/apple/swift-protobuf/
-* Typescript: https://github.com/thesayyn/protoc-gen-ts
-* Typescript: https://github.com/pbkit/pbkit
-* Vala: https://launchpad.net/protobuf-vala
-* Visual Basic: https://code.google.com/p/protobuf-net/
+These are projects we know about implementing Protocol Buffers for other
+programming languages: * Action Script:
+https://code.google.com/p/protobuf-actionscript3/ * Action Script:
+https://code.google.com/p/protoc-gen-as3/ * Action Script:
+https://github.com/matrix3d/JProtoc * Action Script:
+https://github.com/zhongfq/protobuf-as3/ * Ada:
+https://github.com/reznikmm/protobuf * C:
+https://github.com/protobuf-c/protobuf-c * C: https://koti.kapsi.fi/jpa/nanopb/
+* C: https://github.com/cloudwu/pbc/ * C: https://github.com/haberman/upb/wiki *
+C: https://github.com/squidfunk/protobluff * C:
+https://github.com/eerimoq/pbtools * C++:
+https://github.com/protocolbuffers/protobuf (Google-official implementation) *
+C++: https://github.com/yksten/struct2x * C++: https://EmbeddedProto.com *
+C/C++: http://spbc.sf.net/ * C#: https://code.google.com/p/protobuf-csharp-port
+* C#: https://silentorbit.com/protobuf/ * C#/.NET/WCF/VB:
+https://code.google.com/p/protobuf-net/ * Clojure:
+http://github.com/ninjudd/clojure-protobuf * Clojure:
+https://github.com/clojusc/protobuf * Clojure: https://protojure.readthedocs.io
+* Common Lisp: http://github.com/brown/protobuf * Common Lisp:
+http://github.com/qitab/cl-protobuf * D: https://github.com/dcarp/protobuf-d *
+D: https://github.com/msoucy/dproto * D:
+https://github.com/opticron/ProtocolBuffer * Dart:
+https://github.com/dart-lang/dart-protobuf (runtime)
+https://github.com/dart-lang/dart-protoc-plugin (code generator) * Delphi:
+http://sourceforge.net/projects/protobuf-delphi/ * Delphi:
+http://fundementals.sourceforge.net/dl.html * Elixir:
+https://github.com/jeremyong/exprotoc * Elixir:
+https://github.com/tony612/protobuf-elixir * Elixir:
+https://github.com/ahamez/protox * Elm:
+https://github.com/tiziano88/elm-protobuf * Erlang:
+https://github.com/tomas-abrahamsson/gpb * Erlang: http://piqi.org/ * Erlang:
+https://github.com/basho/erlang_protobuffs (no longer maintained, use gpb
+instead) * Hacklang/HHVM: https://github.com/y3llowcake/proto-hack * GDScript:
+https://github.com/oniksan/godobuf (Godot v3 engine plugin) * Go:
+https://github.com/golang/protobuf (Google-official implementation) * Go:
+https://github.com/akunspy/gopbuf * Go: https://github.com/gogo/protobuf *
+GopherJS: https://github.com/johanbrandhorst/protobuf * Haskell:
+https://hackage.haskell.org/package/hprotoc * Haskell:
+https://github.com/google/proto-lens (Google-unofficial implementation) *
+Haskell: https://github.com/awakesecurity/proto3-suite (code generator)
+https://github.com/awakesecurity/proto3-wire (binary serializer/deserializer) *
+Haxe: https://github.com/Atry/protoc-gen-haxe * Java:
+https://github.com/protocolbuffers/protobuf (Google-official implementation) *
+Java/Android: https://github.com/square/wire * Java:
+https://github.com/HebiRobotics/QuickBuffers/ * Java ME:
+https://code.google.com/p/protobuf-javame/ * Java ME:
+http://swingme.sourceforge.net/encode.shtml * Javascript:
+https://code.google.com/p/protobuf-js/ * Javascript:
+http://github.com/sirikata/protojs * Javascript:
+https://github.com/dcodeIO/ProtoBuf.js * Javascript:
+https://code.google.com/p/protobuf-for-node/ * Javascript:
+https://code.google.com/p/protostuff/ * Javascript:
+https://github.com/seishun/node-protoc-plugin (Node.js port of plugin.h) *
+Javascript: https://github.com/seishun/node-protoc-gen-javascript (Node.js port
+of the Google-official implementation) * Javascript:
+https://github.com/ButterCam/sisyphus-js * Julia:
+https://github.com/tanmaykm/ProtoBuf.jl * Kotlin:
+https://github.com/marcoferrer/kroto-plus * Kotlin:
+https://github.com/Kotlin/kotlinx.serialization * Kotlin:
+https://github.com/ButterCam/sisyphus * Kotlin:
+https://github.com/open-toast/protokt * Kotlin Multiplatform:
+https://github.com/streem/pbandk * Lua:
+https://code.google.com/p/protoc-gen-lua/ * Lua:
+http://github.com/indygreg/lua-protobuf * Lua:
+https://github.com/Neopallium/lua-pb * Matlab:
+https://code.google.com/p/protobuf-matlab/ * Mercury:
+https://code.google.com/p/protobuf-mercury/ * Objective C:
+https://code.google.com/p/protobuf-objc/ * Objective C:
+https://github.com/alexeyxo/protobuf-objc * OCaml: http://piqi.org/ * Perl:
+http://groups.google.com/group/protobuf-perl * Perl:
+https://metacpan.org/pod/Google::ProtocolBuffers * Perl:
+https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic * Perl/XS:
+https://code.google.com/p/protobuf-perlxs/ * PHP:
+https://code.google.com/p/pb4php/ * PHP:
+https://github.com/allegro/php-protobuf/ * PHP:
+https://github.com/chobie/php-protocolbuffers * Prolog:
+http://www.swi-prolog.org/pldoc/package/protobufs.html * Purescript:
+https://github.com/xc-jp/purescript-protobuf * Python:
+https://github.com/protocolbuffers/protobuf (Google-official implementation) *
+Python: https://github.com/eigenein/protobuf * Python:
+https://github.com/danielgtaylor/python-betterproto * R:
+http://cran.r-project.org/package=RProtoBuf * Ruby:
+https://code.google.com/p/ruby-protobuf/ * Ruby:
+http://github.com/mozy/ruby-protocol-buffers * Ruby:
+https://github.com/bmizerany/beefcake/tree/master/lib/beefcake * Ruby:
+https://github.com/localshred/protobuf * Rust: https://github.com/tokio-rs/prost
+* Rust: https://github.com/stepancheg/rust-protobuf/ * Rust:
+https://github.com/tafia/quick-protobuf * Scala:
+http://github.com/jeffplaisance/scala-protobuf * Scala:
+https://code.google.com/p/protobuf-scala * Scala:
+https://github.com/SandroGrzicic/ScalaBuff * Scala: https://scalapb.github.io *
+Solidity: https://github.com/celer-network/pb3-gen-sol * Swift:
+https://github.com/alexeyxo/protobuf-swift * Swift:
+https://github.com/apple/swift-protobuf/ * Typescript:
+https://github.com/thesayyn/protoc-gen-ts * Typescript:
+https://github.com/pbkit/pbkit * Vala: https://launchpad.net/protobuf-vala *
+Visual Basic: https://code.google.com/p/protobuf-net/
 
 ## RPC Implementations
 

diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel
@@ -80,7 +80,6 @@ LITE_SRCS = [
     "src/main/java/com/google/protobuf/ProtoSyntax.java",
     "src/main/java/com/google/protobuf/Protobuf.java",
     "src/main/java/com/google/protobuf/ProtobufArrayList.java",
-    "src/main/java/com/google/protobuf/ProtobufLists.java",
     "src/main/java/com/google/protobuf/ProtocolStringList.java",
     "src/main/java/com/google/protobuf/RawMessageInfo.java",
     "src/main/java/com/google/protobuf/Reader.java",

diff --git a/java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java b/java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java
@@ -67,12 +67,17 @@ public class LazyStringArrayList extends AbstractProtobufList<String>
     EMPTY_LIST.makeImmutable();
   }
 
-  static LazyStringArrayList emptyList() {
+  /** Returns an empty immutable {@code LazyStringArrayList} instance */
+  public static LazyStringArrayList emptyList() {
     return EMPTY_LIST;
   }
 
-  // For compatibility with older runtimes.
-  public static final LazyStringList EMPTY = EMPTY_LIST;
+  /**
+   * For compatibility with older runtimes.
+   *
+   * @deprecated use {@link emptyList()} instead
+   */
+  @Deprecated public static final LazyStringList EMPTY = EMPTY_LIST;
 
   private final List<Object> list;