Merge branch 'main' into wrap-deprecation-in-conditional

.github/scripts/validate_yaml.py

@@ -0,0 +1,99 @@
+"""Validate the YAML files for GitHub Actions workflows.
+
+TODO: b/359303016 - convert to use unittest
+"""
+
+import os
+import re
+
+import yaml
+
+# Ensure every job is in the list of blocking jobs.
+with open(
+    os.path.join(os.path.dirname(__file__), '../workflows/test_runner.yml'), 'r'
+) as f:
+  data = yaml.safe_load(f)
+
+  # List of all YAML files that are used by jobs in the test_runner.yml file.
+  yaml_files = []
+
+  # Get a list of all jobs in the test_runner, except for the blocking job and
+  # the tag removal job, which is not always run.
+  all_jobs = list(data['jobs'].keys())
+  all_jobs.remove('all-blocking-tests')
+  all_jobs.remove('remove-tag')
+
+  passed = True
+  blocking_jobs = data['jobs']['all-blocking-tests']['needs']
+
+  for job in all_jobs:
+    if 'uses' in data['jobs'][job]:
+      yaml_files.append(
+          os.path.join(
+              os.path.dirname(__file__),
+              '../workflows',
+              os.path.basename(data['jobs'][job]['uses']),
+          )
+      )
+    if job not in blocking_jobs:
+      passed = False
+      raise ValueError('Job %s is not in the list of blocking jobs.' % job)
+
+  print('PASSED: All jobs are in the list of blocking jobs.')
+
+# Ensure every job with a continuous prefix conditions every step on whether we
+# are in a continuous run.
+for file in yaml_files:
+  with open(file, 'r') as f:
+    data = yaml.safe_load(f)
+    jobs = data['jobs']
+    for job in jobs:
+      if 'steps' not in jobs[job]:
+        continue
+      continuous_condition = 'inputs.continuous-prefix' in jobs[job]['name']
+      steps = jobs[job]['steps']
+      for step in steps:
+        if continuous_condition and 'continuous-run' not in step.get('if', ''):
+          raise ValueError(
+              'Step %s in job %s does not check the continuous-run condition'
+              % (step['name'], job)
+          )
+        if not continuous_condition and 'continuous-run' in step.get('if', ''):
+          raise ValueError(
+              'Step %s in job %s checks the continuous-run condition but '
+              'the job does not contain the continuous-prefix'
+              % (step['name'], job)
+          )
+print('PASSED: All steps in all jobs check the continuous-run condition.')
+
+# Check to make sure the list of included branches matches the list of excluded
+# branches in staleness_check.yml.
+with open(
+    os.path.join(os.path.dirname(__file__), '../workflows/staleness_check.yml'),
+    'r',
+) as f:
+  regex_pattern = r"'(\d+\.x)'"
+  data = yaml.safe_load(f)
+  matrix = data['jobs']['test']['strategy']['matrix']
+  included_branches = matrix['branch']
+  # Main should be included in all test runs
+  included_branches.remove('main')
+  excludes = matrix['exclude']
+  for entry in excludes:
+    match = re.search(regex_pattern, entry['branch'])
+    branch = match.group(1)
+    if branch not in included_branches:
+      raise ValueError(
+          'Branch %s is excluded for presubmit runs but is not in the list of'
+          ' matrix branches in staleness_check.yml.' % branch
+      )
+    included_branches.remove(branch)
+  if included_branches:
+    raise ValueError(
+        'Branches %s are in the list of matrix branches but do not get excluded'
+        ' for presubmit runs in staleness_check.yml.' % included_branches
+    )
+  print(
+      'PASSED: The list of included branches matches the list of excluded'
+      ' branches in staleness_check.yml.'
+  )

.github/scripts/validate_yaml_test.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source googletest.sh || exit 1
+
+script=${TEST_SRCDIR}/google3/third_party/protobuf/github/validate_yaml
+
+$script || die "Failed to execute $script"
+
+echo "PASS"

.github/workflows/staleness_check.yml

@@ -6,6 +6,11 @@ on:
     - cron: 0 10 * * *
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: false
         description: "The SHA key for the commit we want to run over"
@@ -20,6 +25,11 @@ jobs:
       matrix:
         branch: [main, 25.x, 27.x, 28.x]
         os: [{ name: Linux, value: ubuntu-latest}]
+        exclude:
+          # If we are in a presubmit run, only test main
+          - branch: ${{ !inputs.continuous-run && '25.x' }}
+          - branch: ${{ !inputs.continuous-run && '27.x' }}
+          - branch: ${{ !inputs.continuous-run && '28.x' }}
 
     name: Test staleness ${{ matrix.os.name }} ${{ github.head_ref && 'PR' || matrix.branch }}
     runs-on: ${{ matrix.os.value }}

.github/workflows/test_bazel.yml

@@ -3,10 +3,20 @@ name: Bazel Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+        results."
+        type: string
 
 permissions:
   contents: read
@@ -24,26 +34,30 @@ jobs:
             bazelversion: '6.4.0'
             # Not running Bazel 6 with bzlmod, because it doesn't support use_repo_rule in rules_jvm_external
             bzlmod: false
+            continuous-only: true
     runs-on: ${{ matrix.runner }}-latest
-    name: Examples ${{ matrix.runner }} ${{ matrix.bazelversion }}${{ matrix.bzlmod && ' (bzlmod)' || '' }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Examples ${{ matrix.runner }} ${{ matrix.bazelversion }}${{ matrix.bzlmod && ' (bzlmod)' || '' }}
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
 
       - name: Windows startup flags
-        if: runner.os == 'Windows'
+        if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }}
         working-directory: examples
         shell: bash
         run: echo "startup --output_user_root=C:/ --windows_enable_symlinks" >> .bazelrc
 
       - name: Configure Bazel version
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         working-directory: examples
         shell: bash
         run: echo "${{ matrix.bazelversion }}" > .bazelversion
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}

.github/workflows/test_cpp.yml

@@ -3,10 +3,21 @@ name: C++ Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read
@@ -18,16 +29,16 @@ jobs:
       matrix:
         config:
           - { name: Optimized, flags: --config=opt }
-          - { name: Debug, flags: --config=dbg }
+          - { name: Debug, flags: --config=dbg, continuous-only: true }
           - { name: ASAN, flags: --config=asan, runner: ubuntu-22-4core }
-          - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-22-4core }
-          - { name: TSAN, flags: --config=tsan, runner: ubuntu-22-4core }
-          - { name: UBSAN, flags: --config=ubsan, runner: ubuntu-22-4core }
-          - { name: No-RTTI, flags: --cxxopt=-fno-rtti }
+          - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-22-4core, continuous-only: true }
+          - { name: TSAN, flags: --config=tsan, runner: ubuntu-22-4core, continuous-only: true }
+          - { name: UBSAN, flags: --config=ubsan, runner: ubuntu-22-4core, continuous-only: true,}
+          - { name: No-RTTI, flags: --cxxopt=-fno-rtti, continuous-only: true }
         include:
           # Set defaults
           - image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:3d959f731dc5c54af4865c31ee2bd581ec40028adcdf4c038f3122581f595191
-          - targets: //pkg/... //src/... @com_google_protobuf_examples//... //third_party/utf8_range/...
+          - targets: //pkg/... //src/... @com_google_protobuf_examples//... //third_party/utf8_range/... //conformance:conformance_framework_tests
 
           # Override cases with custom images
           - config: { name: "Bazel7", flags: --noenable_bzlmod }
@@ -46,14 +57,16 @@ jobs:
             cache_key: TcMalloc
             targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test //third_party/utf8_range/..."
             image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:6.3.0-aarch64-68e662b3a56b881804dc4e9d45f949791cbc4b94"
-    name: Linux ${{ matrix.config.name }}
+    name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }}
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Run tests
+        if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel-docker@v3
         with:
           image: ${{ matrix.image }}
@@ -80,7 +93,7 @@ jobs:
           image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:${{ matrix.version }}-6.3.0-63dd26c0c7a808d92673a3e52e848189d4ab0f17
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: cpp_linux/gcc-${{ matrix.version }}
-          bazel: test //pkg/... //src/... @com_google_protobuf_examples//... //third_party/utf8_range/...
+          bazel: test //pkg/... //src/... @com_google_protobuf_examples//... //third_party/utf8_range/... //conformance:conformance_framework_tests
 
   linux-release:
     strategy:
@@ -131,29 +144,34 @@ jobs:
           - flags: -Dprotobuf_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=14
           - name: Ninja
             flags: -G Ninja -DCMAKE_CXX_STANDARD=14
+            continuous-only: true
           - name: Shared
             flags: -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=14
+            continuous-only: true
           - name: C++17
             flags: -DCMAKE_CXX_STANDARD=17
           # TODO Re-enable this.
           #- name: C++20
           #  flags: -DCMAKE_CXX_STANDARD=20
 
-    name: Linux CMake ${{ matrix.name}}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux CMake ${{ matrix.name}}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
 
       - name: Setup sccache
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/sccache@v3
         with:
           cache-prefix: linux-cmake
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/docker@v3
         with:
           image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-63dd26c0c7a808d92673a3e52e848189d4ab0f17
@@ -198,6 +216,8 @@ jobs:
 
   linux-cmake-examples:
     name: Linux CMake Examples
+    # Skip this test on presubmit
+    if: ${{ inputs.continuous-run }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes
@@ -234,25 +254,29 @@ jobs:
             flags: -DCMAKE_CXX_STANDARD=14
           - name: C++17
             flags: -DCMAKE_CXX_STANDARD=17
+            continuous-only: true
           - name: C++20
             flags: -DCMAKE_CXX_STANDARD=20
 
-    name: Linux CMake GCC ${{ matrix.name }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux CMake GCC ${{ matrix.name }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
           submodules: recursive
 
       - name: Setup sccache
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/sccache@v3
         with:
           cache-prefix: linux-cmake-gcc
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/docker@v3
         with:
           image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:12.2-6.3.0-63dd26c0c7a808d92673a3e52e848189d4ab0f17
@@ -331,18 +355,19 @@ jobs:
           - name: MacOS Bazel
             os: macos-12
             cache_key: macos-12
-            bazel: test //src/... //third_party/utf8_range/...
+            bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
           - name: MacOS Bazel 7
             os: macos-12
             cache_key: macos-12-bazel7
-            bazel: test //src/... //third_party/utf8_range/...
+            bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
             bazel_version: '7.1.2'
+            continuous-only: true
           - name: MacOS Apple Silicon (build only) Bazel
             os: macos-12
             cache_key: macos-12-arm
             # Current github runners are all Intel based, so just build/compile
             # for Apple Silicon to detect issues there.
-            bazel: build --cpu=darwin_arm64 //src/... //third_party/utf8_range/...
+            bazel: build --cpu=darwin_arm64 //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
           - name: Windows Bazel
             os: windows-2022
             cache_key: windows-2022
@@ -352,14 +377,17 @@ jobs:
             cache_key: windows-2022-bazel7
             bazel: test //src/...  @com_google_protobuf_examples//... --test_tag_filters=-conformance --build_tag_filters=-conformance
             bazel_version: '7.1.2'
-    name: ${{ matrix.name }}
+            continuous-only: true
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -385,6 +413,7 @@ jobs:
               -Dprotobuf_BUILD_EXAMPLES=ON
             vsversion: '2022'
             cache-prefix: windows-2022-cmake
+            continuous-only: true
           - name: Windows CMake 2019
             os: windows-2019
             flags: >-
@@ -395,6 +424,7 @@ jobs:
             cache-prefix: windows-2019-cmake
             # windows-2019 has python3.7 installed, which is incompatible with the latest gcloud
             python-version: '3.9'
+            continuous-only: true
           - name: Windows CMake 32-bit
             os: windows-2022
             flags: >-
@@ -402,6 +432,7 @@ jobs:
             vsversion: '2022'
             windows-arch: 'win32'
             cache-prefix: windows-2022-win32-cmake
+            continuous-only: true
           - name: Windows CMake Shared
             os: windows-2022
             flags: >-
@@ -418,17 +449,19 @@ jobs:
               -Dprotobuf_BUILD_PROTOBUF_BINARIES=OFF
             vsversion: '2022'
             cache-prefix: windows-2022-cmake
-    name: ${{ matrix.name }}
+            continuous-only: true
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout pending changes
+        if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
           submodules: recursive
 
       - name: Setup MSVC
-        if: ${{ runner.os == 'Windows' }}
+        if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }}
         uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1
         with:
           arch: ${{ matrix.windows-arch || 'x64' }}
@@ -436,22 +469,23 @@ jobs:
 
       # Workaround for Abseil incompatibility with CMake 3.30 (b/352354235).
       - name: Downgrade CMake
-        if: ${{ runner.os == 'Windows' }}
+        if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run)}}
         run: choco install cmake --version 3.29.6 --force
         shell: bash
 
       # Workaround for incompatibility between gcloud and windows-2019 runners.
       - name: Install Python
-        if: ${{ matrix.python-version }}
+        if: ${{ matrix.python-version && (!matrix.continuous-only || inputs.continuous-run) }}
         uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Use custom python for gcloud
-        if: ${{ matrix.python-version }}
+        if: ${{ matrix.python-version  && (!matrix.continuous-only || inputs.continuous-run) }}
         run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV
         shell: bash
 
       - name: Setup sccache
+        if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }}
         uses: protocolbuffers/protobuf-ci/sccache@v3
         with:
           cache-prefix: ${{ matrix.cache-prefix }}
@@ -459,42 +493,46 @@ jobs:
 
       # Install phase.
       - name: Configure CMake for install
-        if: matrix.install-flags
+        if: ${{ matrix.install-flags && (!matrix.continuous-only || inputs.continuous-run) }}
         uses: protocolbuffers/protobuf-ci/bash@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: cmake . ${{ matrix.install-flags }} ${{ env.SCCACHE_CMAKE_FLAGS }} -Dprotobuf_ALLOW_CCACHE=ON
       - name: Build for install
-        if: matrix.install-flags
+        if: ${{ matrix.install-flags && (!matrix.continuous-only || inputs.continuous-run) }}
         shell: bash
         run: VERBOSE=1 cmake --build . --parallel 20
       - name: Install
-        if: matrix.install-flags
+        if: ${{ matrix.install-flags && (!matrix.continuous-only || inputs.continuous-run) }}
         shell: bash
         run: cmake --build . --target install
       - name: Report and clear sccache stats
-        if: matrix.install-flags
+        if: ${{ matrix.install-flags && (!matrix.continuous-only || inputs.continuous-run) }}
         shell: bash
         run: sccache -s && sccache -z
       - name: Clear CMake cache
-        if: matrix.install-flags
+        if: ${{ matrix.install-flags && (!matrix.continuous-only || inputs.continuous-run) }}
         shell: bash
         run: cmake --build . --target clean && rm CMakeCache.txt
 
       - name: Configure CMake
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bash@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: cmake . ${{ matrix.flags }} ${{ env.SCCACHE_CMAKE_FLAGS }} -Dprotobuf_ALLOW_CCACHE=ON 
 
       - name: Build
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         shell: bash
         run: VERBOSE=1 cmake --build . --parallel 20
 
       - name: Test
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         shell: bash
         run: ctest --verbose --parallel 20 -C Debug
 
       - name: Report sccache stats
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         shell: bash
         run: sccache -s

.github/workflows/test_csharp.yml

@@ -12,6 +12,8 @@ permissions:
   contents: read
 
 jobs:
+  # All C# jobs are currently run on presubmit
+  # If you wish to add continuous-only jobs you will need to import test-type above
   linux:
     name: Linux
     runs-on: ubuntu-latest

.github/workflows/test_java.yml

@@ -3,10 +3,21 @@ name: Java Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read
@@ -23,10 +34,12 @@ jobs:
             # TODO: b/318555165 - enable the layering check. Currently it does
             # not work correctly with the toolchain in this Docker image.
             targets: //java/... //java/internal:java_version //compatibility/... --features=-layering_check
+            continuous-only: true
           - name: OpenJDK 11
             cache_key: '11'
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
             targets: //java/... //java/internal:java_version //compatibility/...
+            continuous-only: true
           - name: OpenJDK 17
             cache_key: '17'
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
@@ -46,15 +59,17 @@ jobs:
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17
             targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test
 
-    name: Linux ${{ matrix.name }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes
         uses: protocolbuffers/protobuf-ci/checkout@v3
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Run tests
         uses: protocolbuffers/protobuf-ci/bazel-docker@v3
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         with:
           image: ${{ matrix.image }}
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}

.github/workflows/test_objectivec.yml

@@ -3,10 +3,21 @@ name: Objective-C Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read
@@ -27,24 +38,31 @@ jobs:
         - platform: "iOS"
           destination: "platform=iOS Simulator,name=iPhone 13,OS=latest"
           xc_project: "ProtocolBuffers_iOS.xcodeproj"
+        # We run presubmits on all "Debug" entries, but not on "Release" entries
+        - xc_config: "Debug"
+        - xc_config: "Release"
+          continuous-only: true
 
-    name: Xcode ${{ matrix.platform}} ${{ matrix.xc_config }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Xcode ${{ matrix.platform}} ${{ matrix.xc_config }}
     runs-on: macos-12
     env:
       DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
 
       - name: Setup ccache
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/ccache@v3
         with:
           cache-prefix: objectivec_${{ matrix.platform }}_${{ matrix.xc_config }}
           support-modules: true
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bash@v3
         env:
           CC: ${{ github.workspace }}/ci/clang_wrapper
@@ -60,6 +78,7 @@ jobs:
                 test
 
       - name: Report ccache stats
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         shell: bash
         run: ccache -s -v
 
@@ -75,16 +94,23 @@ jobs:
           - OS: macos-14
             PLATFORM: "visionos"
             XCODE: "15.2"
-    name: CocoaPods ${{ matrix.PLATFORM }} ${{ matrix.CONFIGURATION }}
+          # We run presubmits on all "Debug" entries, but not on "Release" entries
+          - CONFIGURATION: "Debug"
+          - CONFIGURATION: "Release"
+            continuous-only: true
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} CocoaPods ${{ matrix.PLATFORM }} ${{ matrix.CONFIGURATION }}
     runs-on: ${{ matrix.OS }}
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Xcode version
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: sudo xcode-select -switch /Applications/Xcode_${{ matrix.XCODE }}.app
       - name: Pod lib lint
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -104,6 +130,7 @@ jobs:
           - name: Optimized
             flags: --config=opt
             bazel_action: test
+            continuous-only: true
           - name: Debug
             flags: --config=dbg
             bazel_action: test
@@ -112,6 +139,7 @@ jobs:
           - name: Apple_Silicon_Optimized
             flags: --config=opt --cpu=darwin_arm64
             bazel_action: build
+            continuous-only: true
           - name: Apple_Silicon_Debug
             flags: --config=dbg --cpu=darwin_arm64
             bazel_action: build
@@ -120,14 +148,16 @@ jobs:
         include:
         - platform: "macOS"
           bazel_targets: //objectivec/...
-    name: Bazel ${{ matrix.platform }} ${{ matrix.config.name }}
+    name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Bazel ${{ matrix.platform }} ${{ matrix.config.name }}
     runs-on: macos-12
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: bazel ${{ matrix.config.bazel_action }}
+        if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}

.github/workflows/test_php.yml

@@ -4,10 +4,21 @@ name: PHP Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read
@@ -26,33 +37,39 @@ jobs:
             version: 8.1.14-dbg
             version-short: "8.1"
             command: composer test \&\& composer test_c
+            continuous-only: true
           - name: 8.1 Memory Leak
             version: 8.1.14-dbg
             version-short: "8.1"
             # Run specialized memory leak & multirequest tests.
             command: composer test_c \&\& tests/multirequest.sh \&\& tests/memory_leak_test.sh
+            continuous-only: true
           - name: 8.1 Valgrind
             version: 8.1.14-dbg
             version-short: "8.1"
             command: composer test_valgrind
+            continuous-only: true
           - name: 8.3 Optimized
             version: "8.3.1"
             version-short: "8.3"
             command: composer test \&\& composer test_c
 
-    name: Linux ${{ matrix.name}}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name}}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Setup composer
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/composer-setup@v3
         with:
           cache-prefix: php-${{ matrix.version-short }}
           directory: php
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/docker@v3
         with:
           image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:${{ matrix.version }}-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea
@@ -73,20 +90,26 @@ jobs:
         include:
           - suffix: '-zts'
             suffix_name: ' Thread Safe'
+            continuous-only: true
           - test: 'test_c'
             test_name: ' Extension'
+            continuous-only: true
+          - suffix: ''
+            test: 'test'
 
-    name: Linux 32-bit ${{ matrix.version}}${{ matrix.suffix_name }}${{ matrix.test_name }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux 32-bit ${{ matrix.version}}${{ matrix.suffix_name }}${{ matrix.test_name }}
     runs-on: ubuntu-latest
     env:
       image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:836f2cedcfe351d9a30055076630408e61994fc7d783e8333a99570968990eeb
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
 
       - name: Cross compile protoc for i386
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         id: cross-compile
         uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v3
         with:
@@ -95,12 +118,14 @@ jobs:
           architecture: linux-i386
 
       - name: Setup composer
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/composer-setup@v3
         with:
           cache-prefix: php-${{ matrix.version }}
           directory: php
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/docker@v3
         with:
           image: ${{ env.image }}
@@ -155,37 +180,47 @@ jobs:
     strategy:
       fail-fast: false   # Don't cancel all jobs if one fails.
       matrix:
-        version: ['8.2', '8.3']
+        include:
+          - version: '8.2'
+            continuous-only: true
+          - version: '8.3'
 
-    name: MacOS PHP ${{ matrix.version }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS PHP ${{ matrix.version }}
     runs-on: macos-12
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
 
       - name: Uninstall problematic libgd
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: brew uninstall --ignore-dependencies gd
 
       - name: Install dependencies
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: brew install coreutils gd
 
       - name: Pin PHP version
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: shivammathur/setup-php@8872c784b04a1420e81191df5d64fbd59d3d3033 # 2.30.2
         with:
           php-version: ${{ matrix.version }}
 
       - name: Check PHP version
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: php --version | grep ${{ matrix.version }} || (echo "Invalid PHP version - $(php --version)" && exit 1)
 
       - name: Setup composer
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/composer-setup@v3
         with:
           cache-prefix: php-${{ matrix.version }}
           directory: php
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bash@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -198,6 +233,7 @@ jobs:
             popd
 
       - name: Run conformance tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}

.github/workflows/test_php_ext.yml

@@ -3,10 +3,21 @@ name: PHP Extension Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read  #  to fetch code (actions/checkout)
@@ -41,15 +52,22 @@ jobs:
     strategy:
       fail-fast: false   # Don't cancel all jobs if one fails.
       matrix:
-        version: ["8.1", "8.2", "8.3"]
-    name: Build ${{ matrix.version }}
+        include:
+          - version: "8.1"
+            continuous-only: true
+          - version: "8.2"
+            continuous-only: true
+          - version: "8.3"
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Build ${{ matrix.version }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         with:
           name: protobuf-php-release
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/docker@v3
         with:
           image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php-extension:${{ matrix.version }}-a48f26c08d9a803dd0177dda63563f6ea6f7b2d4

.github/workflows/test_python.yml

@@ -3,10 +3,21 @@ name: Python Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read
@@ -32,15 +43,23 @@ jobs:
             # TODO Enable this once conformance tests are fixed.
             flags: --define=use_fast_cpp_protos=true --test_tag_filters=-conformance
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17
+          - version: "3.8"
+          - version: "3.9"
+            continuous-only: true
+          - version: "3.10"
+            continuous-only: true
+          - version: "3.11"
 
-    name: Linux ${{ matrix.type }} ${{ matrix.version }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.type }} ${{ matrix.version }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel-docker@v3
         with:
           image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:{0}-63dd26c0c7a808d92673a3e52e848189d4ab0f17', matrix.version) }}

.github/workflows/test_ruby.yml

@@ -3,10 +3,21 @@ name: Ruby Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read
@@ -20,22 +31,24 @@ jobs:
           # Test both FFI and Native implementations on the highest and lowest
           # Ruby versions for CRuby and JRuby, but only on Bazel 5.x.
           - { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: NATIVE }
-          - { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: FFI }
-          - { name: Ruby 3.1, ruby: ruby-3.1.0 }
-          - { name: Ruby 3.2, ruby: ruby-3.2.0 }
+          - { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: FFI, continuous-only: true }
+          - { name: Ruby 3.1, ruby: ruby-3.1.0, continuous-only: true }
+          - { name: Ruby 3.2, ruby: ruby-3.2.0, continuous-only: true }
           - { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: NATIVE }
           - { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: FFI }
           - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: NATIVE }
           - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: FFI }
 
-    name: Linux ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name }} ${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel-docker@v3
         with:
           image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-6.3.0-9848710ff1370795ee7517570a20b81e140112ec', matrix.ruby) }}
@@ -45,6 +58,7 @@ jobs:
 # Useful tool for troubleshooting, but the action introduces flakes as well,
 # e.g. https://github.com/actions/upload-artifact/issues/569
 #      - name: Archive log artifacts
+#        if: ${{ matrix.presubmit || inputs.test-type == 'continuous' }}
 #        uses: actions/upload-artifact@v4
 #        with:
 #          name: test-logs-${{ matrix.ruby }}_${{ matrix.ffi || 'NATIVE' }}
@@ -121,29 +135,33 @@ jobs:
         # Ruby versions for CRuby, but only on Bazel 5.x.
         # Quote versions numbers otherwise 3.0 will render as 3
         - { version: "3.0", ffi: NATIVE }
-        - { version: "3.0", ffi: FFI }
-        - { version: "3.1" }
-        - { version: "3.2" }
+        - { version: "3.0", ffi: FFI, continuous-only: true }
+        - { version: "3.1", continuous-only: true }
+        - { version: "3.2", continuous-only: true }
         - { version: "3.3", ffi: NATIVE }
         - { version: "3.3", ffi: FFI }
 
-    name: MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
     runs-on: macos-12
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
 
       - name: Pin Ruby version
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: ruby/setup-ruby@961f85197f92e4842e3cb92a4f97bd8e010cdbaf # v1.165.0
         with:
           ruby-version: ${{ matrix.version }}
 
       - name: Validate version
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: ruby --version | grep ${{ matrix.version }} || (echo "Invalid Ruby version - $(ruby --version)" && exit 1)
 
       - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel@v3
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -165,7 +183,9 @@ jobs:
           - { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: FFI }
           - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: NATIVE }
           - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: FFI }
-    name: Install ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
+    name: (Continuous) Install ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
+    # None of these ruby gem tests should be run on presubmit
+    if: ${{ inputs.continuous-run }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout pending changes

.github/workflows/test_runner.yml

@@ -48,7 +48,7 @@ on:
 
   # manual
   workflow_dispatch:
-  
+ 
 permissions:
   contents: read
 
@@ -57,8 +57,8 @@ concurrency:
   cancel-in-progress: ${{ contains(fromJSON('["pull_request", "pull_request_target", "workflow_dispatch"]'), github.event_name) }}
 
 jobs:
-  check-tag:
-    name: Check for Safety
+  set-vars:
+    name: Set Variables
 
     # Avoid running tests twice on PR updates.  If the PR is coming from our
     # repository, it's safe and we can use `pull_request`.  Otherwise, we should
@@ -77,6 +77,15 @@ jobs:
       # Store the sha for checkout so we can easily use it later.  For safe
       # events, this will be blank and use the defaults.
       checkout-sha: ${{ steps.safe-checkout.outputs.sha }}
+      # Stores a string to be used as a boolean denoting whether this is a
+      # continuous run. An empty string denotes that the run is on presubmit,
+      # otherwise we are in a continuous run. This helps us determine which
+      # tests to block on.
+      continuous-run: ${{ steps.set-test-type-vars.outputs.continuous-run }}
+      # Stores a string that will serve as the prefix for all continuous tests.
+      # Either way we prepend "(Continuous)" but in the case that we are in
+      # a presubmit run, we should also mark them "[SKIPPED]"
+      continuous-prefix: ${{ steps.set-test-type-vars.outputs.continuous-prefix }}
     steps:
       - name: Check
         # Trivially pass for safe PRs, and explicitly error for unsafe ones
@@ -93,9 +102,20 @@ jobs:
           ${{ github.event_name != 'pull_request_target' }} ||
           echo "sha=${{ github.event.pull_request.head.sha  }}"  >> $GITHUB_OUTPUT
 
+      - name: Set Test Type Variables
+        id: set-test-type-vars
+        run: |
+          if [ "${{ github.event_name }}" == 'pull_request' ] || [ "${{ github.event_name }}" == 'pull_request_target' ]; then
+            echo "continuous-run=" >> "$GITHUB_OUTPUT"
+            echo "continuous-prefix=[SKIPPED] (Continuous)" >> "$GITHUB_OUTPUT"
+          else
+            echo "continuous-run=continuous" >> "$GITHUB_OUTPUT"
+            echo "continuous-prefix=(Continuous)" >> "$GITHUB_OUTPUT"
+          fi
+
   remove-tag:
     name: Remove safety tag
-    needs: [check-tag]
+    needs: [set-vars]
     if: github.event.action == 'labeled'
     runs-on: ubuntu-latest
     permissions:
@@ -106,103 +126,141 @@ jobs:
           fail_on_error: true
           labels: ':a: safe for tests'
 
+  validate-yaml:
+    name: Validate YAML
+    needs: [set-vars]
+    uses: ./.github/workflows/test_yaml.yml
+    with:
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+
   # Note: this pattern of passing the head sha is vulnerable to PWN requests for
   # pull_request_target events. We carefully limit those workflows to require a
   # human stamp before continuing.
   bazel:
     name: Bazel
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_bazel.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   cpp:
     name: C++
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_cpp.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   java:
     name: Java
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_java.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   python:
     name: Python
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_python.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   ruby:
     name: Ruby
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_ruby.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   php:
     name: PHP
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_php.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   php-ext:
     name: PHP Extension
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_php_ext.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   csharp:
     name: C#
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_csharp.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
     secrets: inherit
 
   objectivec:
     name: Objective-C
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_objectivec.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   rust:
     name: Rust
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_rust.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
     secrets: inherit
 
   upb:
     name: μpb
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/test_upb.yml
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+      continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
   staleness:
     name: Staleness
-    needs: [check-tag]
+    needs: [set-vars]
     uses: ./.github/workflows/staleness_check.yml
     # Staleness tests have scheduled runs during off-hours to avoid race conditions.
     if: ${{ github.event_name != 'schedule' }}
     with:
-      safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      continuous-run: ${{ needs.set-vars.outputs.continuous-run }}
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
     secrets: inherit
+
+  # This test depends on all blocking tests and indicates whether they all suceeded.
+  all-blocking-tests:
+    name: All Blocking Tests${{ github.event_name == 'pull_request_target' && ' (fork)' || ''}}
+    needs: [set-vars, validate-yaml, bazel, cpp, java, python, ruby, php, php-ext, csharp, objectivec, rust, upb, staleness]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check test results
+        run: "${{ !contains(join(needs.*.result, ' '), 'failure') && !contains(join(needs.*.result, ' '), 'cancelled') }}"
+    # This workflow must run even if one or more of the dependent workflows
+    # failed.
+    if: always()

.github/workflows/test_rust.yml

@@ -12,6 +12,7 @@ permissions:
   contents: read
 
 jobs:
+  # This job should be run on presubmit, if any continuous-only tests are added we will need to input test-type above
   linux:
     name: Linux
     runs-on: ubuntu-latest

.github/workflows/test_upb.yml

@@ -3,10 +3,21 @@ name: μpb Tests
 on:
   workflow_call:
     inputs:
+      continuous-run:
+        required: true
+        description: "Boolean string denoting whether this run is continuous --
+          empty string for presubmit, non-empty string for continuous."
+        type: string
       safe-checkout:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      continuous-prefix:
+        required: true
+        description: "The string continuous-only tests should be prefixed with when displaying test
+          results."
+        type: string
+
 
 permissions:
   contents: read
@@ -17,24 +28,26 @@ jobs:
       fail-fast: false   # Don't cancel all jobs if one fails.
       matrix:
         config:
-          - { name: "Bazel 7", bazel_version: "7.1.1" }
+          - { name: "Bazel 7", bazel_version: "7.1.1", continuous-only: true }
           - { name: "Fastbuild" }
-          - { name: "Optimized", flags: "-c opt" }
+          - { name: "Optimized", flags: "-c opt", continuous-only: true }
           - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-22-4core }
-          - { name: "UBSAN", flags: "--config=ubsan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/... -//lua/..." }
+          - { name: "UBSAN", flags: "--config=ubsan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/... -//lua/...", continuous-only: true }
           - { name: "32-bit", flags: "--copt=-m32 --linkopt=-m32", exclude-targets: "-//benchmarks:benchmark -//python/..." }
           # TODO: Add 32-bit ASAN test
           # TODO: Restore the FastTable tests
 
-    name: ${{ matrix.config.name }}
+    name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }}
 
     steps:
       - name: Checkout pending changes
+        if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/checkout@v3
         with:
           ref: ${{ inputs.safe-checkout }}
       - name: Run tests
+        if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel-docker@v3
         with:
           image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize:${{ matrix.config.bazel_version || '6.3.0' }}-75f2a85ece6526cc3d54087018c0f1097d78d42b
@@ -161,8 +174,6 @@ jobs:
           path: python/requirements.txt
 
   test_wheels:
-    name: Test Wheels
-    needs: build_wheels
     strategy:
       fail-fast: false   # Don't cancel all jobs if one fails.
       matrix:
@@ -175,22 +186,24 @@ jobs:
           - { os: macos-12, python-version: "3.8", architecture: x64, type: 'binary' }
           - { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'binary' }
           - { os: macos-13, python-version: "3.12", architecture: x64, type: 'binary' }
-          - { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source' }
-          - { os: macos-12, python-version: "3.8", architecture: x64, type: 'source' }
-          - { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'source' }
-          - { os: macos-13, python-version: "3.12", architecture: x64, type: 'source' }
+          - { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source', continuous-only: true }
+          - { os: macos-12, python-version: "3.8", architecture: x64, type: 'source', continuous-only: true }
+          - { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'source', continuous-only: true }
+          - { os: macos-13, python-version: "3.12", architecture: x64, type: 'source', continuous-only: true }
 
           # Windows uses the full API up until Python 3.10.
-          - { os: windows-2019, python-version: "3.8", architecture: x86, type: 'binary' }
-          - { os: windows-2019, python-version: "3.9", architecture: x86, type: 'binary' }
-          - { os: windows-2019, python-version: "3.10", architecture: x86, type: 'binary' }
-          - { os: windows-2019, python-version: "3.11", architecture: x86, type: 'binary' }
-          - { os: windows-2019, python-version: "3.12", architecture: x86, type: 'binary' }
+          - { os: windows-2019, python-version: "3.8", architecture: x86, type: 'binary', continuous-only: true }
+          - { os: windows-2019, python-version: "3.9", architecture: x86, type: 'binary', continuous-only: true }
+          - { os: windows-2019, python-version: "3.10", architecture: x86, type: 'binary', continuous-only: true }
+          - { os: windows-2019, python-version: "3.11", architecture: x86, type: 'binary', continuous-only: true }
+          - { os: windows-2019, python-version: "3.12", architecture: x86, type: 'binary', continuous-only: true }
           - { os: windows-2019, python-version: "3.8", architecture: x64, type: 'binary' }
-          - { os: windows-2019, python-version: "3.9", architecture: x64, type: 'binary' }
-          - { os: windows-2019, python-version: "3.10", architecture: x64, type: 'binary' }
-          - { os: windows-2019, python-version: "3.11", architecture: x64, type: 'binary' }
+          - { os: windows-2019, python-version: "3.9", architecture: x64, type: 'binary', continuous-only: true }
+          - { os: windows-2019, python-version: "3.10", architecture: x64, type: 'binary', continuous-only: true }
+          - { os: windows-2019, python-version: "3.11", architecture: x64, type: 'binary', continuous-only: true }
           - { os: windows-2019, python-version: "3.12", architecture: x64, type: 'binary' }
+    name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Test Wheels Python ${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.architecture }} ${{ matrix.type }}
+    needs: build_wheels
     runs-on: ${{ matrix.os }}
     if: ${{ github.event_name != 'pull_request_target' }}
     defaults:
@@ -198,20 +211,24 @@ jobs:
         shell: bash
     steps:
       - name: Download Wheels
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: actions/download-artifact@v3
         with:
           name: python-wheels
           path: wheels
       - name: Download Requirements
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: actions/download-artifact@v3
         with:
           name: requirements
           path: requirements
       - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.architecture }}
       - name: Setup Python venv
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: |
           python -m pip install --upgrade pip
           python -m venv env
@@ -221,24 +238,28 @@ jobs:
       - name: Install tzdata
         run: pip install tzdata
         # Only needed on Windows, Linux ships with tzdata.
-        if: ${{ contains(matrix.os, 'windows') }}
+        if: ${{ contains(matrix.os, 'windows') && (!matrix.continuous-only || inputs.continuous-run) }}
       - name: Install requirements
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: pip install -r requirements/requirements.txt
       - name: Install Protobuf Binary Wheel
+        if: ${{ matrix.type == 'binary' && (!matrix.continuous-only || inputs.continuous-run) }}
         run: pip install -vvv --no-index --find-links wheels protobuf
-        if: ${{ matrix.type == 'binary' }}
       - name: Install Protobuf Source Wheel
+        if: ${{ matrix.type == 'source' && (!matrix.continuous-only || inputs.continuous-run) }}
         run: |
           cd wheels
           tar -xzvf *.tar.gz
           cd protobuf-*/
           pip install .
-        if: ${{ matrix.type == 'source' }}
       - name: Test that module is importable
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: python -v -c 'from google._upb import _message; assert "google._upb._message.MessageMeta" in str(_message.MessageMeta)'
       - name: Install Protobuf Test Wheel
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: pip install -vvv --no-index --find-links wheels protobuftests
       - name: Run the unit tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         run: |
           TESTS=$(pip show -f protobuftests | grep pb_unit_tests.*py$ | sed 's,/,.,g' | sed 's,\\,.,g' | sed -E 's,.py$,,g')
           for test in $TESTS; do

.github/workflows/test_yaml.yml

@@ -0,0 +1,25 @@
+name: Validate YAML
+
+on:
+  workflow_call:
+    inputs:
+      safe-checkout:
+        required: true
+        description: "The SHA key for the commit we want to run over"
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  validate-yaml:
+    name: Validate YAML
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout pending changes
+        uses: protocolbuffers/protobuf-ci/checkout@v3
+        with:
+          ref: ${{ inputs.safe-checkout }}
+      - name: Run python validation script
+        run: |
+          python .github/scripts/validate_yaml.py

benchmarks/BUILD

@@ -74,7 +74,6 @@ cc_test(
         "//:protobuf",
         "//src/google/protobuf/json",
         "//upb:base",
-        "//upb:descriptor_upb_proto",
         "//upb:json",
         "//upb:mem",
         "//upb:reflection",

cmake/conformance.cmake

@@ -93,6 +93,8 @@ add_executable(conformance_test_runner
   ${protobuf_SOURCE_DIR}/conformance/conformance_test_main.cc
   ${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.cc
   ${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.h
+  ${protobuf_SOURCE_DIR}/conformance/failure_list_trie_node.cc
+  ${protobuf_SOURCE_DIR}/conformance/failure_list_trie_node.h
 )
 
 add_executable(conformance_cpp

conformance/BUILD.bazel

@@ -134,9 +134,11 @@ cc_library(
     srcs = [
         "conformance_test.cc",
         "conformance_test_runner.cc",
+        "failure_list_trie_node.cc",
     ],
     hdrs = [
         "conformance_test.h",
+        "failure_list_trie_node.h",
     ],
     includes = ["."],
     deps = [
@@ -152,11 +154,33 @@ cc_library(
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/log:absl_log",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
+        "@com_google_absl//absl/types:optional",
     ],
 )
 
+cc_test(
+    name = "failure_list_trie_node_test",
+    srcs = ["failure_list_trie_node_test.cc"],
+    deps = [
+        ":conformance_test",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:optional",
+        "@com_google_googletest//:gtest",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+# Add more meta-testing here. This is not to be confused with a conformance test itself.
+test_suite(
+    name = "conformance_framework_tests",
+    tests = ["failure_list_trie_node_test"],
+)
+
 cc_library(
     name = "binary_json_conformance_suite",
     testonly = 1,

conformance/conformance.proto

@@ -63,6 +63,9 @@ enum TestCategory {
 message TestStatus {
   string name = 1;
   string failure_message = 2;
+  // What an actual test name matched to in a failure list. Can be wildcarded or
+  // an exact match without wildcards.
+  string matched_name = 3;
 }
 
 // The conformance runner will request a list of failures as the first request.

conformance/conformance_test.cc

@@ -24,11 +24,13 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/log/absl_check.h"
 #include "absl/log/absl_log.h"
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "conformance/conformance.pb.h"
 #include "conformance/conformance.pb.h"
+#include "failure_list_trie_node.h"
 #include "google/protobuf/descriptor_legacy.h"
 #include "google/protobuf/endian.h"
 #include "google/protobuf/message.h"
@@ -120,7 +122,7 @@ static void Normalize(std::string& input) {
 }
 
 // Sets up a failure message properly for our failure lists.
-static TestStatus FormatFailureMessage(TestStatus& input) {
+static TestStatus FormatFailureMessage(const TestStatus& input) {
   // Make copy just this once, as we need to modify it for our failure lists.
   std::string formatted_failure_message = input.failure_message();
   // Remove newlines
@@ -159,7 +161,12 @@ bool CheckSetEmpty(const absl::btree_map<std::string, TestStatus>& set_to_check,
     std::ofstream os{std::string(filename)};
     if (os) {
       for (const auto& pair : set_to_check) {
-        os << pair.first << " # " << pair.second.failure_message() << "\n";
+        // Additions will not have a 'matched_name' while removals will.
+        string potential_add_or_removal = pair.second.matched_name().empty()
+                                              ? pair.first
+                                              : pair.second.matched_name();
+        os << potential_add_or_removal << " # " << pair.second.failure_message()
+           << "\n";
       }
     } else {
       absl::StrAppendFormat(output,
@@ -176,6 +183,8 @@ bool CheckSetEmpty(const absl::btree_map<std::string, TestStatus>& set_to_check,
 namespace google {
 namespace protobuf {
 
+constexpr int kMaximumWildcardExpansions = 5;
+
 ConformanceTestSuite::ConformanceRequestSetting::ConformanceRequestSetting(
     ConformanceLevel level, conformance::WireFormat input_format,
     conformance::WireFormat output_format,
@@ -348,14 +357,16 @@ ConformanceResponse ConformanceTestSuite::TruncateResponse(
 }
 
 void ConformanceTestSuite::ReportSuccess(const TestStatus& test) {
-  if (expected_to_fail_.erase(test.name()) != 0) {
-    absl::StrAppendFormat(
-        &output_,
-        "ERROR: test %s is in the failure list, but test succeeded.  "
-        "Remove it from the failure list.\n",
-        test.name());
-    unexpected_succeeding_tests_[test.name()] = test;
-  }
+  if (expected_to_fail_.contains(test.name())) {
+    absl::StrAppendFormat(&output_,
+                          "ERROR: test %s (matched to %s) is in the failure "
+                          "list, but test succeeded.  "
+                          "Remove its match from the failure list.\n",
+                          test.name(),
+                          expected_to_fail_[test.name()].matched_name());
+    unexpected_succeeding_tests_[test.name()] = expected_to_fail_[test.name()];
+  }
+  expected_to_fail_.erase(test.name());
   successes_++;
 }
 
@@ -383,8 +394,9 @@ void ConformanceTestSuite::ReportFailure(TestStatus& test,
       // to it the same failure message that was in the list.
       TestStatus incorrect_failure_message;
       incorrect_failure_message.set_name(test.name());
-      incorrect_failure_message.set_failure_message(
-          expected_to_fail_[test.name()].failure_message());
+      incorrect_failure_message.set_failure_message(expected_failure_message);
+      incorrect_failure_message.set_matched_name(
+          expected_to_fail_[test.name()].matched_name());
 
       expected_failure_messages_[test.name()] = incorrect_failure_message;
     }
@@ -518,6 +530,29 @@ bool ConformanceTestSuite::RunTest(const std::string& test_name,
     ABSL_LOG(FATAL) << "Duplicated test name: " << test_name;
   }
 
+  // In essence, find what wildcarded test names expand to or direct matches
+  // (without wildcards).
+  if (auto result = failure_list_root_.WalkDownMatch(test_name);
+      result.has_value()) {
+    string matched_equivalent = result.value();
+    unmatched_.erase(matched_equivalent);
+    TestStatus expansion;
+    expansion.set_name(test_name);
+    expansion.set_matched_name(matched_equivalent);
+    expansion.set_failure_message(saved_failure_messages_[matched_equivalent]);
+    expected_to_fail_[test_name] = expansion;
+
+    if (number_of_matches_.contains(matched_equivalent)) {
+      if (number_of_matches_[matched_equivalent] > kMaximumWildcardExpansions &&
+          !exceeded_max_matches_.contains(matched_equivalent)) {
+        exceeded_max_matches_[matched_equivalent] = expansion;
+      }
+      number_of_matches_[matched_equivalent]++;
+    } else {
+      number_of_matches_[matched_equivalent] = 1;
+    }
+  }
+
   std::string serialized_request;
   std::string serialized_response;
   request.SerializeToString(&serialized_request);
@@ -597,8 +632,17 @@ std::string ConformanceTestSuite::WireFormatToString(WireFormat wire_format) {
   return "";
 }
 
-void ConformanceTestSuite::AddExpectedFailedTest(const TestStatus& failure) {
-  expected_to_fail_[failure.name()] = failure;
+bool ConformanceTestSuite::AddExpectedFailedTest(
+    const TestStatus& expected_failure) {
+  absl::Status attempt = failure_list_root_.Insert(expected_failure.name());
+  if (!attempt.ok()) {
+    absl::StrAppend(&output_, attempt.message(), "\n\n");
+    return false;
+  }
+  unmatched_[expected_failure.name()] = expected_failure;
+  saved_failure_messages_[expected_failure.name()] =
+      expected_failure.failure_message();
+  return true;
 }
 
 bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
@@ -606,6 +650,7 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
                                     const std::string& filename,
                                     conformance::FailureSet* failure_list) {
   runner_ = runner;
+  failure_list_root_ = FailureListTrieNode("root");
   successes_ = 0;
   expected_failures_ = 0;
   skipped_.clear();
@@ -620,8 +665,11 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
 
   failure_list_filename_ = filename;
   expected_to_fail_.clear();
-  for (const TestStatus& failure : failure_list->test()) {
-    AddExpectedFailedTest(failure);
+  for (const TestStatus& expected_failure : failure_list->test()) {
+    if (!AddExpectedFailedTest(expected_failure)) {
+      output->assign(output_);
+      return false;
+    }
   }
 
   RunSuiteImpl();
@@ -632,24 +680,26 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
 
   bool ok = true;
   if (!CheckSetEmpty(
-          expected_to_fail_, "nonexistent_tests.txt",
+          unmatched_, "unmatched.txt",
           absl::StrCat(
-              "These tests were listed in the failure list, but they "
-              "don't exist.  Remove them from the failure list by "
-              "running from the root of your workspace:\n"
+              "These test names were listed in the failure list, but they "
+              "didn't match any actual test name.  Remove them from the "
+              "failure list by running from the root of your workspace:\n"
               "  bazel run "
               "//google/protobuf/conformance:update_failure_list -- ",
               failure_list_filename_, " --remove ", output_dir_,
-              "nonexistent_tests.txt"),
+              "unmatched.txt"),
           output_dir_, &output_)) {
     ok = false;
   }
+
   if (!CheckSetEmpty(
           expected_failure_messages_, "expected_failure_messages.txt",
           absl::StrCat(
-              "These tests were listed in the failure list, but their failure "
-              "messages do not match.  Remove them from the failure list "
-              "by running:\n"
+              "These tests (either expanded from wildcard(s) or direct "
+              "matches) were listed in the failure list, but their "
+              "failure messages do not match.  Remove their match from the "
+              "failure list by running from the root of your workspace:\n"
               "  bazel run ",
               "//google/protobuf/conformance:update_failure_list -- ",
               failure_list_filename_, " --remove ", output_dir_,
@@ -657,10 +707,42 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
           output_dir_, &output_)) {
     ok = false;
   }
+
+  if (!CheckSetEmpty(
+          unexpected_succeeding_tests_, "succeeding_tests.txt",
+          absl::StrCat(
+              "These tests succeeded, even though they were listed in "
+              "the failure list (expanded from wildcard(s) or direct matches). "
+              " Remove their match from the failure list by "
+              "running from the root of your workspace:\n"
+              "  bazel run "
+              "//google/protobuf/conformance:update_failure_list -- ",
+              failure_list_filename_, " --remove ", output_dir_,
+              "succeeding_tests.txt"),
+          output_dir_, &output_)) {
+    ok = false;
+  }
+
+  if (!CheckSetEmpty(
+          exceeded_max_matches_, "exceeded_max_matches.txt",
+          absl::StrFormat(
+              "These failure list entries served as matches to too many test "
+              "names exceeding the max amount of %d.  "
+              "Remove them from the failure list by running from the root of "
+              "your workspace:\n"
+              "  bazel run "
+              "//google/protobuf/conformance:update_failure_list -- %s "
+              "--remove %sexceeded_max_matches.txt",
+              kMaximumWildcardExpansions, failure_list_filename_, output_dir_),
+          output_dir_, &output_)) {
+    ok = false;
+  }
+
   if (!CheckSetEmpty(
           unexpected_failure_messages_, "unexpected_failure_messages.txt",
           absl::StrCat(
-              "These tests failed because their failure messages did "
+              "These tests (expanded from wildcard(s) or direct matches from "
+              "the failure list) failed because their failure messages did "
               "not match.  If they can't be fixed right now, "
               "you can add them to the failure list so the overall "
               "suite can succeed.  Add them to the failure list by "
@@ -687,19 +769,6 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
           output_dir_, &output_)) {
     ok = false;
   }
-  if (!CheckSetEmpty(
-          unexpected_succeeding_tests_, "succeeding_tests.txt",
-          absl::StrCat(
-              "These tests succeeded, even though they were listed in "
-              "the failure list.  Remove them from the failure list by running "
-              "from the root of your workspace:\n"
-              "  bazel run "
-              "//google/protobuf/conformance:update_failure_list -- ",
-              failure_list_filename_, " --remove ", output_dir_,
-              "succeeding_tests.txt"),
-          output_dir_, &output_)) {
-    ok = false;
-  }
 
   if (verbose_) {
     CheckSetEmpty(skipped_, "",

conformance/conformance_test.h

@@ -26,6 +26,7 @@
 #include "absl/container/flat_hash_set.h"
 #include "conformance/conformance.pb.h"
 #include "conformance/conformance.pb.h"
+#include "failure_list_trie_node.h"
 #include "google/protobuf/descriptor.h"
 
 namespace conformance {
@@ -293,11 +294,15 @@ class ConformanceTestSuite {
                const conformance::ConformanceRequest& request,
                conformance::ConformanceResponse* response);
 
-  void AddExpectedFailedTest(const conformance::TestStatus& failure);
+  // Will return false if an entry from the failure list was either a
+  // duplicate of an already added one to the trie or it contained invalid
+  // wildcards; otherwise, returns true.
+  bool AddExpectedFailedTest(const conformance::TestStatus& failure);
 
   virtual void RunSuiteImpl() = 0;
 
   ConformanceTestRunner* runner_;
+  FailureListTrieNode failure_list_root_;
   std::string testee_;
   int successes_;
   int expected_failures_;
@@ -315,8 +320,8 @@ class ConformanceTestSuite {
   // will be run and this bool will be set to true.
   bool isolated_ = false;
 
-  // The set of test names that are expected to fail in this run, but haven't
-  // failed yet.
+  // The set of test names (expanded from wildcard(s) and non-expanded) that are
+  // expected to fail in this run, but haven't failed yet.
   absl::btree_map<std::string, conformance::TestStatus> expected_to_fail_;
 
   // The set of tests that failed because their failure message did not match
@@ -345,8 +350,22 @@ class ConformanceTestSuite {
   absl::btree_map<std::string, conformance::TestStatus>
       unexpected_failure_messages_;
 
+  // The set of test names (wildcarded or not) from the failure list that did
+  // not match any actual test name.
+  absl::btree_map<std::string, conformance::TestStatus> unmatched_;
+
   // The set of tests that the testee opted out of;
   absl::btree_map<std::string, conformance::TestStatus> skipped_;
+
+  // Allows us to remove from unmatched_.
+  absl::btree_map<std::string, std::string> saved_failure_messages_;
+
+  // If a failure list entry served as a match for more than 'max_matches_',
+  // those will be added here for removal.
+  absl::btree_map<std::string, conformance::TestStatus> exceeded_max_matches_;
+
+  // Keeps track of how many tests matched to each failure list entry.
+  absl::btree_map<std::string, int> number_of_matches_;
 };
 
 }  // namespace protobuf

conformance/failure_list_cpp.txt

@@ -7,105 +7,31 @@
 # TODO: insert links to corresponding bugs tracking the issue.
 # Should we use GitHub issues or the Google-internal bug tracker?
 
-Recommended.Editions_Proto2.JsonInput.BoolFieldDoubleQuotedFalse                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.BoolFieldDoubleQuotedTrue                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FieldNameDuplicate                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FieldNameDuplicateDifferentCasing1                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FieldNameDuplicateDifferentCasing2                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FieldNameExtension.Validator                                                 # Expected JSON payload but got type 1
-Recommended.Editions_Proto2.JsonInput.FieldNameNotQuoted                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.IgnoreUnknownEnumStringValueInMapPart.ProtobufOutput                         # Output was not equivalent to reference message: added: map_string_nested_enum[key2]: FOO
-Recommended.Editions_Proto2.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput                        # Output was not equivalent to reference message: added: map_string_nested_enum[key]: FOO
-Recommended.Editions_Proto2.JsonInput.MapFieldValueIsNull                                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.RepeatedFieldMessageElementIsNull                                            # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.RepeatedFieldPrimitiveElementIsNull                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.RepeatedFieldTrailingComma                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.RepeatedFieldTrailingCommaWithNewlines                                       # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.RepeatedFieldTrailingCommaWithSpace                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.RepeatedFieldTrailingCommaWithSpaceCommaSpace                                # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldSingleQuoteBoth                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldSingleQuoteKey                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldSingleQuoteValue                                                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldUppercaseEscapeLetter                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.TrailingCommaInAnObject                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.TrailingCommaInAnObjectWithNewlines                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.TrailingCommaInAnObjectWithSpace                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.FieldMaskNumbersDontRoundTrip.JsonOutput                                               # Should have failed to serialize, but didn't.
-Recommended.Editions_Proto3.FieldMaskPathsDontRoundTrip.JsonOutput                                                 # Should have failed to serialize, but didn't.
-Recommended.Editions_Proto3.FieldMaskTooManyUnderscore.JsonOutput                                                  # Should have failed to serialize, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldDoubleQuotedFalse                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldDoubleQuotedTrue                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldMaskInvalidCharacter                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldNameDuplicate                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldNameDuplicateDifferentCasing1                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldNameDuplicateDifferentCasing2                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldNameNotQuoted                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapPart.ProtobufOutput                         # Output was not equivalent to reference message: added: map_string_nested_enum[key2]: FOO
-Recommended.Editions_Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput                        # Output was not equivalent to reference message: added: map_string_nested_enum[key]: FOO
-Recommended.Editions_Proto3.JsonInput.MapFieldValueIsNull                                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.RepeatedFieldMessageElementIsNull                                            # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.RepeatedFieldPrimitiveElementIsNull                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.RepeatedFieldTrailingComma                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.RepeatedFieldTrailingCommaWithNewlines                                       # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.RepeatedFieldTrailingCommaWithSpace                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.RepeatedFieldTrailingCommaWithSpaceCommaSpace                                # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldSingleQuoteBoth                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldSingleQuoteKey                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldSingleQuoteValue                                                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldUppercaseEscapeLetter                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.TrailingCommaInAnObject                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.TrailingCommaInAnObjectWithNewlines                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.TrailingCommaInAnObjectWithSpace                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace                                   # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldDoubleQuotedFalse                                                            # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldDoubleQuotedTrue                                                             # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FieldNameDuplicate                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FieldNameDuplicateDifferentCasing1                                                    # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FieldNameDuplicateDifferentCasing2                                                    # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator                                                          # Expected JSON payload but got type 1
-Recommended.Proto2.JsonInput.FieldNameNotQuoted                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.IgnoreUnknownEnumStringValueInMapPart.ProtobufOutput                                  # Output was not equivalent to reference message: added: map_string_nested_enum[key2]: FOO
-Recommended.Proto2.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput                                 # Output was not equivalent to reference message: added: map_string_nested_enum[key]: FOO
-Recommended.Proto2.JsonInput.MapFieldValueIsNull                                                                   # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.RepeatedFieldMessageElementIsNull                                                     # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.RepeatedFieldPrimitiveElementIsNull                                                   # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.RepeatedFieldTrailingComma                                                            # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.RepeatedFieldTrailingCommaWithNewlines                                                # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.RepeatedFieldTrailingCommaWithSpace                                                   # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.RepeatedFieldTrailingCommaWithSpaceCommaSpace                                         # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldSingleQuoteBoth                                                            # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldSingleQuoteKey                                                             # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldSingleQuoteValue                                                           # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldUppercaseEscapeLetter                                                      # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.TrailingCommaInAnObject                                                               # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.TrailingCommaInAnObjectWithNewlines                                                   # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.TrailingCommaInAnObjectWithSpace                                                      # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.FieldMaskNumbersDontRoundTrip.JsonOutput                                                        # Should have failed to serialize, but didn't.
-Recommended.Proto3.FieldMaskPathsDontRoundTrip.JsonOutput                                                          # Should have failed to serialize, but didn't.
-Recommended.Proto3.FieldMaskTooManyUnderscore.JsonOutput                                                           # Should have failed to serialize, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedFalse                                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedTrue                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldNameDuplicate                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing1                                                    # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing2                                                    # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldNameNotQuoted                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapPart.ProtobufOutput                                  # Output was not equivalent to reference message: added: map_string_nested_enum[key2]: FOO
-Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput                                 # Output was not equivalent to reference message: added: map_string_nested_enum[key]: FOO
-Recommended.Proto3.JsonInput.MapFieldValueIsNull                                                                   # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.RepeatedFieldMessageElementIsNull                                                     # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.RepeatedFieldPrimitiveElementIsNull                                                   # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingComma                                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingCommaWithNewlines                                                # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingCommaWithSpace                                                   # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingCommaWithSpaceCommaSpace                                         # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteBoth                                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteKey                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteValue                                                           # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldUppercaseEscapeLetter                                                      # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.TrailingCommaInAnObject                                                               # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.TrailingCommaInAnObjectWithNewlines                                                   # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.TrailingCommaInAnObjectWithSpace                                                      # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace                                            # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolFieldDoubleQuotedFalse                                                                 # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolFieldDoubleQuotedTrue                                                                  # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FieldNameDuplicate                                                                         # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FieldNameDuplicateDifferentCasing1                                                         # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FieldNameDuplicateDifferentCasing2                                                         # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FieldNameExtension.Validator                                                               # Expected JSON payload but got type 1
+Recommended.*.JsonInput.FieldNameNotQuoted                                                                         # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.IgnoreUnknownEnumStringValueInMapPart.ProtobufOutput                                       # Output was not equivalent to reference message: added: map_string_nested_enum[key2]: FOO
+Recommended.*.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput                                      # Output was not equivalent to reference message: added: map_string_nested_enum[key]: FOO
+Recommended.*.JsonInput.MapFieldValueIsNull                                                                        # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.RepeatedFieldMessageElementIsNull                                                          # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.RepeatedFieldPrimitiveElementIsNull                                                        # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.RepeatedFieldTrailingComma                                                                 # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.RepeatedFieldTrailingCommaWithNewlines                                                     # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.RepeatedFieldTrailingCommaWithSpace                                                        # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.RepeatedFieldTrailingCommaWithSpaceCommaSpace                                              # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldSingleQuoteBoth                                                                 # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldSingleQuoteKey                                                                  # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldSingleQuoteValue                                                                # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldUppercaseEscapeLetter                                                           # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.TrailingCommaInAnObject                                                                    # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.TrailingCommaInAnObjectWithNewlines                                                        # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.TrailingCommaInAnObjectWithSpace                                                           # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace                                                 # Should have failed to parse, but didn't.
+Recommended.*.FieldMaskNumbersDontRoundTrip.JsonOutput                                                             # Should have failed to serialize, but didn't.
+Recommended.*.FieldMaskPathsDontRoundTrip.JsonOutput                                                               # Should have failed to serialize, but didn't.
+Recommended.*.FieldMaskTooManyUnderscore.JsonOutput                                                                # Should have failed to serialize, but didn't.
+Recommended.*.JsonInput.FieldMaskInvalidCharacter                                                                  # Should have failed to parse, but didn't.

conformance/failure_list_java.txt

@@ -4,149 +4,42 @@
 # By listing them here we can keep tabs on which ones are failing and be sure
 # that we don't introduce regressions in other tests.
 
-Recommended.Editions_Proto2.JsonInput.BoolFieldAllCapitalFalse                                                     # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.BoolFieldAllCapitalTrue                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.BoolFieldCamelCaseFalse                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.BoolFieldCamelCaseTrue                                                       # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.BoolFieldDoubleQuotedFalse                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.BoolFieldDoubleQuotedTrue                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.BoolMapFieldKeyNotQuoted                                                     # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.DoubleFieldInfinityNotQuoted                                                 # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.DoubleFieldNanNotQuoted                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.DoubleFieldNegativeInfinityNotQuoted                                         # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FieldNameDuplicate                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FieldNameExtension.Validator                                                 # Expected JSON payload but got type 1
-Recommended.Editions_Proto2.JsonInput.FieldNameNotQuoted                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FloatFieldInfinityNotQuoted                                                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FloatFieldNanNotQuoted                                                       # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.FloatFieldNegativeInfinityNotQuoted                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.Int32MapFieldKeyNotQuoted                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.Int64MapFieldKeyNotQuoted                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.JsonWithComments                                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldSingleQuoteBoth                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldSingleQuoteKey                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldSingleQuoteValue                                                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldSurrogateInWrongOrder                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldUnpairedHighSurrogate                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.StringFieldUnpairedLowSurrogate                                              # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.Uint32MapFieldKeyNotQuoted                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto2.JsonInput.Uint64MapFieldKeyNotQuoted                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.FieldMaskNumbersDontRoundTrip.JsonOutput                                               # Should have failed to serialize, but didn't.
-Recommended.Editions_Proto3.FieldMaskPathsDontRoundTrip.JsonOutput                                                 # Should have failed to serialize, but didn't.
-Recommended.Editions_Proto3.FieldMaskTooManyUnderscore.JsonOutput                                                  # Should have failed to serialize, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldAllCapitalFalse                                                     # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldAllCapitalTrue                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldCamelCaseFalse                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldCamelCaseTrue                                                       # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldDoubleQuotedFalse                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolFieldDoubleQuotedTrue                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.BoolMapFieldKeyNotQuoted                                                     # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.DoubleFieldInfinityNotQuoted                                                 # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.DoubleFieldNanNotQuoted                                                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.DoubleFieldNegativeInfinityNotQuoted                                         # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldMaskInvalidCharacter                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldNameDuplicate                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FieldNameNotQuoted                                                           # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FloatFieldInfinityNotQuoted                                                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FloatFieldNanNotQuoted                                                       # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.FloatFieldNegativeInfinityNotQuoted                                          # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.Int32MapFieldKeyNotQuoted                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.Int64MapFieldKeyNotQuoted                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.JsonWithComments                                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldSingleQuoteBoth                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldSingleQuoteKey                                                    # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldSingleQuoteValue                                                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldSurrogateInWrongOrder                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldUnpairedHighSurrogate                                             # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.StringFieldUnpairedLowSurrogate                                              # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.Uint32MapFieldKeyNotQuoted                                                   # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.JsonInput.Uint64MapFieldKeyNotQuoted                                                   # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldAllCapitalFalse                                                              # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldAllCapitalTrue                                                               # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldCamelCaseFalse                                                               # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldCamelCaseTrue                                                                # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldDoubleQuotedFalse                                                            # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolFieldDoubleQuotedTrue                                                             # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.BoolMapFieldKeyNotQuoted                                                              # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.DoubleFieldInfinityNotQuoted                                                          # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.DoubleFieldNanNotQuoted                                                               # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.DoubleFieldNegativeInfinityNotQuoted                                                  # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FieldNameDuplicate                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator                                                          # Expected JSON payload but got type 1
-Recommended.Proto2.JsonInput.FieldNameNotQuoted                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FloatFieldInfinityNotQuoted                                                           # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FloatFieldNanNotQuoted                                                                # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.FloatFieldNegativeInfinityNotQuoted                                                   # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.Int32MapFieldKeyNotQuoted                                                             # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.Int64MapFieldKeyNotQuoted                                                             # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.JsonWithComments                                                                      # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldSingleQuoteBoth                                                            # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldSingleQuoteKey                                                             # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldSingleQuoteValue                                                           # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldSurrogateInWrongOrder                                                      # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldUnpairedHighSurrogate                                                      # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.StringFieldUnpairedLowSurrogate                                                       # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.Uint32MapFieldKeyNotQuoted                                                            # Should have failed to parse, but didn't.
-Recommended.Proto2.JsonInput.Uint64MapFieldKeyNotQuoted                                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.FieldMaskNumbersDontRoundTrip.JsonOutput                                                        # Should have failed to serialize, but didn't.
-Recommended.Proto3.FieldMaskPathsDontRoundTrip.JsonOutput                                                          # Should have failed to serialize, but didn't.
-Recommended.Proto3.FieldMaskTooManyUnderscore.JsonOutput                                                           # Should have failed to serialize, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalFalse                                                              # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalTrue                                                               # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseFalse                                                               # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseTrue                                                                # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedFalse                                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedTrue                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.BoolMapFieldKeyNotQuoted                                                              # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.DoubleFieldInfinityNotQuoted                                                          # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.DoubleFieldNanNotQuoted                                                               # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.DoubleFieldNegativeInfinityNotQuoted                                                  # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldNameDuplicate                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FieldNameNotQuoted                                                                    # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FloatFieldInfinityNotQuoted                                                           # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FloatFieldNanNotQuoted                                                                # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.FloatFieldNegativeInfinityNotQuoted                                                   # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.Int32MapFieldKeyNotQuoted                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.Int64MapFieldKeyNotQuoted                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.JsonWithComments                                                                      # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteBoth                                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteKey                                                             # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteValue                                                           # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldSurrogateInWrongOrder                                                      # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldUnpairedHighSurrogate                                                      # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.StringFieldUnpairedLowSurrogate                                                       # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.Uint32MapFieldKeyNotQuoted                                                            # Should have failed to parse, but didn't.
-Recommended.Proto3.JsonInput.Uint64MapFieldKeyNotQuoted                                                            # Should have failed to parse, but didn't.
-Required.Editions_Proto2.JsonInput.EnumFieldNotQuoted                                                              # Should have failed to parse, but didn't.
-Required.Editions_Proto2.JsonInput.Int32FieldLeadingZero                                                           # Should have failed to parse, but didn't.
-Required.Editions_Proto2.JsonInput.Int32FieldNegativeWithLeadingZero                                               # Should have failed to parse, but didn't.
-Required.Editions_Proto2.JsonInput.Int32FieldPlusSign                                                              # Should have failed to parse, but didn't.
-Required.Editions_Proto2.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool                            # Should have failed to parse, but didn't.
-Required.Editions_Proto2.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt                             # Should have failed to parse, but didn't.
-Required.Editions_Proto2.JsonInput.StringFieldNotAString                                                           # Should have failed to parse, but didn't.
-Required.Editions_Proto2.ProtobufInput.UnknownOrdering.ProtobufOutput                                              # Unknown field mismatch
-Required.Editions_Proto3.JsonInput.EnumFieldNotQuoted                                                              # Should have failed to parse, but didn't.
-Required.Editions_Proto3.JsonInput.Int32FieldLeadingZero                                                           # Should have failed to parse, but didn't.
-Required.Editions_Proto3.JsonInput.Int32FieldNegativeWithLeadingZero                                               # Should have failed to parse, but didn't.
-Required.Editions_Proto3.JsonInput.Int32FieldPlusSign                                                              # Should have failed to parse, but didn't.
-Required.Editions_Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool                            # Should have failed to parse, but didn't.
-Required.Editions_Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt                             # Should have failed to parse, but didn't.
-Required.Editions_Proto3.JsonInput.StringFieldNotAString                                                           # Should have failed to parse, but didn't.
-Required.Editions_Proto3.ProtobufInput.UnknownOrdering.ProtobufOutput                                              # Unknown field mismatch
-Required.Proto2.JsonInput.EnumFieldNotQuoted                                                                       # Should have failed to parse, but didn't.
-Required.Proto2.JsonInput.Int32FieldLeadingZero                                                                    # Should have failed to parse, but didn't.
-Required.Proto2.JsonInput.Int32FieldNegativeWithLeadingZero                                                        # Should have failed to parse, but didn't.
-Required.Proto2.JsonInput.Int32FieldPlusSign                                                                       # Should have failed to parse, but didn't.
-Required.Proto2.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool                                     # Should have failed to parse, but didn't.
-Required.Proto2.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt                                      # Should have failed to parse, but didn't.
-Required.Proto2.JsonInput.StringFieldNotAString                                                                    # Should have failed to parse, but didn't.
-Required.Proto2.ProtobufInput.UnknownOrdering.ProtobufOutput                                                       # Unknown field mismatch
-Required.Proto3.JsonInput.EnumFieldNotQuoted                                                                       # Should have failed to parse, but didn't.
-Required.Proto3.JsonInput.Int32FieldLeadingZero                                                                    # Should have failed to parse, but didn't.
-Required.Proto3.JsonInput.Int32FieldNegativeWithLeadingZero                                                        # Should have failed to parse, but didn't.
-Required.Proto3.JsonInput.Int32FieldPlusSign                                                                       # Should have failed to parse, but didn't.
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool                                     # Should have failed to parse, but didn't.
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt                                      # Should have failed to parse, but didn't.
-Required.Proto3.JsonInput.StringFieldNotAString                                                                    # Should have failed to parse, but didn't.
-Required.Proto3.ProtobufInput.UnknownOrdering.ProtobufOutput                                                       # Unknown field mismatch
+Recommended.*.JsonInput.BoolFieldAllCapitalFalse                                                                   # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolFieldAllCapitalTrue                                                                    # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolFieldCamelCaseFalse                                                                    # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolFieldCamelCaseTrue                                                                     # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolFieldDoubleQuotedFalse                                                                 # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolFieldDoubleQuotedTrue                                                                  # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.BoolMapFieldKeyNotQuoted                                                                   # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.DoubleFieldInfinityNotQuoted                                                               # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.DoubleFieldNanNotQuoted                                                                    # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.DoubleFieldNegativeInfinityNotQuoted                                                       # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FieldNameDuplicate                                                                         # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FieldNameExtension.Validator                                                               # Expected JSON payload but got type 1
+Recommended.*.JsonInput.FieldNameNotQuoted                                                                         # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FloatFieldInfinityNotQuoted                                                                # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FloatFieldNanNotQuoted                                                                     # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.FloatFieldNegativeInfinityNotQuoted                                                        # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.Int32MapFieldKeyNotQuoted                                                                  # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.Int64MapFieldKeyNotQuoted                                                                  # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.JsonWithComments                                                                           # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldSingleQuoteBoth                                                                 # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldSingleQuoteKey                                                                  # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldSingleQuoteValue                                                                # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldSurrogateInWrongOrder                                                           # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldUnpairedHighSurrogate                                                           # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.StringFieldUnpairedLowSurrogate                                                            # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.Uint32MapFieldKeyNotQuoted                                                                 # Should have failed to parse, but didn't.
+Recommended.*.JsonInput.Uint64MapFieldKeyNotQuoted                                                                 # Should have failed to parse, but didn't.
+Recommended.*.FieldMaskNumbersDontRoundTrip.JsonOutput                                                             # Should have failed to serialize, but didn't.
+Recommended.*.FieldMaskPathsDontRoundTrip.JsonOutput                                                               # Should have failed to serialize, but didn't.
+Recommended.*.FieldMaskTooManyUnderscore.JsonOutput                                                                # Should have failed to serialize, but didn't.
+Recommended.*.JsonInput.FieldMaskInvalidCharacter                                                                  # Should have failed to parse, but didn't.
+Required.*.JsonInput.EnumFieldNotQuoted                                                                            # Should have failed to parse, but didn't.
+Required.*.JsonInput.Int32FieldLeadingZero                                                                         # Should have failed to parse, but didn't.
+Required.*.JsonInput.Int32FieldNegativeWithLeadingZero                                                             # Should have failed to parse, but didn't.
+Required.*.JsonInput.Int32FieldPlusSign                                                                            # Should have failed to parse, but didn't.
+Required.*.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool                                          # Should have failed to parse, but didn't.
+Required.*.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt                                           # Should have failed to parse, but didn't.
+Required.*.JsonInput.StringFieldNotAString                                                                         # Should have failed to parse, but didn't.
+Required.*.ProtobufInput.UnknownOrdering.ProtobufOutput                                                            # Unknown field mismatch

conformance/failure_list_java_lite.txt

@@ -4,11 +4,5 @@
 # By listing them here we can keep tabs on which ones are failing and be sure
 # that we don't introduce regressions in other tests.
 
-Required.Editions_Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE                 # Should have failed to parse, but didn't.
-Required.Editions_Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE                    # Should have failed to parse, but didn't.
-Required.Editions_Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE                 # Should have failed to parse, but didn't.
-Required.Editions_Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE                    # Should have failed to parse, but didn't.
-Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE                          # Should have failed to parse, but didn't.
-Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE                             # Should have failed to parse, but didn't.
-Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE                          # Should have failed to parse, but didn't.
-Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE                             # Should have failed to parse, but didn't.
+Required.*.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE                               # Should have failed to parse, but didn't.
+Required.*.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE                                  # Should have failed to parse, but didn't.

conformance/failure_list_trie_node.cc

@@ -0,0 +1,87 @@
+#include "failure_list_trie_node.h"
+
+#include <memory>
+#include <string>
+
+#include "absl/status/status.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_split.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+
+namespace google {
+namespace protobuf {
+
+absl::Status FailureListTrieNode::Insert(absl::string_view test_name) {
+  if (auto result = WalkDownMatch(test_name); result.has_value()) {
+    return absl::AlreadyExistsError(
+        absl::StrFormat("Test name  %s  already exists in the trie  FROM  %s",
+                        test_name, result.value()));
+  }
+
+  auto sections = absl::StrSplit(test_name, '.');
+  for (auto section : sections) {
+    if (absl::StrContains(section, '*') && section.length() > 1) {
+      return absl::InvalidArgumentError(absl::StrFormat(
+          "Test name %s contains invalid wildcard(s) (wildcards "
+          "must span the whole of a section)",
+          test_name));
+    }
+  }
+  InsertImpl(test_name);
+  return absl::OkStatus();
+}
+
+void FailureListTrieNode::InsertImpl(absl::string_view test_name) {
+  absl::string_view section = test_name.substr(0, test_name.find('.'));
+
+  // Extracted last section -> no more '.' -> test_name_copy will be equal to
+  // section
+  if (test_name == section) {
+    children_.push_back(std::make_unique<FailureListTrieNode>(section));
+    return;
+  }
+  test_name = test_name.substr(section.length() + 1);
+  for (auto& child : children_) {
+    if (child->data_ == section) {
+      return child->InsertImpl(test_name);
+    }
+  }
+  // No match
+  children_.push_back(std::make_unique<FailureListTrieNode>(section));
+  children_.back()->InsertImpl(test_name);
+}
+
+absl::optional<std::string> FailureListTrieNode::WalkDownMatch(
+    absl::string_view test_name) {
+  absl::string_view section = test_name.substr(0, test_name.find('.'));
+  // test_name cannot be overridden
+  absl::string_view to_match;
+  if (section != test_name) {
+    to_match = test_name.substr(section.length() + 1);
+  }
+
+  for (auto& child : children_) {
+    if (child->data_ == section || child->data_ == "*" || section == "*") {
+      absl::string_view appended = child->data_;
+      // Extracted last section -> no more '.' -> test_name will be
+      // equal to section
+      if (test_name == section) {
+        // Must match all the way to the bottom of the tree
+        if (child->children_.empty()) {
+          return std::string(appended);
+        }
+      } else {
+        if (auto result = child->WalkDownMatch(to_match); result.has_value()) {
+          return absl::StrCat(appended, ".", result.value());
+        }
+      }
+    }
+  }
+  // No match
+  return absl::nullopt;
+}
+}  // namespace protobuf
+}  // namespace google

conformance/failure_list_trie_node.h

@@ -0,0 +1,58 @@
+#ifndef GOOGLE_PROTOBUF_CONFORMANCE_FAILURE_LIST_TRIE_NODE_H__
+#define GOOGLE_PROTOBUF_CONFORMANCE_FAILURE_LIST_TRIE_NODE_H__
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+
+namespace google {
+namespace protobuf {
+
+// Each node represents a section of a test name (divided by '.'). One can
+// imagine them as prefixes to search for a match. Once we hit a prefix that
+// doesn't match, we can stop searching. Wildcards matching to any set of
+// characters are supported.
+//
+// This is not a general trie implementation
+// as pointed out by its name. It is only meant to only be used for conformance
+// failure lists.
+//
+// Example of what the trie might look like in practice:
+//
+//                             (root)
+//                            /      \
+//                "Recommended"   "Required"
+//                      /               \
+//                 "Proto2"             "*"
+//                 /       \               \
+//          "JsonInput" "ProtobufInput"  "JsonInput"
+//
+//
+class FailureListTrieNode {
+ public:
+  FailureListTrieNode() : data_("") {}
+  explicit FailureListTrieNode(absl::string_view data) : data_(data) {}
+
+  // Will attempt to insert a test name into the trie returning
+  // absl::StatusCode::kAlreadyExists if the test name already exists or
+  // absl::StatusCode::kInvalidArgument if the test name contains invalid
+  // wildcards; otherwise, insertion is successful.
+  absl::Status Insert(absl::string_view test_name);
+
+  // Returns what it matched to if it matched anything, otherwise returns
+  // absl::nullopt
+  absl::optional<std::string> WalkDownMatch(absl::string_view test_name);
+
+ private:
+  absl::string_view data_;
+  std::vector<std::unique_ptr<FailureListTrieNode>> children_;
+  void InsertImpl(absl::string_view test_name);
+};
+}  // namespace protobuf
+}  // namespace google
+
+#endif  // GOOGLE_PROTOBUF_CONFORMANCE_FAILURE_LIST_TRIE_NODE_H__

conformance/failure_list_trie_node_test.cc

@@ -0,0 +1,125 @@
+#include "failure_list_trie_node.h"
+
+#include <memory>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/types/optional.h"
+
+using ::testing::Eq;
+using ::testing::HasSubstr;
+using ::testing::Optional;
+
+absl::Status GetStatus(const absl::Status& s) { return s; }
+template <typename T>
+absl::Status GetStatus(const absl::StatusOr<T>& s) {
+  return s.status();
+}
+MATCHER_P2(StatusIs, status, message,
+           absl::StrCat(".status() is ", testing::PrintToString(status))) {
+  return GetStatus(arg).code() == status &&
+         testing::ExplainMatchResult(message, GetStatus(arg).message(),
+                                     result_listener);
+}
+#define EXPECT_OK(x) EXPECT_THAT(x, StatusIs(absl::StatusCode::kOk, testing::_))
+#define ASSERT_OK(x) ASSERT_THAT(x, StatusIs(absl::StatusCode::kOk, testing::_))
+
+namespace google {
+namespace protobuf {
+
+TEST(FailureListTrieTest, WalkDownMatchWithoutWildcard) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert("Recommended.Proto2.ProtobufInput.World"));
+
+  EXPECT_THAT(root_->WalkDownMatch("Recommended.Proto2.ProtobufInput.World"),
+              Optional(Eq("Recommended.Proto2.ProtobufInput.World")));
+}
+
+TEST(FailureListTrieTest, WalkDownMatchWithoutWildcardNoMatch) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+
+  ASSERT_OK(root_->Insert("Recommended.Proto2.JsonInput.World"));
+
+  EXPECT_EQ(root_->WalkDownMatch("Recommended.Proto2.TextFormatInput"),
+            absl::nullopt);
+}
+
+TEST(FailureListTrieTest, WalkDownMatchWithWildcard) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert("Recommended.*.ProtobufInput.World"));
+
+  EXPECT_THAT(root_->WalkDownMatch("Recommended.Proto2.ProtobufInput.World"),
+              Optional(Eq("Recommended.*.ProtobufInput.World")));
+}
+
+TEST(FailureListTrieTest, WalkDownMatchWithWildcardNoMatch) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert("Recommended.*.ProtobufInput.World"));
+
+  EXPECT_EQ(root_->WalkDownMatch("Recommended.Proto2.JsonInput.World"),
+            absl::nullopt);
+}
+
+TEST(FailureListTrieTest, WalkDownMatchTestLessNumberofSectionsNoMatch) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert("Recommended.*.*.*"));
+
+  EXPECT_EQ(root_->WalkDownMatch("Recommended.Proto2.JsonInput"),
+            absl::nullopt);
+}
+
+TEST(FailureListTrieTest, WalkDownMatchTestMoreNumberOfSectionsNoMatch) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert("*"));
+
+  EXPECT_EQ(root_->WalkDownMatch("Recommended.Proto2.JsonInput.World"),
+            absl::nullopt);
+}
+
+TEST(FailureListTrieTest, WalkDownMatchTakeMoreThanOneBranch) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert(
+      "Recommended.*.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace"));
+  ASSERT_OK(root_->Insert(
+      "Recommended.Proto3.*.RepeatedFieldTrailingCommaWithSpaceCommaSpace"));
+
+  EXPECT_THAT(
+      root_->WalkDownMatch("Recommended.Proto3.JsonInput."
+                           "RepeatedFieldTrailingCommaWithSpaceCommaSpace"),
+      Optional(Eq("Recommended.Proto3.*."
+                  "RepeatedFieldTrailingCommaWithSpaceCommaSpace")));
+}
+
+TEST(FailureListTrieTest, InsertWilcardedAmbiguousMatchFails) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert(
+      "Recommended.*.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace"));
+
+  // Essentially a duplicated test name if inserted.
+  EXPECT_THAT(
+      root_->Insert(
+          "Recommended.Proto3.*.TrailingCommaInAnObjectWithSpaceCommaSpace"),
+      StatusIs(absl::StatusCode::kAlreadyExists, HasSubstr("already exists")));
+}
+
+TEST(FailureListTrieTest, InsertWilcardedAmbiguousMatchMutlipleWildcardsFails) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  ASSERT_OK(root_->Insert("Recommended.*.JsonInput.FieldMaskInvalidCharacter"));
+
+  // Essentially a duplicated test name if inserted.
+  EXPECT_THAT(
+      root_->Insert("Recommended.*.*.*"),
+      StatusIs(absl::StatusCode::kAlreadyExists, HasSubstr("already exists")));
+}
+
+TEST(FailureListTrieTest, InsertInvalidWildcardFails) {
+  auto root_ = std::make_unique<google::protobuf::FailureListTrieNode>("dummy");
+  EXPECT_THAT(root_->Insert("This*Is.Not.A.Valid.Wildcard"),
+              StatusIs(absl::StatusCode::kInvalidArgument,
+                       HasSubstr("invalid wildcard")));
+}
+}  // namespace protobuf
+}  // namespace google

conformance/text_format_failure_list_cpp.txt

@@ -1,42 +1,22 @@
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyBytes                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyString                 # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairBytes                       # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairString                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyBytes                 # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyString                # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyBytes                 # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyString                # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes                      # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString                     # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyBytes                # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyString               # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortString                 # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongBytes                  # Should have failed to parse, but didn't.
-Recommended.Editions_Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongString                 # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyBytes                           # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyString                          # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairBytes                                # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairString                               # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyBytes                          # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyString                         # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyBytes                          # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyString                         # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes                               # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString                              # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyBytes                         # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyString                        # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes                           # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortString                          # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongBytes                           # Should have failed to parse, but didn't.
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongString                          # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.StringFieldBadUTF8Hex                                                     # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.StringFieldBadUTF8Octal                                                   # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeBytes                               # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeString                              # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Hex                                                              # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Octal                                                            # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeBytes                                        # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeString                                       # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyBytes                                # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyString                               # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairBytes                                     # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairString                                    # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyBytes                               # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyString                              # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyBytes                               # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyString                              # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes                                    # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString                                   # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyBytes                              # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyString                             # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes                                # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortString                               # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongBytes                                # Should have failed to parse, but didn't.
+Recommended.*.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongString                               # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.StringFieldBadUTF8Hex                                                                   # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.StringFieldBadUTF8Octal                                                                 # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeBytes                                             # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeString                                            # Should have failed to parse, but didn't.
 
 # End up setting the high bit as a sign instead of failing to parse.

conformance/text_format_failure_list_java.txt

@@ -1,20 +1,10 @@
-Recommended.Editions_Proto3.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput                                 # TEXT_FORMAT output we received from test was unparseable.
-Recommended.Editions_Proto3.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput                               # TEXT_FORMAT output we received from test was unparseable.
-Recommended.Editions_Proto3.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput                              # TEXT_FORMAT output we received from test was unparseable.
-Recommended.Editions_Proto3.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput                                # TEXT_FORMAT output we received from test was unparseable.
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput                                          # TEXT_FORMAT output we received from test was unparseable.
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput                                        # TEXT_FORMAT output we received from test was unparseable.
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput                                       # TEXT_FORMAT output we received from test was unparseable.
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput                                         # TEXT_FORMAT output we received from test was unparseable.
-Required.Editions_Proto3.TextFormatInput.AnyField.ProtobufOutput                                                   # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.AnyField.TextFormatOutput                                                 # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                 # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoOctal                                                         # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.StringFieldBadUTF8Hex                                                     # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.StringFieldBadUTF8Octal                                                   # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.AnyField.ProtobufOutput                                                            # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.AnyField.TextFormatOutput                                                          # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                          # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.FloatFieldNoOctal                                                                  # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Hex                                                              # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Octal                                                            # Should have failed to parse, but didn't.
+Recommended.*.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput                                               # TEXT_FORMAT output we received from test was unparseable.
+Recommended.*.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput                                             # TEXT_FORMAT output we received from test was unparseable.
+Recommended.*.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput                                            # TEXT_FORMAT output we received from test was unparseable.
+Recommended.*.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput                                              # TEXT_FORMAT output we received from test was unparseable.
+Required.*.TextFormatInput.AnyField.ProtobufOutput                                                                 # Failed to parse input or produce output.
+Required.*.TextFormatInput.AnyField.TextFormatOutput                                                               # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoNegativeOctal                                                               # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.FloatFieldNoOctal                                                                       # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.StringFieldBadUTF8Hex                                                                   # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.StringFieldBadUTF8Octal                                                                 # Should have failed to parse, but didn't.

conformance/text_format_failure_list_python.txt

@@ -1,101 +1,54 @@
 # This is the list of text format conformance tests that are known to fail right
 # now.
 # TODO: These should be fixed.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                              # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                               # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                             # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                          # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                        # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero.ProtobufOutput                                     # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero.TextFormatOutput                                   # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_f.ProtobufOutput                                   # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_f.TextFormatOutput                                 # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                      # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                    # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                  # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                 # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoOctal                                                         # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                          # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                        # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                           # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                         # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatField_F.ProtobufOutput                                               # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatField_F.TextFormatOutput                                             # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.NegDoubleFieldLargeNegativeExponentParsesAsNegZero.ProtobufOutput         # Output was not equivalent to reference message: deleted: optional_double: -0
-Required.Editions_Proto3.TextFormatInput.NegDoubleFieldLargeNegativeExponentParsesAsNegZero.TextFormatOutput       # Output was not equivalent to reference message: deleted: optional_double: -0
-Required.Editions_Proto3.TextFormatInput.NegFloatFieldLargeNegativeExponentParsesAsNegZero.ProtobufOutput          # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Editions_Proto3.TextFormatInput.NegFloatFieldLargeNegativeExponentParsesAsNegZero.TextFormatOutput        # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                             # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                           # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                            # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                          # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                         # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                                       # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                                        # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                                      # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero.ProtobufOutput                                              # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero.TextFormatOutput                                            # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                            # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                          # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_f.ProtobufOutput                                            # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_f.TextFormatOutput                                          # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Proto3.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                               # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                             # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                           # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                         # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                          # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.FloatFieldNoOctal                                                                  # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                            # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                          # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                                    # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                                  # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatField_F.ProtobufOutput                                                        # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatField_F.TextFormatOutput                                                      # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.NegDoubleFieldLargeNegativeExponentParsesAsNegZero.ProtobufOutput                  # Output was not equivalent to reference message: deleted: optional_double: -0
-Required.Proto3.TextFormatInput.NegDoubleFieldLargeNegativeExponentParsesAsNegZero.TextFormatOutput                # Output was not equivalent to reference message: deleted: optional_double: -0
-Required.Proto3.TextFormatInput.NegFloatFieldLargeNegativeExponentParsesAsNegZero.ProtobufOutput                   # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Proto3.TextFormatInput.NegFloatFieldLargeNegativeExponentParsesAsNegZero.TextFormatOutput                 # Output was not equivalent to reference message: deleted: optional_float: -0
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                                      # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                                    # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                                     # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                                   # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
+Required.*.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                              # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                                            # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                                             # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                                           # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                                        # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                                      # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeZero.ProtobufOutput                                                   # Output was not equivalent to reference message: deleted: optional_float: -0
+Required.*.TextFormatInput.FloatFieldNegativeZero.TextFormatOutput                                                 # Output was not equivalent to reference message: deleted: optional_float: -0
+Required.*.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                                 # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                               # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeZero_f.ProtobufOutput                                                 # Output was not equivalent to reference message: deleted: optional_float: -0
+Required.*.TextFormatInput.FloatFieldNegativeZero_f.TextFormatOutput                                               # Output was not equivalent to reference message: deleted: optional_float: -0
+Required.*.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                                    # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                                  # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                                # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                              # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoNegativeOctal                                                               # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.FloatFieldNoOctal                                                                       # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                                 # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                               # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                                        # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                                      # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                                         # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                                       # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatField_F.ProtobufOutput                                                             # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatField_F.TextFormatOutput                                                           # Failed to parse input or produce output.
+Required.*.TextFormatInput.NegDoubleFieldLargeNegativeExponentParsesAsNegZero.ProtobufOutput                       # Output was not equivalent to reference message: deleted: optional_double: -0
+Required.*.TextFormatInput.NegDoubleFieldLargeNegativeExponentParsesAsNegZero.TextFormatOutput                     # Output was not equivalent to reference message: deleted: optional_double: -0
+Required.*.TextFormatInput.NegFloatFieldLargeNegativeExponentParsesAsNegZero.ProtobufOutput                        # Output was not equivalent to reference message: deleted: optional_float: -0
+Required.*.TextFormatInput.NegFloatFieldLargeNegativeExponentParsesAsNegZero.TextFormatOutput                      # Output was not equivalent to reference message: deleted: optional_float: -0
+Required.*.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                                           # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
+Required.*.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                                         # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
+Required.*.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                                          # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
+Required.*.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                                        # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
 
 # Optional float interpreted as `inf`
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue.ProtobufOutput                                         # Output was not equivalent to reference message
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue.TextFormatOutput                                       # Output was not equivalent to reference message
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_f.ProtobufOutput                                       # Output was not equivalent to reference message
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_f.TextFormatOutput                                     # Output was not equivalent to reference message
-Required.Proto3.TextFormatInput.FloatFieldMaxValue.ProtobufOutput                                                  # Output was not equivalent to reference message
-Required.Proto3.TextFormatInput.FloatFieldMaxValue.TextFormatOutput                                                # Output was not equivalent to reference message
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_f.ProtobufOutput                                                # Output was not equivalent to reference message
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_f.TextFormatOutput                                              # Output was not equivalent to reference message
+Required.*.TextFormatInput.FloatFieldMaxValue.ProtobufOutput                                                       # Output was not equivalent to reference message
+Required.*.TextFormatInput.FloatFieldMaxValue.TextFormatOutput                                                     # Output was not equivalent to reference message
+Required.*.TextFormatInput.FloatFieldMaxValue_f.ProtobufOutput                                                     # Output was not equivalent to reference message
+Required.*.TextFormatInput.FloatFieldMaxValue_f.TextFormatOutput                                                   # Output was not equivalent to reference message
+

conformance/text_format_failure_list_python_cpp.txt

@@ -1,73 +1,36 @@
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                              # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                               # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                             # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                          # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                        # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                      # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                    # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                  # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                 # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoOctal                                                         # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                          # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                        # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                           # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                         # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatField_F.ProtobufOutput                                               # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatField_F.TextFormatOutput                                             # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                             # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                           # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                            # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                          # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                         # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                                       # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                                        # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                                      # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                            # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                          # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                               # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                             # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                           # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                         # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                          # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.FloatFieldNoOctal                                                                  # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                            # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                          # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                                    # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                                  # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatField_F.ProtobufOutput                                                        # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatField_F.TextFormatOutput                                                      # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                                      # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                                    # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                                     # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                                   # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-
+Required.*.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                              # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                                            # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                                             # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                                           # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                                        # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                                      # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                                 # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                               # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                                    # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                                  # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                                # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                              # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoNegativeOctal                                                               # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.FloatFieldNoOctal                                                                       # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                                 # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                               # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                                        # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                                      # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                                         # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                                       # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatField_F.ProtobufOutput                                                             # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatField_F.TextFormatOutput                                                           # Failed to parse input or produce output.
+Required.*.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                                           # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
+Required.*.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                                         # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
+Required.*.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                                          # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
+Required.*.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                                        # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\

conformance/text_format_failure_list_python_upb.txt

@@ -1,76 +1,39 @@
 # This is the list of text format conformance tests that are known to fail right
 # now.
 # TODO: These should be fixed.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                              # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                               # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                             # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                          # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                        # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                      # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                    # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                  # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                 # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.FloatFieldNoOctal                                                         # Should have failed to parse, but didn't.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                       # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                     # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                          # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                        # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                           # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                         # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatField_F.ProtobufOutput                                               # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.FloatField_F.TextFormatOutput                                             # Failed to parse input or produce output.
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                             # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                           # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                            # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Editions_Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                          # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                         # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                                       # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                                        # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                                      # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                            # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                          # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                               # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                             # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                           # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                         # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                          # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.FloatFieldNoOctal                                                                  # Should have failed to parse, but didn't.
-Required.Proto3.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                                # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                              # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                            # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                          # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                                   # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                                 # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                                    # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                                  # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatField_F.ProtobufOutput                                                        # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.FloatField_F.TextFormatOutput                                                      # Failed to parse input or produce output.
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                                      # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                                    # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                                     # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                                   # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
-
+Required.*.TextFormatInput.FloatFieldLargerThanInt64_F.ProtobufOutput                                              # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanInt64_F.TextFormatOutput                                            # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanUint64_F.ProtobufOutput                                             # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldLargerThanUint64_F.TextFormatOutput                                           # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMaxValue_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMaxValue_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMinValue_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldMinValue_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.ProtobufOutput                                        # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeNoLeadingZero_F.TextFormatOutput                                      # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeZero_F.ProtobufOutput                                                 # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegativeZero_F.TextFormatOutput                                               # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegative_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNegative_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.ProtobufOutput                                    # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZeroWithExponent_F.TextFormatOutput                                  # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZero_F.ProtobufOutput                                                # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoLeadingZero_F.TextFormatOutput                                              # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldNoNegativeOctal                                                               # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.FloatFieldNoOctal                                                                       # Should have failed to parse, but didn't.
+Required.*.TextFormatInput.FloatFieldTooLarge_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooLarge_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooSmall_F.ProtobufOutput                                                     # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldTooSmall_F.TextFormatOutput                                                   # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithInt32Max_F.ProtobufOutput                                                 # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithInt32Max_F.TextFormatOutput                                               # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.ProtobufOutput                                        # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldWithVeryPreciseNumber_F.TextFormatOutput                                      # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldZero_F.ProtobufOutput                                                         # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatFieldZero_F.TextFormatOutput                                                       # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatField_F.ProtobufOutput                                                             # Failed to parse input or produce output.
+Required.*.TextFormatInput.FloatField_F.TextFormatOutput                                                           # Failed to parse input or produce output.
+Required.*.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput                                           # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
+Required.*.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput                                         # Output was not equivalent to reference message: modified: optional_bytes: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\t
+Required.*.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput                                          # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\
+Required.*.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput                                        # Output was not equivalent to reference message: modified: optional_string: "\007\010\014\n\r\t\013?\\\'\"" -> "\007\010\014\n\r\

conformance/update_failure_list.py

@@ -53,7 +53,11 @@ with open(args.filename) as in_file:
   existing_list = in_file.read()
 
 with open(args.filename, 'w') as f:
-  for line in existing_list.splitlines(True):
+  split_lines = existing_list.splitlines(True)
+  # Make sure that we have one newline for potential tests that have to be
+  # added at the end.
+  split_lines[-1] = split_lines[-1].rstrip() + '\n'
+  for line in split_lines:
     test = line.split('#')[0].strip()
     # As long as the tests we are adding appear lexicographically before our
     # read test, put them first followed by our read test.

csharp/src/Google.Protobuf.Conformance/Conformance.pb.cs

@@ -25,34 +25,35 @@ namespace Conformance {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Ch1jb25mb3JtYW5jZS9jb25mb3JtYW5jZS5wcm90bxILY29uZm9ybWFuY2Ui",
-            "MwoKVGVzdFN0YXR1cxIMCgRuYW1lGAEgASgJEhcKD2ZhaWx1cmVfbWVzc2Fn",
-            "ZRgCIAEoCSI5CgpGYWlsdXJlU2V0EiUKBHRlc3QYAiADKAsyFy5jb25mb3Jt",
-            "YW5jZS5UZXN0U3RhdHVzSgQIARACIuMCChJDb25mb3JtYW5jZVJlcXVlc3QS",
-            "GgoQcHJvdG9idWZfcGF5bG9hZBgBIAEoDEgAEhYKDGpzb25fcGF5bG9hZBgC",
-            "IAEoCUgAEhYKDGpzcGJfcGF5bG9hZBgHIAEoCUgAEhYKDHRleHRfcGF5bG9h",
-            "ZBgIIAEoCUgAEjgKF3JlcXVlc3RlZF9vdXRwdXRfZm9ybWF0GAMgASgOMhcu",
-            "Y29uZm9ybWFuY2UuV2lyZUZvcm1hdBIUCgxtZXNzYWdlX3R5cGUYBCABKAkS",
-            "MAoNdGVzdF9jYXRlZ29yeRgFIAEoDjIZLmNvbmZvcm1hbmNlLlRlc3RDYXRl",
-            "Z29yeRI+ChVqc3BiX2VuY29kaW5nX29wdGlvbnMYBiABKAsyHy5jb25mb3Jt",
-            "YW5jZS5Kc3BiRW5jb2RpbmdDb25maWcSHAoUcHJpbnRfdW5rbm93bl9maWVs",
-            "ZHMYCSABKAhCCQoHcGF5bG9hZCL6AQoTQ29uZm9ybWFuY2VSZXNwb25zZRIV",
-            "CgtwYXJzZV9lcnJvchgBIAEoCUgAEhkKD3NlcmlhbGl6ZV9lcnJvchgGIAEo",
-            "CUgAEhcKDXRpbWVvdXRfZXJyb3IYCSABKAlIABIXCg1ydW50aW1lX2Vycm9y",
-            "GAIgASgJSAASGgoQcHJvdG9idWZfcGF5bG9hZBgDIAEoDEgAEhYKDGpzb25f",
-            "cGF5bG9hZBgEIAEoCUgAEhEKB3NraXBwZWQYBSABKAlIABIWCgxqc3BiX3Bh",
-            "eWxvYWQYByABKAlIABIWCgx0ZXh0X3BheWxvYWQYCCABKAlIAEIICgZyZXN1",
-            "bHQiNwoSSnNwYkVuY29kaW5nQ29uZmlnEiEKGXVzZV9qc3BiX2FycmF5X2Fu",
-            "eV9mb3JtYXQYASABKAgqUAoKV2lyZUZvcm1hdBIPCgtVTlNQRUNJRklFRBAA",
-            "EgwKCFBST1RPQlVGEAESCAoESlNPThACEggKBEpTUEIQAxIPCgtURVhUX0ZP",
-            "Uk1BVBAEKo8BCgxUZXN0Q2F0ZWdvcnkSFAoQVU5TUEVDSUZJRURfVEVTVBAA",
-            "Eg8KC0JJTkFSWV9URVNUEAESDQoJSlNPTl9URVNUEAISJAogSlNPTl9JR05P",
-            "UkVfVU5LTk9XTl9QQVJTSU5HX1RFU1QQAxINCglKU1BCX1RFU1QQBBIUChBU",
-            "RVhUX0ZPUk1BVF9URVNUEAVCLwofY29tLmdvb2dsZS5wcm90b2J1Zi5jb25m",
-            "b3JtYW5jZaICC0NvbmZvcm1hbmNlYgZwcm90bzM="));
+            "SQoKVGVzdFN0YXR1cxIMCgRuYW1lGAEgASgJEhcKD2ZhaWx1cmVfbWVzc2Fn",
+            "ZRgCIAEoCRIUCgxtYXRjaGVkX25hbWUYAyABKAkiOQoKRmFpbHVyZVNldBIl",
+            "CgR0ZXN0GAIgAygLMhcuY29uZm9ybWFuY2UuVGVzdFN0YXR1c0oECAEQAiLj",
+            "AgoSQ29uZm9ybWFuY2VSZXF1ZXN0EhoKEHByb3RvYnVmX3BheWxvYWQYASAB",
+            "KAxIABIWCgxqc29uX3BheWxvYWQYAiABKAlIABIWCgxqc3BiX3BheWxvYWQY",
+            "ByABKAlIABIWCgx0ZXh0X3BheWxvYWQYCCABKAlIABI4ChdyZXF1ZXN0ZWRf",
+            "b3V0cHV0X2Zvcm1hdBgDIAEoDjIXLmNvbmZvcm1hbmNlLldpcmVGb3JtYXQS",
+            "FAoMbWVzc2FnZV90eXBlGAQgASgJEjAKDXRlc3RfY2F0ZWdvcnkYBSABKA4y",
+            "GS5jb25mb3JtYW5jZS5UZXN0Q2F0ZWdvcnkSPgoVanNwYl9lbmNvZGluZ19v",
+            "cHRpb25zGAYgASgLMh8uY29uZm9ybWFuY2UuSnNwYkVuY29kaW5nQ29uZmln",
+            "EhwKFHByaW50X3Vua25vd25fZmllbGRzGAkgASgIQgkKB3BheWxvYWQi+gEK",
+            "E0NvbmZvcm1hbmNlUmVzcG9uc2USFQoLcGFyc2VfZXJyb3IYASABKAlIABIZ",
+            "Cg9zZXJpYWxpemVfZXJyb3IYBiABKAlIABIXCg10aW1lb3V0X2Vycm9yGAkg",
+            "ASgJSAASFwoNcnVudGltZV9lcnJvchgCIAEoCUgAEhoKEHByb3RvYnVmX3Bh",
+            "eWxvYWQYAyABKAxIABIWCgxqc29uX3BheWxvYWQYBCABKAlIABIRCgdza2lw",
+            "cGVkGAUgASgJSAASFgoManNwYl9wYXlsb2FkGAcgASgJSAASFgoMdGV4dF9w",
+            "YXlsb2FkGAggASgJSABCCAoGcmVzdWx0IjcKEkpzcGJFbmNvZGluZ0NvbmZp",
+            "ZxIhChl1c2VfanNwYl9hcnJheV9hbnlfZm9ybWF0GAEgASgIKlAKCldpcmVG",
+            "b3JtYXQSDwoLVU5TUEVDSUZJRUQQABIMCghQUk9UT0JVRhABEggKBEpTT04Q",
+            "AhIICgRKU1BCEAMSDwoLVEVYVF9GT1JNQVQQBCqPAQoMVGVzdENhdGVnb3J5",
+            "EhQKEFVOU1BFQ0lGSUVEX1RFU1QQABIPCgtCSU5BUllfVEVTVBABEg0KCUpT",
+            "T05fVEVTVBACEiQKIEpTT05fSUdOT1JFX1VOS05PV05fUEFSU0lOR19URVNU",
+            "EAMSDQoJSlNQQl9URVNUEAQSFAoQVEVYVF9GT1JNQVRfVEVTVBAFQi8KH2Nv",
+            "bS5nb29nbGUucHJvdG9idWYuY29uZm9ybWFuY2WiAgtDb25mb3JtYW5jZWIG",
+            "cHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Conformance.WireFormat), typeof(global::Conformance.TestCategory), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.TestStatus), global::Conformance.TestStatus.Parser, new[]{ "Name", "FailureMessage" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.TestStatus), global::Conformance.TestStatus.Parser, new[]{ "Name", "FailureMessage", "MatchedName" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.FailureSet), global::Conformance.FailureSet.Parser, new[]{ "Test" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.ConformanceRequest), global::Conformance.ConformanceRequest.Parser, new[]{ "ProtobufPayload", "JsonPayload", "JspbPayload", "TextPayload", "RequestedOutputFormat", "MessageType", "TestCategory", "JspbEncodingOptions", "PrintUnknownFields" }, new[]{ "Payload" }, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.ConformanceResponse), global::Conformance.ConformanceResponse.Parser, new[]{ "ParseError", "SerializeError", "TimeoutError", "RuntimeError", "ProtobufPayload", "JsonPayload", "Skipped", "JspbPayload", "TextPayload" }, new[]{ "Result" }, null, null, null),
@@ -149,6 +150,7 @@ namespace Conformance {
     public TestStatus(TestStatus other) : this() {
       name_ = other.name_;
       failureMessage_ = other.failureMessage_;
+      matchedName_ = other.matchedName_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
@@ -182,6 +184,22 @@ namespace Conformance {
       }
     }
 
+    /// <summary>Field number for the "matched_name" field.</summary>
+    public const int MatchedNameFieldNumber = 3;
+    private string matchedName_ = "";
+    /// <summary>
+    /// What an actual test name matched to in a failure list. Can be wildcarded or
+    /// an exact match without wildcards.
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public string MatchedName {
+      get { return matchedName_; }
+      set {
+        matchedName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
     public override bool Equals(object other) {
@@ -199,6 +217,7 @@ namespace Conformance {
       }
       if (Name != other.Name) return false;
       if (FailureMessage != other.FailureMessage) return false;
+      if (MatchedName != other.MatchedName) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
@@ -208,6 +227,7 @@ namespace Conformance {
       int hash = 1;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       if (FailureMessage.Length != 0) hash ^= FailureMessage.GetHashCode();
+      if (MatchedName.Length != 0) hash ^= MatchedName.GetHashCode();
       if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
@@ -234,6 +254,10 @@ namespace Conformance {
         output.WriteRawTag(18);
         output.WriteString(FailureMessage);
       }
+      if (MatchedName.Length != 0) {
+        output.WriteRawTag(26);
+        output.WriteString(MatchedName);
+      }
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
@@ -252,6 +276,10 @@ namespace Conformance {
         output.WriteRawTag(18);
         output.WriteString(FailureMessage);
       }
+      if (MatchedName.Length != 0) {
+        output.WriteRawTag(26);
+        output.WriteString(MatchedName);
+      }
       if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
@@ -268,6 +296,9 @@ namespace Conformance {
       if (FailureMessage.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(FailureMessage);
       }
+      if (MatchedName.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(MatchedName);
+      }
       if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
@@ -286,6 +317,9 @@ namespace Conformance {
       if (other.FailureMessage.Length != 0) {
         FailureMessage = other.FailureMessage;
       }
+      if (other.MatchedName.Length != 0) {
+        MatchedName = other.MatchedName;
+      }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
     }
 
@@ -313,6 +347,10 @@ namespace Conformance {
             FailureMessage = input.ReadString();
             break;
           }
+          case 26: {
+            MatchedName = input.ReadString();
+            break;
+          }
         }
       }
     #endif
@@ -340,6 +378,10 @@ namespace Conformance {
             FailureMessage = input.ReadString();
             break;
           }
+          case 26: {
+            MatchedName = input.ReadString();
+            break;
+          }
         }
       }
     }

editions/golden/compare_cpp_codegen_failure.xml

@@ -2,10 +2,10 @@
 <testsuites tests="1" name="AllTests">
 <testsuite name="EditionsCodegenTests">
 <testcase name="third_party/protobuf/editions/golden/simple_proto3.pb.cc" status="run" result="completed" classname="DiffTest">
-<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.cc&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// NO CHECKED-IN PROTOBUF GENCODE&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;// Protobuf C++ Version: 0.20240809.0&#x0A;&#x0A;#include &quot;third_party/protobuf/editions/golden/simple_proto3.pb.h&quot;&#x0A;&#x0A;#include &lt;algorithm&gt;&#x0A;#include &lt;type_traits&gt;&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_impl.h&quot;&#x0A;#include &quot;third_party/protobuf/extension_set.h&quot;&#x0A;#include &quot;third_party/protobuf/wire_format_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/io/zero_copy_stream_impl_lite.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;, with the difference:&#x0A;@@ @@&#x0A;     ::_pbi::TcParser::GetTable&lt;::protobuf_editions_test::golden::SimpleProto3&gt;(),  // to_prefetch&#x0A;     #endif  // PROTOBUF_PREFETCH_PARSE_TABLE&#x0A;   }, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1;&#x0A;     {::_pbi::TcParser::FastV32S1,&#x0A;      {8, 0, 0, PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_)}},&#x0A;   }}, {{&#x0A;     65535, 65535&#x0A;   }}, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1;&#x0A;     {PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_), _Internal::kHasBitsOffset + 0, 0,&#x0A;     (0 | ::_fl::kFcOptional | ::_fl::kInt32)},&#x0A;   }},&#x0A;@@ @@&#x0A;           (void)cached_has_bits;&#x0A; &#x0A;           cached_has_bits = this_._impl_._has_bits_[0];&#x0A;-          // optional int32 int32_field = 1;&#x0A;+          // int32 int32_field = 1;&#x0A;           if (cached_has_bits &amp; 0x00000001u) {&#x0A;             target = ::proto2::internal::WireFormatLite::&#x0A;                 WriteInt32ToArrayWithField&lt;1&gt;(&#x0A;@@ @@&#x0A;           (void)cached_has_bits;&#x0A; &#x0A;            {&#x0A;-            // optional int32 int32_field = 1;&#x0A;+            // int32 int32_field = 1;&#x0A;             cached_has_bits = this_._impl_._has_bits_[0];&#x0A;             if (cached_has_bits &amp; 0x00000001u) {&#x0A;               total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(" type=""></failure>
+<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.cc&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// NO CHECKED-IN PROTOBUF GENCODE&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;// Protobuf C++ Version: 0.20240819.0&#x0A;&#x0A;#include &quot;third_party/protobuf/editions/golden/simple_proto3.pb.h&quot;&#x0A;&#x0A;#include &lt;algorithm&gt;&#x0A;#include &lt;type_traits&gt;&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_impl.h&quot;&#x0A;#include &quot;third_party/protobuf/extension_set.h&quot;&#x0A;#include &quot;third_party/protobuf/wire_format_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/io/zero_copy_stream_impl_lite.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;, with the difference:&#x0A;@@ @@&#x0A;     ::_pbi::TcParser::GetTable&lt;::protobuf_editions_test::golden::SimpleProto3&gt;(),  // to_prefetch&#x0A;     #endif  // PROTOBUF_PREFETCH_PARSE_TABLE&#x0A;   }, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1;&#x0A;     {::_pbi::TcParser::FastV32S1,&#x0A;      {8, 0, 0, PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_)}},&#x0A;   }}, {{&#x0A;     65535, 65535&#x0A;   }}, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1;&#x0A;     {PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_), _Internal::kHasBitsOffset + 0, 0,&#x0A;     (0 | ::_fl::kFcOptional | ::_fl::kInt32)},&#x0A;   }},&#x0A;@@ @@&#x0A;           (void)cached_has_bits;&#x0A; &#x0A;           cached_has_bits = this_._impl_._has_bits_[0];&#x0A;-          // optional int32 int32_field = 1;&#x0A;+          // int32 int32_field = 1;&#x0A;           if (cached_has_bits &amp; 0x00000001u) {&#x0A;             target = ::proto2::internal::WireFormatLite::&#x0A;                 WriteInt32ToArrayWithField&lt;1&gt;(&#x0A;@@ @@&#x0A;           (void)cached_has_bits;&#x0A; &#x0A;            {&#x0A;-            // optional int32 int32_field = 1;&#x0A;+            // int32 int32_field = 1;&#x0A;             cached_has_bits = this_._impl_._has_bits_[0];&#x0A;             if (cached_has_bits &amp; 0x00000001u) {&#x0A;               total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(" type=""></failure>
 </testcase>
 <testcase name="third_party/protobuf/editions/golden/simple_proto3.pb.h" status="run" result="completed" classname="DiffTest">
-<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.h&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// NO CHECKED-IN PROTOBUF GENCODE&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;// Protobuf C++ Version: 0.20240809.0&#x0A;&#x0A;#ifndef GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;#define GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;&#x0A;#include &lt;limits&gt;&#x0A;#include &lt;string&gt;&#x0A;#include &lt;type_traits&gt;&#x0A;#include &lt;utility&gt;&#x0A;&#x0A;#include &quot;third_party/protobuf/runtime_version.h&quot;&#x0A;#if PROTOBUF_VERSION != 20240809&#x0A;#error &quot;Protobuf C++ gencode is built with an incompatible version of&quot;&#x0A;#error &quot;Protobuf C++ headers/runtime. See&quot;&#x0A;#error &quot;https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp&quot;&#x0A;#endif&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/arena.h&quot;&#x0A;#include &quot;third_party/protobuf/arenastring.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_decl.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_util.h&quot;&#x0A;#include &quot;third_party/protobuf/metadata_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/message_lite.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;&#x0A;#endif  // GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;, with the difference:&#x0A;@@ @@&#x0A;   enum : int {&#x0A;     kInt32FieldFieldNumber = 1,&#x0A;   };&#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1;&#x0A;   bool has_int32_field() const;&#x0A;   void clear_int32_field() ;&#x0A;   ::int32_t int32_field() const;&#x0A;@@ @@&#x0A; &#x0A; // SimpleProto3&#x0A; &#x0A;-// optional int32 int32_field = 1;&#x0A;+// int32 int32_field = 1;&#x0A; inline bool SimpleProto3::has_int32_field() const {&#x0A;   bool value = (_impl_._has_bits_[0] &amp; 0x00000001u) != 0;&#x0A;   return value;" type=""></failure>
+<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.h&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// NO CHECKED-IN PROTOBUF GENCODE&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;// Protobuf C++ Version: 0.20240819.0&#x0A;&#x0A;#ifndef GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;#define GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;&#x0A;#include &lt;limits&gt;&#x0A;#include &lt;string&gt;&#x0A;#include &lt;type_traits&gt;&#x0A;#include &lt;utility&gt;&#x0A;&#x0A;#include &quot;third_party/protobuf/runtime_version.h&quot;&#x0A;#if PROTOBUF_VERSION != 20240819&#x0A;#error &quot;Protobuf C++ gencode is built with an incompatible version of&quot;&#x0A;#error &quot;Protobuf C++ headers/runtime. See&quot;&#x0A;#error &quot;https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp&quot;&#x0A;#endif&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/arena.h&quot;&#x0A;#include &quot;third_party/protobuf/arenastring.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_decl.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_util.h&quot;&#x0A;#include &quot;third_party/protobuf/metadata_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/message_lite.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;&#x0A;#endif  // GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;, with the difference:&#x0A;@@ @@&#x0A;   enum : int {&#x0A;     kInt32FieldFieldNumber = 1,&#x0A;   };&#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1;&#x0A;   bool has_int32_field() const;&#x0A;   void clear_int32_field() ;&#x0A;   ::int32_t int32_field() const;&#x0A;@@ @@&#x0A; &#x0A; // SimpleProto3&#x0A; &#x0A;-// optional int32 int32_field = 1;&#x0A;+// int32 int32_field = 1;&#x0A; inline bool SimpleProto3::has_int32_field() const {&#x0A;   bool value = (_impl_._has_bits_[0] &amp; 0x00000001u) != 0;&#x0A;   return value;" type=""></failure>
 </testcase>
 <testcase name="third_party/protobuf/editions/golden/simple_proto3.proto.static_reflection.h" status="run" result="completed" classname="DiffTest">
 </testcase>

hpb/BUILD

@@ -54,6 +54,9 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":extension_lock",
+        "//hpb:ptr",
+        "//hpb/internal",
+        "//hpb/internal:template_help",
         "//upb:base",
         "//upb:mem",
         "//upb:message",
@@ -77,8 +80,6 @@ cc_library(
     ],
     compatible_with = ["//buildenv/target:non_prod"],
     copts = UPB_DEFAULT_CPPOPTS,
-    # TODO: update visibility back to private once upb/protos gets removed
-    visibility = ["//protos:__subpackages__"],
 )
 
 cc_library(
@@ -116,13 +117,13 @@ cc_library(
 
 # Common support code for C++ generated code.
 cc_library(
-    name = "generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+    name = "generated_hpb_support",
     hdrs = [
         "internal.h",
     ],
     compatible_with = ["//buildenv/target:non_prod"],
     copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
+    visibility = ["//hpb/bazel:__pkg__"],
     deps = [
         ":hpb",
         ":internal",
@@ -147,9 +148,9 @@ cc_test(
 )
 
 upb_cc_proto_library_copts(
-    name = "upb_cc_proto_library_copts__for_generated_code_only_do_not_use",
+    name = "upb_cc_proto_library_copts",
     copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
+    visibility = ["//hpb/bazel:__pkg__"],
 )
 
 cc_test(
@@ -185,3 +186,10 @@ cc_library(
     hdrs = ["requires.h"],
     visibility = ["//visibility:public"],
 )
+
+cc_library(
+    name = "ptr",
+    hdrs = ["ptr.h"],
+    compatible_with = ["//buildenv/target:non_prod"],
+    visibility = ["//visibility:public"],
+)

hpb/bazel/upb_cc_proto_library.bzl

@@ -235,7 +235,7 @@ def _upb_cc_proto_library_aspect_impl(target, ctx):
 _upb_cc_proto_library_aspect = aspect(
     attrs = {
         "_ccopts": attr.label(
-            default = "//hpb:upb_cc_proto_library_copts__for_generated_code_only_do_not_use",
+            default = "//hpb:upb_cc_proto_library_copts",
         ),
         "_gen_upbprotos": attr.label(
             executable = True,
@@ -254,11 +254,11 @@ _upb_cc_proto_library_aspect = aspect(
             default = [
                 # TODO: Add dependencies for cc runtime (absl/string etc..)
                 "//upb:generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-                "//protos:generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+                "//hpb:generated_hpb_support",
                 "@com_google_absl//absl/strings",
                 "@com_google_absl//absl/status:statusor",
+                "//hpb:repeated_field",
                 "//protos",
-                "//protos:repeated_field",
             ],
         ),
     },
@@ -287,7 +287,7 @@ upb_cc_proto_library = rule(
             providers = [ProtoInfo],
         ),
         "_ccopts": attr.label(
-            default = "//protos:upb_cc_proto_library_copts__for_generated_code_only_do_not_use",
+            default = "//hpb:upb_cc_proto_library_copts",
         ),
     },
 )

hpb/hpb.h

@@ -15,6 +15,9 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
+#include "google/protobuf/hpb/internal/internal.h"
+#include "google/protobuf/hpb/internal/template_help.h"
+#include "google/protobuf/hpb/ptr.h"
 #include "upb/base/status.hpp"
 #include "upb/mem/arena.hpp"
 #include "upb/message/copy.h"
@@ -26,63 +29,6 @@ namespace hpb {
 class ExtensionRegistry;
 using Arena = ::upb::Arena;
 
-template <typename T>
-using Proxy = std::conditional_t<std::is_const<T>::value,
-                                 typename std::remove_const_t<T>::CProxy,
-                                 typename T::Proxy>;
-
-// Provides convenient access to Proxy and CProxy message types.
-//
-// Using rebinding and handling of const, Ptr<Message> and Ptr<const Message>
-// allows copying const with T* const and avoids using non-copyable Proxy types
-// directly.
-template <typename T>
-class Ptr final {
- public:
-  Ptr() = delete;
-
-  // Implicit conversions
-  Ptr(T* m) : p_(m) {}                // NOLINT
-  Ptr(const Proxy<T>* p) : p_(*p) {}  // NOLINT
-  Ptr(Proxy<T> p) : p_(p) {}          // NOLINT
-  Ptr(const Ptr& m) = default;
-
-  Ptr& operator=(Ptr v) & {
-    Proxy<T>::Rebind(p_, v.p_);
-    return *this;
-  }
-
-  Proxy<T> operator*() const { return p_; }
-  Proxy<T>* operator->() const {
-    return const_cast<Proxy<T>*>(std::addressof(p_));
-  }
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wclass-conversion"
-#endif
-  template <typename U = T, std::enable_if_t<!std::is_const<U>::value, int> = 0>
-  operator Ptr<const T>() const {
-    Proxy<const T> p(p_);
-    return Ptr<const T>(&p);
-  }
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
- private:
-  Ptr(upb_Message* msg, upb_Arena* arena) : p_(msg, arena) {}  // NOLINT
-
-  friend class Ptr<const T>;
-  friend typename T::Access;
-
-  Proxy<T> p_;
-};
-
-// Suppress -Wctad-maybe-unsupported with our manual deduction guide
-template <typename T>
-Ptr(T* m) -> Ptr<T>;
-
 // TODO: b/354766950 - Move upb-specific chunks out of hpb header
 inline absl::string_view UpbStrToStringView(upb_StringView str) {
   return absl::string_view(str.data, str.size);
@@ -124,78 +70,6 @@ absl::Status MessageEncodeError(upb_EncodeStatus status,
                                 SourceLocation loc = SourceLocation::current());
 
 namespace internal {
-template <typename T>
-struct RemovePtr;
-
-template <typename T>
-struct RemovePtr<Ptr<T>> {
-  using type = T;
-};
-
-template <typename T>
-struct RemovePtr<T*> {
-  using type = T;
-};
-
-template <typename T>
-using RemovePtrT = typename RemovePtr<T>::type;
-
-template <typename T, typename U = RemovePtrT<T>,
-          typename = std::enable_if_t<!std::is_const_v<U>>>
-using PtrOrRaw = T;
-
-template <typename T>
-using EnableIfHpbClass = std::enable_if_t<
-    std::is_base_of<typename T::Access, T>::value &&
-    std::is_base_of<typename T::Access, typename T::ExtendableType>::value>;
-
-template <typename T>
-using EnableIfMutableProto = std::enable_if_t<!std::is_const<T>::value>;
-
-struct PrivateAccess {
-  template <typename T>
-  static auto* GetInternalMsg(T&& message) {
-    return message->msg();
-  }
-  template <typename T>
-  static auto Proxy(upb_Message* p, upb_Arena* arena) {
-    return typename T::Proxy(p, arena);
-  }
-  template <typename T>
-  static auto CProxy(const upb_Message* p, upb_Arena* arena) {
-    return typename T::CProxy(p, arena);
-  }
-  template <typename T>
-  static auto CreateMessage(upb_Arena* arena) {
-    return typename T::Proxy(upb_Message_New(T::minitable(), arena), arena);
-  }
-
-  template <typename ExtensionId>
-  static constexpr uint32_t GetExtensionNumber(const ExtensionId& id) {
-    return id.number();
-  }
-};
-
-template <typename T>
-auto* GetInternalMsg(T&& message) {
-  return PrivateAccess::GetInternalMsg(std::forward<T>(message));
-}
-
-template <typename T>
-T CreateMessage() {
-  return T();
-}
-
-template <typename T>
-typename T::Proxy CreateMessageProxy(upb_Message* msg, upb_Arena* arena) {
-  return typename T::Proxy(msg, arena);
-}
-
-template <typename T>
-typename T::CProxy CreateMessage(const upb_Message* msg, upb_Arena* arena) {
-  return PrivateAccess::CProxy<T>(msg, arena);
-}
-
 class ExtensionMiniTableProvider {
  public:
   constexpr explicit ExtensionMiniTableProvider(

hpb/internal/BUILD

@@ -0,0 +1,31 @@
+# Copyright (c) 2024, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+# begin:google_only
+# package(default_applicable_licenses = ["//src/google/protobuf:license"])
+# end:google_only
+
+cc_library(
+    name = "template_help",
+    hdrs = ["template_help.h"],
+    compatible_with = ["//buildenv/target:non_prod"],
+    visibility = ["//hpb:__subpackages__"],
+    deps = [
+        "//hpb:ptr",
+    ],
+)
+
+cc_library(
+    name = "internal",
+    hdrs = ["internal.h"],
+    compatible_with = ["//buildenv/target:non_prod"],
+    visibility = ["//hpb:__subpackages__"],
+    deps = [
+        "//upb:mem",
+        "//upb:message",
+    ],
+)

hpb/internal/internal.h

@@ -0,0 +1,53 @@
+#ifndef GOOGLE_PROTOBUF_HPB_INTERNAL_INTERNAL_H__
+#define GOOGLE_PROTOBUF_HPB_INTERNAL_INTERNAL_H__
+
+#include <cstdint>
+#include <utility>
+
+#include "upb/mem/arena.h"
+#include "upb/message/message.h"
+
+namespace hpb::internal {
+
+struct PrivateAccess {
+  template <typename T>
+  static auto* GetInternalMsg(T&& message) {
+    return message->msg();
+  }
+  template <typename T>
+  static auto Proxy(upb_Message* p, upb_Arena* arena) {
+    return typename T::Proxy(p, arena);
+  }
+  template <typename T>
+  static auto CProxy(const upb_Message* p, upb_Arena* arena) {
+    return typename T::CProxy(p, arena);
+  }
+  template <typename T>
+  static auto CreateMessage(upb_Arena* arena) {
+    return typename T::Proxy(upb_Message_New(T::minitable(), arena), arena);
+  }
+
+  template <typename ExtensionId>
+  static constexpr uint32_t GetExtensionNumber(const ExtensionId& id) {
+    return id.number();
+  }
+};
+
+template <typename T>
+auto* GetInternalMsg(T&& message) {
+  return PrivateAccess::GetInternalMsg(std::forward<T>(message));
+}
+
+template <typename T>
+typename T::Proxy CreateMessageProxy(upb_Message* msg, upb_Arena* arena) {
+  return typename T::Proxy(msg, arena);
+}
+
+template <typename T>
+typename T::CProxy CreateMessage(const upb_Message* msg, upb_Arena* arena) {
+  return PrivateAccess::CProxy<T>(msg, arena);
+}
+
+}  // namespace hpb::internal
+
+#endif  // GOOGLE_PROTOBUF_HPB_INTERNAL_INTERNAL_H__

hpb/internal/template_help.h

@@ -0,0 +1,49 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2024 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef GOOGLE_PROTOBUF_HPB_TEMPLATE_HELP_H__
+#define GOOGLE_PROTOBUF_HPB_TEMPLATE_HELP_H__
+
+#include <type_traits>
+
+#include "google/protobuf/hpb/ptr.h"
+
+namespace hpb {
+namespace internal {
+
+template <typename T>
+struct RemovePtr;
+
+template <typename T>
+struct RemovePtr<Ptr<T>> {
+  using type = T;
+};
+
+template <typename T>
+struct RemovePtr<T*> {
+  using type = T;
+};
+
+template <typename T>
+using RemovePtrT = typename RemovePtr<T>::type;
+
+template <typename T, typename U = RemovePtrT<T>,
+          typename = std::enable_if_t<!std::is_const_v<U>>>
+using PtrOrRaw = T;
+
+template <typename T>
+using EnableIfHpbClass = std::enable_if_t<
+    std::is_base_of<typename T::Access, T>::value &&
+    std::is_base_of<typename T::Access, typename T::ExtendableType>::value>;
+
+template <typename T>
+using EnableIfMutableProto = std::enable_if_t<!std::is_const<T>::value>;
+
+}  // namespace internal
+}  // namespace hpb
+
+#endif  // GOOGLE_PROTOBUF_HPB_TEMPLATE_HELP_H__

hpb/ptr.h

@@ -0,0 +1,78 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2024 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef GOOGLE_PROTOBUF_HPB_PTR_H__
+#define GOOGLE_PROTOBUF_HPB_PTR_H__
+
+#include <memory>
+#include <type_traits>
+
+class upb_Message;
+class upb_Arena;
+
+namespace hpb {
+
+template <typename T>
+using Proxy = std::conditional_t<std::is_const<T>::value,
+                                 typename std::remove_const_t<T>::CProxy,
+                                 typename T::Proxy>;
+
+// Provides convenient access to Proxy and CProxy message types.
+//
+// Using rebinding and handling of const, Ptr<Message> and Ptr<const Message>
+// allows copying const with T* const and avoids using non-copyable Proxy types
+// directly.
+template <typename T>
+class Ptr final {
+ public:
+  Ptr() = delete;
+
+  // Implicit conversions
+  Ptr(T* m) : p_(m) {}                // NOLINT
+  Ptr(const Proxy<T>* p) : p_(*p) {}  // NOLINT
+  Ptr(Proxy<T> p) : p_(p) {}          // NOLINT
+  Ptr(const Ptr& m) = default;
+
+  Ptr& operator=(Ptr v) & {
+    Proxy<T>::Rebind(p_, v.p_);
+    return *this;
+  }
+
+  Proxy<T> operator*() const { return p_; }
+  Proxy<T>* operator->() const {
+    return const_cast<Proxy<T>*>(std::addressof(p_));
+  }
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wclass-conversion"
+#endif
+  template <typename U = T, std::enable_if_t<!std::is_const<U>::value, int> = 0>
+  operator Ptr<const T>() const {
+    Proxy<const T> p(p_);
+    return Ptr<const T>(&p);
+  }
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+ private:
+  Ptr(upb_Message* msg, upb_Arena* arena) : p_(msg, arena) {}  // NOLINT
+
+  friend class Ptr<const T>;
+  friend typename T::Access;
+
+  Proxy<T> p_;
+};
+
+// Suppress -Wctad-maybe-unsupported with our manual deduction guide
+template <typename T>
+Ptr(T* m) -> Ptr<T>;
+
+}  // namespace hpb
+
+#endif  // GOOGLE_PROTOBUF_HPB_PTR_H__

hpb_generator/protoc-gen-upb-protos.cc

@@ -13,14 +13,14 @@
 
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/compiler/plugin.h"
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/compiler/hpb/gen_enums.h"
 #include "google/protobuf/compiler/hpb/gen_extensions.h"
 #include "google/protobuf/compiler/hpb/gen_messages.h"
 #include "google/protobuf/compiler/hpb/gen_utils.h"
 #include "google/protobuf/compiler/hpb/names.h"
 #include "google/protobuf/compiler/hpb/output.h"
+#include "google/protobuf/compiler/plugin.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google::protobuf::hpb_generator {
 namespace {
@@ -131,12 +131,13 @@ void WriteHeader(const protobuf::FileDescriptor* file, Output& output,
   EmitFileWarning(file, output);
   output(
       R"cc(
-#ifndef $0_UPB_PROTO_H_
-#define $0_UPB_PROTO_H_
+#ifndef $0_HPB_PROTO_H_
+#define $0_HPB_PROTO_H_
+
+#include "google/protobuf/hpb/internal.h"
+#include "google/protobuf/hpb/repeated_field.h"
 
 #include "protos/protos.h"
-#include "protos/protos_internal.h"
-#include "protos/repeated_field.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/status/statusor.h"
@@ -189,7 +190,7 @@ void WriteHeader(const protobuf::FileDescriptor* file, Output& output,
   output("\n#include \"upb/port/undef.inc\"\n\n");
   // End of "C" section.
 
-  output("#endif  /* $0_UPB_PROTO_H_ */\n", ToPreproc(file->name()));
+  output("#endif  /* $0_HPB_PROTO_H_ */\n", ToPreproc(file->name()));
 }
 
 // Writes a .upb.cc source file.

java/core/src/main/java/com/google/protobuf/CodedInputStream.java

@@ -224,13 +224,35 @@ public abstract class CodedInputStream {
    * Reads and discards an entire message. This will read either until EOF or until an endgroup tag,
    * whichever comes first.
    */
-  public abstract void skipMessage() throws IOException;
+  public void skipMessage() throws IOException {
+    while (true) {
+      final int tag = readTag();
+      if (tag == 0) {
+        return;
+      }
+      boolean fieldSkipped = skipField(tag);
+      if (!fieldSkipped) {
+        return;
+      }
+    }
+  }
 
   /**
    * Reads an entire message and writes it to output in wire format. This will read either until EOF
    * or until an endgroup tag, whichever comes first.
    */
-  public abstract void skipMessage(CodedOutputStream output) throws IOException;
+  public void skipMessage(CodedOutputStream output) throws IOException {
+    while (true) {
+      final int tag = readTag();
+      if (tag == 0) {
+        return;
+      }
+      boolean fieldSkipped = skipField(tag, output);
+      if (!fieldSkipped) {
+        return;
+      }
+    }
+  }
 
   // -----------------------------------------------------------------
 
@@ -700,26 +722,6 @@ public abstract class CodedInputStream {
       }
     }
 
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
     // -----------------------------------------------------------------
 
     @Override
@@ -1412,26 +1414,6 @@ public abstract class CodedInputStream {
       }
     }
 
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
     // -----------------------------------------------------------------
 
     @Override
@@ -2178,26 +2160,6 @@ public abstract class CodedInputStream {
       }
     }
 
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
     /** Collects the bytes skipped and returns the data in a ByteBuffer. */
     private class SkippedDataSink implements RefillCallback {
       private int lastPos = pos;
@@ -3325,26 +3287,6 @@ public abstract class CodedInputStream {
       }
     }
 
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
     // -----------------------------------------------------------------
 
     @Override

java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java

@@ -104,7 +104,7 @@ public class ExtensionRegistryLite {
       synchronized (ExtensionRegistryLite.class) {
         result = emptyRegistry;
         if (result == null) {
-          result = emptyRegistry = ExtensionRegistryFactory.createEmpty();
+          emptyRegistry = result = ExtensionRegistryFactory.createEmpty();
         }
       }
     }

java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java

@@ -360,8 +360,8 @@ public abstract class GeneratedMessageLite<
     return dynamicMethod(MethodToInvoke.BUILD_MESSAGE_INFO);
   }
 
-  private static Map<Object, GeneratedMessageLite<?, ?>> defaultInstanceMap =
-      new ConcurrentHashMap<Object, GeneratedMessageLite<?, ?>>();
+  private static Map<Class<?>, GeneratedMessageLite<?, ?>> defaultInstanceMap =
+      new ConcurrentHashMap<>();
 
   @SuppressWarnings("unchecked")
   static <T extends GeneratedMessageLite<?, ?>> T getDefaultInstance(Class<T> clazz) {

java/core/src/main/java/com/google/protobuf/SmallSortedMap.java

@@ -106,7 +106,7 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
   private boolean isImmutable;
   // The EntrySet is a stateless view of the Map. It's initialized the first
   // time it is requested and reused henceforth.
-  private EntrySet lazyEntrySet;
+  private volatile EntrySet lazyEntrySet;
   private Map<K, V> overflowEntriesDescending;
 
   private SmallSortedMap() {

java/core/src/main/resources/google/protobuf/java_features.proto

@@ -30,10 +30,10 @@ message JavaFeatures {
     feature_support = {
       edition_introduced: EDITION_2023,
       edition_deprecated: EDITION_2023,
-      deprecation_warning: "The legacy closed enum treatment in Java is "
+      deprecation_warning: "The legacy closed enum behavior in Java is "
                            "deprecated and is scheduled to be removed in "
-                           "edition 2025.  Mark enum type on the enum "
-                           "definitions themselves rather than on fields.",
+                           "edition 2025.  See http://protobuf.dev/programming-guides/enum/#java for "
+                           "more information.",
     },
     edition_defaults = { edition: EDITION_LEGACY, value: "true" },
     edition_defaults = { edition: EDITION_PROTO3, value: "false" }

java/core/src/test/proto/com/google/protobuf/map_lite_test.proto

@@ -115,4 +115,5 @@ message ReservedAsMapFieldWithEnumValue {
 // https://github.com/protocolbuffers/protobuf/issues/9785
 message MapContainer {
   map<string, string> my_map = 1;
+  map<uint32, string> m = 3;
 }

java/core/src/test/proto/com/google/protobuf/map_test.proto

@@ -114,4 +114,5 @@ message ReservedAsMapFieldWithEnumValue {
 // https://github.com/protocolbuffers/protobuf/issues/9785
 message MapContainer {
   map<string, string> my_map = 1;
+  map<uint32, string> m = 3;
 }

java/lite/src/test/java/com/google/protobuf/LiteTest.java

@@ -31,6 +31,7 @@ import com.google.protobuf.UnittestLite.TestAllTypesLiteOrBuilder;
 import com.google.protobuf.UnittestLite.TestHugeFieldNumbersLite;
 import com.google.protobuf.UnittestLite.TestNestedExtensionLite;
 import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLite;
+import map_lite_test.MapTestProto.MapContainer;
 import map_lite_test.MapTestProto.TestMap;
 import map_lite_test.MapTestProto.TestMap.MessageValue;
 import protobuf_unittest.NestedExtensionLite;

objectivec/GPBUnknownField.m

@@ -165,9 +165,17 @@
     case GPBUnknownFieldTypeFixed32:
     case GPBUnknownFieldTypeFixed64:
     case GPBUnknownFieldTypeLengthDelimited:
-    case GPBUnknownFieldTypeGroup:
       // In these modes, the object isn't mutable, so just return self.
       return [self retain];
+    case GPBUnknownFieldTypeGroup: {
+      // The `GPBUnknownFields` for the group is mutable, so a new instance of this object and
+      // the group is needed.
+      GPBUnknownFields *copyGroup = [storage_.group copyWithZone:zone];
+      GPBUnknownField *copy = [[GPBUnknownField allocWithZone:zone] initWithNumber:number_
+                                                                             group:copyGroup];
+      [copyGroup release];
+      return copy;
+    }
     case GPBUnknownFieldTypeLegacy: {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"

objectivec/GPBUnknownFields.h

@@ -109,6 +109,23 @@ __attribute__((objc_subclassing_restricted))
  **/
 - (nonnull GPBUnknownFields *)addGroupWithFieldNumber:(int32_t)fieldNumber;
 
+/**
+ * Add the copy of the given unknown field.
+ *
+ * This can be useful from processing one `GPBUnknownFields` to create another.
+ *
+ * NOTE: If the field being copied is an Group, this instance added is new and thus
+ * the `.group` of that result is also new, so if you intent is to modify the group
+ * it *must* be fetched out of the result.
+ *
+ * It is a programming error to call this when the `type` is a legacy field.
+ *
+ * @param field The field to add.
+ *
+ * @return The autoreleased field that was added.
+ **/
+- (GPBUnknownField *)addCopyOfField:(nonnull GPBUnknownField *)field;
+
 /**
  * Removes the given field from the set.
  *

objectivec/GPBUnknownFields.m

@@ -197,6 +197,12 @@ static BOOL MergeFromInputStream(GPBUnknownFields *self, GPBCodedInputStream *in
   self = [super init];
   if (self) {
     fields_ = [[NSMutableArray alloc] init];
+    // This shouldn't happen with the annotations, but just incase something claiming nonnull
+    // does return nil, block it.
+    if (!message) {
+      [self release];
+      [NSException raise:NSInvalidArgumentException format:@"Message cannot be nil"];
+    }
     NSData *data = GPBMessageUnknownFieldsData(message);
     if (data) {
       GPBCodedInputStream *input = [[GPBCodedInputStream alloc] initWithData:data];
@@ -222,9 +228,8 @@ static BOOL MergeFromInputStream(GPBUnknownFields *self, GPBCodedInputStream *in
 }
 
 - (id)copyWithZone:(NSZone *)zone {
-  GPBUnknownFields *copy = [[GPBUnknownFields alloc] init];
-  // Fields are r/o in this api, so just copy the array.
-  copy->fields_ = [fields_ mutableCopyWithZone:zone];
+  GPBUnknownFields *copy = [[GPBUnknownFields allocWithZone:zone] init];
+  copy->fields_ = [[NSMutableArray allocWithZone:zone] initWithArray:fields_ copyItems:YES];
   return copy;
 }
 
@@ -318,6 +323,16 @@ static BOOL MergeFromInputStream(GPBUnknownFields *self, GPBCodedInputStream *in
   return [group autorelease];
 }
 
+- (GPBUnknownField *)addCopyOfField:(nonnull GPBUnknownField *)field {
+  if (field->type_ == GPBUnknownFieldTypeLegacy) {
+    [NSException raise:NSInternalInconsistencyException
+                format:@"GPBUnknownField is the wrong type"];
+  }
+  GPBUnknownField *result = [field copy];
+  [fields_ addObject:result];
+  return [result autorelease];
+}
+
 - (void)removeField:(nonnull GPBUnknownField *)field {
   NSUInteger count = fields_.count;
   [fields_ removeObjectIdenticalTo:field];

objectivec/Tests/GPBUnknownFieldsTest.m

@@ -662,6 +662,37 @@
   XCTAssertEqual(loop, 10);
 }
 
+- (void)testAddCopyOfField {
+  GPBUnknownFields* ufs = [[[GPBUnknownFields alloc] init] autorelease];
+  [ufs addFieldNumber:1 varint:10];
+  [ufs addFieldNumber:2 fixed32:11];
+  [ufs addFieldNumber:3 fixed64:12];
+  [ufs addFieldNumber:4 lengthDelimited:DataFromCStr("foo")];
+  GPBUnknownFields* group = [ufs addGroupWithFieldNumber:5];
+  [group addFieldNumber:10 varint:100];
+  GPBUnknownFields* subGroup = [group addGroupWithFieldNumber:100];
+  [subGroup addFieldNumber:50 varint:50];
+
+  GPBUnknownFields* ufs2 = [[[GPBUnknownFields alloc] init] autorelease];
+  for (GPBUnknownField* field in ufs) {
+    GPBUnknownField* field2 = [ufs2 addCopyOfField:field];
+    XCTAssertEqualObjects(field, field2);
+    if (field.type == GPBUnknownFieldTypeGroup) {
+      // Group does a copy because the `.group` value is mutable.
+      XCTAssertTrue(field != field2);        // Pointer comparison.
+      XCTAssertTrue(group != field2.group);  // Pointer comparison.
+      XCTAssertEqualObjects(group, field2.group);
+      GPBUnknownFields* subGroupAdded = [field2.group firstGroup:100];
+      XCTAssertTrue(subGroupAdded != subGroup);  // Pointer comparison.
+      XCTAssertEqualObjects(subGroupAdded, subGroup);
+    } else {
+      // All other types are immutable, so they use the same object.
+      XCTAssertTrue(field == field2);  // Pointer comparision.
+    }
+  }
+  XCTAssertEqualObjects(ufs, ufs2);
+}
+
 - (void)testDescriptions {
   // Exercise description for completeness.
   GPBUnknownFields* ufs = [[[GPBUnknownFields alloc] init] autorelease];
@@ -683,25 +714,30 @@
   [ufs addFieldNumber:3 fixed64:3];
   [ufs addFieldNumber:4 lengthDelimited:DataFromCStr("foo")];
   GPBUnknownFields* group = [ufs addGroupWithFieldNumber:5];
+  [group addFieldNumber:10 varint:10];
+  GPBUnknownFields* subGroup = [group addGroupWithFieldNumber:100];
+  [subGroup addFieldNumber:20 varint:20];
 
   GPBUnknownFields* ufs2 = [[ufs copy] autorelease];
   XCTAssertTrue(ufs != ufs2);        // Different objects
   XCTAssertEqualObjects(ufs, ufs2);  // Equal contents
-  // All the actual field objects should be the same since they are immutable.
+  // All field objects but the group should be the same since they are immutable.
   XCTAssertTrue([[ufs fields:1] firstObject] == [[ufs2 fields:1] firstObject]);  // Same object
   XCTAssertTrue([[ufs fields:2] firstObject] == [[ufs2 fields:2] firstObject]);  // Same object
   XCTAssertTrue([[ufs fields:3] firstObject] == [[ufs2 fields:3] firstObject]);  // Same object
   XCTAssertTrue([[ufs fields:4] firstObject] == [[ufs2 fields:4] firstObject]);  // Same object
   XCTAssertTrue([[ufs fields:4] firstObject].lengthDelimited ==
-                [[ufs2 fields:4] firstObject].lengthDelimited);                  // Same object
-  XCTAssertTrue([[ufs fields:5] firstObject] == [[ufs2 fields:5] firstObject]);  // Same object
-  XCTAssertTrue(group == [[ufs2 fields:5] firstObject].group);                   // Same object
-
-  // Now force copies on the fields to confirm that is not making new objects either.
-  for (GPBUnknownField* field in ufs) {
-    GPBUnknownField* field2 = [[field copy] autorelease];
-    XCTAssertTrue(field == field2);  // Same object (since they aren't mutable).
-  }
+                [[ufs2 fields:4] firstObject].lengthDelimited);  // Same object
+  // Since the group holds another `GPBUnknownFields` object (which is mutable), it will be a
+  // different object.
+  XCTAssertTrue([[ufs fields:5] firstObject] != [[ufs2 fields:5] firstObject]);
+  XCTAssertTrue(group != [[ufs2 fields:5] firstObject].group);
+  XCTAssertEqualObjects(group, [[ufs2 fields:5] firstObject].group);
+  // And confirm that copy went deep so the nested group also is a different object.
+  GPBUnknownFields* groupCopied = [[ufs2 fields:5] firstObject].group;
+  XCTAssertTrue([[group fields:100] firstObject] != [[groupCopied fields:100] firstObject]);
+  XCTAssertTrue(subGroup != [[groupCopied fields:100] firstObject].group);
+  XCTAssertEqualObjects(subGroup, [[groupCopied fields:100] firstObject].group);
 }
 
 - (void)testInvalidFieldNumbers {

pkg/BUILD.bazel

@@ -198,7 +198,7 @@ cc_dist_library(
         "//src/google/protobuf/compiler/cpp",
         "//src/google/protobuf/compiler/csharp",
         "//src/google/protobuf/compiler/java",
-        "//src/google/protobuf/compiler/java:kotlin",
+        "//src/google/protobuf/compiler/kotlin",
         "//src/google/protobuf/compiler/objectivec",
         "//src/google/protobuf/compiler/php",
         "//src/google/protobuf/compiler/python",

protos/BUILD

@@ -7,10 +7,6 @@
 
 # begin:google_only
 # load(
-#     "//hpb/bazel:upb_cc_proto_library.bzl",
-#     "upb_cc_proto_library_copts",
-# )
-# load(
 #     "//upb/bazel:build_defs.bzl",
 #     "UPB_DEFAULT_CPPOPTS",
 # )
@@ -20,19 +16,6 @@
 # licenses(["notice"])
 #
 # cc_library(
-#     name = "repeated_field",
-#     hdrs = [
-#         "repeated_field.h",
-#         "repeated_field_iterator.h",
-#     ],
-#     copts = UPB_DEFAULT_CPPOPTS,
-#     visibility = ["//visibility:public"],
-#     deps = [
-#         "//hpb:repeated_field",
-#     ],
-# )
-#
-# cc_library(
 #     name = "protos",
 #     hdrs = [
 #         "protos.h",
@@ -43,34 +26,4 @@
 #         "//hpb",
 #     ],
 # )
-#
-# cc_library(
-#     name = "protos_internal",
-#     hdrs = ["protos_internal.h"],
-#     copts = UPB_DEFAULT_CPPOPTS,
-#     visibility = ["//visibility:public"],
-#     deps = [
-#         "//hpb:internal",
-#     ],
-# )
-#
-# # Common support code for C++ generated code.
-# cc_library(
-#     name = "generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-#     hdrs = [
-#         "protos_internal.h",
-#     ],
-#     copts = UPB_DEFAULT_CPPOPTS,
-#     visibility = ["//visibility:public"],
-#     deps = [
-#         "//hpb:generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-#     ],
-# )
-#
-# upb_cc_proto_library_copts(
-#     name = "upb_cc_proto_library_copts__for_generated_code_only_do_not_use",
-#     copts = UPB_DEFAULT_CPPOPTS,
-#     visibility = ["//visibility:public"],
-# )
-#
 # end:google_only

protos/protos_internal.h

@@ -1,14 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-#ifndef UPB_PROTOS_PROTOS_INTERNAL_H_
-#define UPB_PROTOS_PROTOS_INTERNAL_H_
-#include "google/protobuf/hpb/internal.h"
-namespace protos::internal {
-using ::hpb::internal::MoveMessage;
-}  // namespace protos::internal
-#endif

protos/repeated_field.h

@@ -1,14 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-#ifndef UPB_PROTOS_REPEATED_FIELD_H_
-#define UPB_PROTOS_REPEATED_FIELD_H_
-#include "google/protobuf/hpb/repeated_field.h"
-namespace protos {
-using hpb::RepeatedField;
-}
-#endif

protos/repeated_field_iterator.h

@@ -1,11 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-#ifndef UPB_PROTOS_REPEATED_FIELD_ITERATOR_H_
-#define UPB_PROTOS_REPEATED_FIELD_ITERATOR_H_
-#include "google/protobuf/hpb/repeated_field_iterator.h"
-#endif

python/BUILD.bazel

@@ -191,9 +191,9 @@ py_extension(
     ],
     target_compatible_with = select(_message_target_compatible_with),
     deps = [
+        "//src/google/protobuf:descriptor_upb_reflection_proto",
         "//third_party/utf8_range",
         "//upb:base",
-        "//upb:descriptor_upb_proto_reflection",
         "//upb:eps_copy_input_stream",
         "//upb:message",
         "//upb:message_compare",

python/google/protobuf/any.py

@@ -0,0 +1,39 @@
+# Protocol Buffers - Google's data interchange format
+# Copyright 2008 Google Inc.  All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+"""Contains the Any helper APIs."""
+
+from typing import Optional
+
+from google.protobuf import descriptor
+from google.protobuf.message import Message
+
+from google.protobuf.any_pb2 import Any
+
+
+def pack(
+    msg: Message,
+    type_url_prefix: Optional[str] = 'type.googleapis.com/',
+    deterministic: Optional[bool] = None,
+) -> Any:
+  any_msg = Any()
+  any_msg.Pack(
+      msg=msg, type_url_prefix=type_url_prefix, deterministic=deterministic
+  )
+  return any_msg
+
+
+def unpack(any_msg: Any, msg: Message) -> bool:
+  return any_msg.Unpack(msg=msg)
+
+
+def type_name(any_msg: Any) -> str:
+  return any_msg.TypeName()
+
+
+def is_type(any_msg: Any, des: descriptor.Descriptor) -> bool:
+  return any_msg.Is(des)

python/google/protobuf/internal/any_test.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Protocol Buffers - Google's data interchange format
+# Copyright 2008 Google Inc.  All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+"""Tests proto Any APIs."""
+
+import unittest
+
+from google.protobuf import any
+
+from google.protobuf import any_pb2
+from google.protobuf import unittest_pb2
+
+
+class AnyTest(unittest.TestCase):
+
+  def test_pack_unpack(self):
+    all_types = unittest_pb2.TestAllTypes()
+    any_msg = any.pack(all_types)
+    all_descriptor = all_types.DESCRIPTOR
+    self.assertEqual(
+        any_msg.type_url, 'type.googleapis.com/%s' % all_descriptor.full_name
+    )
+    unpacked_message = unittest_pb2.TestAllTypes()
+    self.assertTrue(any.unpack(any_msg, unpacked_message))
+
+  def test_type_name(self):
+    all_types = unittest_pb2.TestAllTypes()
+    any_msg = any.pack(all_types)
+    self.assertEqual(any.type_name(any_msg), 'protobuf_unittest.TestAllTypes')
+
+  def test_is_type(self):
+    all_types = unittest_pb2.TestAllTypes()
+    any_msg = any.pack(all_types)
+    all_descriptor = all_types.DESCRIPTOR
+    self.assertTrue(any.is_type(any_msg, all_descriptor))
+
+    empty_any = any_pb2.Any()
+    self.assertFalse(any.is_type(empty_any, all_descriptor))
+
+
+if __name__ == '__main__':
+  unittest.main()

python/google/protobuf/internal/json_format_test.py

@@ -1668,6 +1668,11 @@ class JsonFormatTest(JsonFormatBase):
         "Failed to parse JSON: TypeError: 'int' object is not iterable.",
     )
 
+  def testManyRecursionsRaisesParseError(self):
+    num_recursions = 1050
+    text = ('{"a":' * num_recursions) + '""' + ('}' * num_recursions)
+    with self.assertRaises(json_format.ParseError):
+      json_format.Parse(text, json_format_proto3_pb2.TestMessage())
 
 if __name__ == '__main__':
   unittest.main()

python/google/protobuf/internal/reflection_test.py

@@ -15,22 +15,23 @@ import gc
 import operator
 import struct
 import sys
-import warnings
 import unittest
+import warnings
 
-from google.protobuf import descriptor_pb2
 from google.protobuf import descriptor
+from google.protobuf import descriptor_pb2
 from google.protobuf import message
+from google.protobuf import message_factory
 from google.protobuf import reflection
 from google.protobuf import text_format
 from google.protobuf.internal import api_implementation
+from google.protobuf.internal import decoder
+from google.protobuf.internal import message_set_extensions_pb2
 from google.protobuf.internal import more_extensions_pb2
 from google.protobuf.internal import more_messages_pb2
-from google.protobuf.internal import message_set_extensions_pb2
-from google.protobuf.internal import wire_format
 from google.protobuf.internal import test_util
 from google.protobuf.internal import testing_refleaks
-from google.protobuf.internal import decoder
+from google.protobuf.internal import wire_format
 from google.protobuf.internal import _parameterized
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_mset_pb2
@@ -1567,7 +1568,8 @@ class Proto2ReflectionTest(unittest.TestCase):
     prius.owners.extend(['bob', 'susan'])
 
     serialized_prius = prius.SerializeToString()
-    new_prius = reflection.ParseMessage(desc, serialized_prius)
+    new_prius = message_factory.GetMessageClass(desc)()
+    new_prius.ParseFromString(serialized_prius)
     self.assertIsNot(new_prius, prius)
     self.assertEqual(prius, new_prius)
 
@@ -3306,7 +3308,7 @@ class ClassAPITest(unittest.TestCase):
         enum_types=[], extensions=[],
         # pylint: disable=protected-access
         create_key=descriptor._internal_create_key)
-    reflection.MakeClass(parent_desc)
+    message_factory.GetMessageClass(parent_desc)
 
   def _GetSerializedFileDescriptor(self, name):
     """Get a serialized representation of a test FileDescriptorProto.
@@ -3399,7 +3401,7 @@ class ClassAPITest(unittest.TestCase):
     file_descriptor.ParseFromString(self._GetSerializedFileDescriptor('B'))
     msg_descriptor = descriptor.MakeDescriptor(
         file_descriptor.message_type[0])
-    msg_class = reflection.MakeClass(msg_descriptor)
+    msg_class = message_factory.GetMessageClass(msg_descriptor)
     msg = msg_class()
     msg_str = (
         'flat: 0 '
@@ -3415,7 +3417,7 @@ class ClassAPITest(unittest.TestCase):
     file_descriptor.ParseFromString(self._GetSerializedFileDescriptor('C'))
     msg_descriptor = descriptor.MakeDescriptor(
         file_descriptor.message_type[0])
-    msg_class = reflection.MakeClass(msg_descriptor)
+    msg_class = message_factory.GetMessageClass(msg_descriptor)
     msg = msg_class()
     msg_str = (
         'bar {'

python/google/protobuf/pyext/descriptor.cc

@@ -1508,6 +1508,11 @@ static int SetHasOptions(PyFileDescriptor *self, PyObject *value,
 }
 
 static PyObject* GetDebugString(PyFileDescriptor* self) {
+  PyErr_Warn(nullptr,
+             "GetDebugString() API is deprecated. This API only "
+             "exists in protobuf c++ and does not exists in pure python, upb "
+             "or any other languages. GetDebugString() for python cpp "
+             "extension will be removed in Jan 2025");
   return PyString_FromCppString(_GetDescriptor(self)->DebugString());
 }
 

rust/test/benchmarks/BUILD

@@ -48,8 +48,8 @@ cc_test(
         ":bench_data_upb_cc_proto",
         ":benchmarks",
         ":proto_benchmarks_cpp",  # build_cleaner: keep
+        "//hpb:repeated_field",
         "//protos",
-        "//protos:repeated_field",
         "//src/google/protobuf:protobuf_lite",
         "//testing/base/public:gunit",
         "//third_party/benchmark",
@@ -69,8 +69,8 @@ cc_test(
         ":bench_data_upb_cc_proto",
         ":benchmarks",
         ":proto_benchmarks_upb",  # build_cleaner: keep
+        "//hpb:repeated_field",
         "//protos",
-        "//protos:repeated_field",
         "//src/google/protobuf:protobuf_lite",
         "//testing/base/public:gunit",
         "//third_party/benchmark",

rust/upb/associated_mini_table.rs

@@ -16,15 +16,20 @@ use super::upb_MiniTable;
 /// passed in as a parameter, which is referred to as 'the associated MiniTable
 /// for the upb_Message instance' in safety comments.
 ///
-/// This trait is a way to statically associate a MiniTable with Rust types
+/// This trait is a way to associate a MiniTable with Rust types
 /// which hold upb_Message* to simplify ensuring the upb C invariants
 /// are maintained.
 ///
-/// SAFETY:
-/// - The MiniTable pointer must be from Protobuf code generation and follow the
-///   corresponding invariants associated with upb's C API (the pointer should
-///   always have the same non-null value, the underlying pointee should never
-///   be modified and should have 'static lifetime).
-pub unsafe trait AssociatedMiniTable {
-    const MINI_TABLE: *const upb_MiniTable;
+/// Note that this would prefer to be a `const MINI_TABLE: *const upb_MiniTable`
+/// to statically associate a single MiniTable, but as long as the MiniTable is
+/// an extern "C" we cannot do that without the unstable `const_refs_to_static`.
+/// After that feature is stabilized (or if we move the MiniTable generation to
+/// .rs) this will be switched.
+pub trait AssociatedMiniTable {
+    /// SAFETY:
+    /// - The MiniTable pointer must be from Protobuf code generation and follow
+    ///   the corresponding invariants associated with upb's C API (the pointer
+    ///   should always have the same non-null value, the underlying pointee
+    ///   should never be modified and should have 'static lifetime).
+    unsafe fn mini_table() -> *const upb_MiniTable;
 }

src/file_lists.cmake

@@ -40,6 +40,7 @@ set(libprotobuf_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_bases.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_table_gen.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_full.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_gen.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_lite.cc
@@ -129,6 +130,8 @@ set(libprotobuf_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_bases.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_table.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_table_gen.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_decl.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_gen.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_impl.h
@@ -250,6 +253,7 @@ set(libprotobuf_lite_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_inl.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_table.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_decl.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_impl.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_util.h
@@ -348,7 +352,6 @@ set(libprotoc_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/internal_helpers.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_features.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum_field.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/extension.cc
@@ -364,6 +367,7 @@ set(libprotoc_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/name_resolver.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/names.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/shared_code_generator.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/kotlin/generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/enum.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/enum_field.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/extension.cc
@@ -478,7 +482,6 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/internal_helpers.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_features.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/extension.h
@@ -496,6 +499,7 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/names.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/options.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/shared_code_generator.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/kotlin/generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/enum.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/enum_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/extension.h
@@ -683,6 +687,7 @@ set(libupb_hdrs
   ${protobuf_SOURCE_DIR}/upb/reflection/def.hpp
   ${protobuf_SOURCE_DIR}/upb/reflection/def_pool.h
   ${protobuf_SOURCE_DIR}/upb/reflection/def_type.h
+  ${protobuf_SOURCE_DIR}/upb/reflection/descriptor_bootstrap.h
   ${protobuf_SOURCE_DIR}/upb/reflection/enum_def.h
   ${protobuf_SOURCE_DIR}/upb/reflection/enum_reserved_range.h
   ${protobuf_SOURCE_DIR}/upb/reflection/enum_value_def.h
@@ -737,6 +742,7 @@ set(protoc-gen-upb_hdrs
   ${protobuf_SOURCE_DIR}/upb_generator/file_layout.h
   ${protobuf_SOURCE_DIR}/upb_generator/names.h
   ${protobuf_SOURCE_DIR}/upb_generator/plugin.h
+  ${protobuf_SOURCE_DIR}/upb_generator/plugin_bootstrap.h
 )
 
 # @//pkg:protoc-gen-upbdefs
@@ -751,6 +757,7 @@ set(protoc-gen-upbdefs_hdrs
   ${protobuf_SOURCE_DIR}/upb_generator/common.h
   ${protobuf_SOURCE_DIR}/upb_generator/file_layout.h
   ${protobuf_SOURCE_DIR}/upb_generator/plugin.h
+  ${protobuf_SOURCE_DIR}/upb_generator/plugin_bootstrap.h
 )
 
 # @//pkg:protoc-gen-upb_minitable
@@ -768,6 +775,7 @@ set(protoc-gen-upb_minitable_hdrs
   ${protobuf_SOURCE_DIR}/upb_generator/file_layout.h
   ${protobuf_SOURCE_DIR}/upb_generator/names.h
   ${protobuf_SOURCE_DIR}/upb_generator/plugin.h
+  ${protobuf_SOURCE_DIR}/upb_generator/plugin_bootstrap.h
   ${protobuf_SOURCE_DIR}/upb_generator/protoc-gen-upb_minitable.h
 )
 
@@ -1013,6 +1021,7 @@ set(protobuf_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/feature_resolver_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection_unittest.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_table_gen_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_lite_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/has_bits_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field_unittest.cc

src/google/protobuf/BUILD.bazel

@@ -6,6 +6,9 @@ load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:proto_library.bzl", "proto_library")
+load("//bazel:upb_c_proto_library.bzl", "upb_c_proto_library")
+load("//bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
+load("//bazel:upb_proto_reflection_library.bzl", "upb_proto_reflection_library")
 load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS")
 load("//upb/cmake:build_defs.bzl", "staleness_test")
 
@@ -223,6 +226,24 @@ proto_library(
     ],
 )
 
+upb_c_proto_library(
+    name = "descriptor_upb_c_proto",
+    visibility = ["//:__subpackages__"],
+    deps = [":descriptor_proto"],
+)
+
+upb_minitable_proto_library(
+    name = "descriptor_upb_minitable_proto",
+    visibility = ["//:__subpackages__"],
+    deps = [":descriptor_proto"],
+)
+
+upb_proto_reflection_library(
+    name = "descriptor_upb_reflection_proto",
+    visibility = ["//:__subpackages__"],
+    deps = [":descriptor_proto"],
+)
+
 proto_library(
     name = "cpp_features_proto",
     srcs = ["cpp_features.proto"],
@@ -491,6 +512,7 @@ cc_library(
         "extension_set.h",
         "extension_set_inl.h",
         "generated_enum_util.h",
+        "generated_message_table.h",
         "generated_message_tctable_decl.h",
         "generated_message_tctable_impl.h",
         "generated_message_util.h",
@@ -573,6 +595,7 @@ PROTOBUF_HEADERS = [
     "generated_enum_reflection.h",
     "generated_message_bases.h",
     "generated_message_reflection.h",
+    "generated_message_table_gen.h",
     "generated_message_tctable_gen.h",
     "map_entry.h",
     "map_field.h",
@@ -604,6 +627,7 @@ cc_library(
         "feature_resolver.cc",
         "generated_message_bases.cc",
         "generated_message_reflection.cc",
+        "generated_message_table_gen.cc",
         "generated_message_tctable_full.cc",
         "generated_message_tctable_gen.cc",
         "map_field.cc",
@@ -1468,6 +1492,21 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "generated_message_table_gen_test",
+    srcs = ["generated_message_table_gen_test.cc"],
+    deps = [
+        ":cc_test_protos",
+        ":port",
+        ":protobuf",
+        ":protobuf_lite",
+        "@com_google_absl//absl/algorithm:container",
+        "@com_google_absl//absl/log:absl_check",
+        "@com_google_googletest//:gtest",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
 cc_test(
     name = "inlined_string_field_unittest",
     srcs = ["inlined_string_field_unittest.cc"],

src/google/protobuf/any.cc

@@ -7,7 +7,7 @@
 
 #include "google/protobuf/any.h"
 
-#include "google/protobuf/arenastring.h"
+#include "absl/strings/string_view.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/generated_message_util.h"
 #include "google/protobuf/message.h"

src/google/protobuf/any.h

@@ -10,6 +10,7 @@
 
 #include <string>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/port.h"
 #include "google/protobuf/arenastring.h"
 #include "google/protobuf/message_lite.h"

src/google/protobuf/any_lite.cc

@@ -5,12 +5,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <cstdlib>
+#include <string>
+
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 #include "google/protobuf/any.h"
-#include "google/protobuf/arenastring.h"
 #include "google/protobuf/generated_message_util.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
+#include "google/protobuf/message_lite.h"
 
 namespace google {
 namespace protobuf {
@@ -26,6 +30,12 @@ std::string GetTypeUrl(absl::string_view message_name,
   }
 }
 
+bool EndsWithTypeName(absl::string_view type_url, absl::string_view type_name) {
+  return type_url.size() > type_name.size() &&
+         type_url[type_url.size() - type_name.size() - 1] == '/' &&
+         absl::EndsWith(type_url, type_name);
+}
+
 const char kAnyFullTypeName[] = "google.protobuf.Any";
 const char kTypeGoogleApisComPrefix[] = "type.googleapis.com/";
 const char kTypeGoogleProdComPrefix[] = "type.googleprod.com/";
@@ -46,10 +56,7 @@ bool AnyMetadata::InternalUnpackTo(absl::string_view type_name,
 }
 
 bool AnyMetadata::InternalIs(absl::string_view type_name) const {
-  absl::string_view type_url = type_url_->Get();
-  return type_url.size() >= type_name.size() + 1 &&
-         type_url[type_url.size() - type_name.size() - 1] == '/' &&
-         absl::EndsWith(type_url, type_name);
+  return EndsWithTypeName(type_url_->Get(), type_name);
 }
 
 bool ParseAnyTypeUrl(absl::string_view type_url, std::string* url_prefix,

src/google/protobuf/any_test.cc

@@ -5,9 +5,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <limits.h>
+
+#include <cstdlib>
+#include <string>
+#include <utility>
+
 #include "google/protobuf/any.pb.h"
 #include <gtest/gtest.h>
-#include "absl/strings/str_cat.h"
 #include "google/protobuf/any_test.pb.h"
 #include "google/protobuf/unittest.pb.h"
 

src/google/protobuf/compiler/BUILD.bazel

@@ -11,6 +11,8 @@ load(
 )
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:proto_library.bzl", "proto_library")
+load("//bazel:upb_c_proto_library.bzl", "upb_c_proto_library")
+load("//bazel:upb_proto_reflection_library.bzl", "upb_proto_reflection_library")
 load("//build_defs:arch_tests.bzl", "aarch64_test", "x86_64_test")
 load("//build_defs:cpp_opts.bzl", "COPTS")
 load("test_plugin_injection.bzl", "inject_plugin_paths")
@@ -32,6 +34,18 @@ cc_proto_library(
     deps = [":plugin_proto"],
 )
 
+upb_c_proto_library(
+    name = "plugin_upb_c_proto",
+    visibility = ["//upb_generator:__subpackages__"],
+    deps = [":plugin_proto"],
+)
+
+upb_proto_reflection_library(
+    name = "plugin_upb_reflection_proto",
+    visibility = ["//upb_generator:__subpackages__"],
+    deps = [":plugin_proto"],
+)
+
 cc_library(
     name = "importer",
     srcs = [
@@ -195,7 +209,7 @@ cc_library(
         "//src/google/protobuf/compiler/cpp",
         "//src/google/protobuf/compiler/csharp",
         "//src/google/protobuf/compiler/java",
-        "//src/google/protobuf/compiler/java:kotlin",
+        "//src/google/protobuf/compiler/kotlin",
         "//src/google/protobuf/compiler/objectivec",
         "//src/google/protobuf/compiler/php",
         "//src/google/protobuf/compiler/python",

src/google/protobuf/compiler/command_line_interface.cc

@@ -1596,7 +1596,7 @@ bool CommandLineInterface::ParseInputFiles(
     // exclusively reading from descriptor sets, we can eliminate this failure
     // condition.
     for (const auto& input_file : input_files_) {
-      descriptor_pool->AddUnusedImportTrackFile(input_file);
+      descriptor_pool->AddDirectInputFile(input_file);
     }
   }
 
@@ -1643,7 +1643,7 @@ bool CommandLineInterface::ParseInputFiles(
       }
     }
   }
-  descriptor_pool->ClearUnusedImportTrackFiles();
+  descriptor_pool->ClearDirectInputFiles();
   return result;
 }
 

src/google/protobuf/compiler/command_line_interface_unittest.cc

@@ -1551,6 +1551,54 @@ TEST_F(CommandLineInterfaceTest, Plugin_DeprecatedEdition) {
       "edition 99997_TEST_ONLY.");
 }
 
+TEST_F(CommandLineInterfaceTest, Plugin_DeprecatedFeature) {
+  CreateTempFile("google/protobuf/descriptor.proto",
+                 google::protobuf::DescriptorProto::descriptor()->file()->DebugString());
+  CreateTempFile("google/protobuf/unittest_features.proto",
+                 pb::TestFeatures::descriptor()->file()->DebugString());
+  CreateTempFile("foo.proto",
+                 R"schema(
+    edition = "2023";
+    import "google/protobuf/unittest_features.proto";
+    package foo;
+    option features.(pb.test).removed_feature = VALUE9;
+  )schema");
+
+  Run("protocol_compiler --test_out=$tmpdir "
+      "--proto_path=$tmpdir foo.proto");
+  ExpectWarningSubstring(
+      "foo.proto:4:5: warning: Feature pb.TestFeatures.removed_feature has "
+      "been deprecated in edition 2023: Custom feature deprecation warning\n");
+}
+
+TEST_F(CommandLineInterfaceTest, Plugin_TransitiveDeprecatedFeature) {
+  CreateTempFile("google/protobuf/descriptor.proto",
+                 google::protobuf::DescriptorProto::descriptor()->file()->DebugString());
+  CreateTempFile("google/protobuf/unittest_features.proto",
+                 pb::TestFeatures::descriptor()->file()->DebugString());
+  CreateTempFile("unused.proto",
+                 R"schema(
+    edition = "2023";
+    import "google/protobuf/unittest_features.proto";
+    package foo;
+    option features.(pb.test).removed_feature = VALUE9;
+    message Foo {}
+  )schema");
+  CreateTempFile("foo.proto",
+                 R"schema(
+    edition = "2023";
+    import "unused.proto";
+    package foo;
+    message Bar {
+      Foo foo = 1;
+    }
+  )schema");
+
+  Run("protocol_compiler --test_out=$tmpdir "
+      "--proto_path=$tmpdir foo.proto");
+  ExpectNoErrors();
+}
+
 TEST_F(CommandLineInterfaceTest, Plugin_FutureEdition) {
   CreateTempFile("foo.proto", R"schema(
     edition = "2023";

src/google/protobuf/compiler/importer.cc

@@ -216,14 +216,11 @@ const FileDescriptor* Importer::Import(const std::string& filename) {
   return pool_.FindFileByName(filename);
 }
 
-void Importer::AddUnusedImportTrackFile(const std::string& file_name,
-                                        bool is_error) {
-  pool_.AddUnusedImportTrackFile(file_name, is_error);
+void Importer::AddDirectInputFile(absl::string_view file_name, bool is_error) {
+  pool_.AddDirectInputFile(file_name, is_error);
 }
 
-void Importer::ClearUnusedImportTrackFiles() {
-  pool_.ClearUnusedImportTrackFiles();
-}
+void Importer::ClearDirectInputFiles() { pool_.ClearDirectInputFiles(); }
 
 
 // ===================================================================

src/google/protobuf/compiler/importer.h

@@ -159,9 +159,19 @@ class PROTOBUF_EXPORT Importer {
   // contents are stored.
   inline const DescriptorPool* pool() const { return &pool_; }
 
-  void AddUnusedImportTrackFile(const std::string& file_name,
-                                bool is_error = false);
-  void ClearUnusedImportTrackFiles();
+  void AddDirectInputFile(absl::string_view file_name,
+                          bool unused_import_is_error = false);
+  void ClearDirectInputFiles();
+
+#if !defined(PROTOBUF_FUTURE_RENAME_ADD_UNUSED_IMPORT) && !defined(SWIG)
+  ABSL_DEPRECATED("Use AddDirectInputFile")
+  void AddUnusedImportTrackFile(absl::string_view file_name,
+                                bool is_error = false) {
+    AddDirectInputFile(file_name, is_error);
+  }
+  ABSL_DEPRECATED("Use AddDirectInputFile")
+  void ClearUnusedImportTrackFiles() { ClearDirectInputFiles(); }
+#endif  // !PROTOBUF_FUTURE_RENAME_ADD_UNUSED_IMPORT && !SWIG
 
 
  private:

src/google/protobuf/compiler/java/BUILD.bazel

@@ -45,6 +45,7 @@ cc_library(
     visibility = [
         "//pkg:__pkg__",
         "//src/google/protobuf/compiler/java:__subpackages__",
+        "//src/google/protobuf/compiler/kotlin:__subpackages__",
     ],
     deps = [
         "//src/google/protobuf",
@@ -78,6 +79,8 @@ cc_library(
         "//src/google/protobuf:port",
         "//src/google/protobuf/compiler:code_generator",
         "@com_google_absl//absl/log:absl_log",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:str_format",
     ],
 )
 
@@ -116,6 +119,7 @@ cc_library(
     visibility = [
         "//pkg:__pkg__",
         "//src/google/protobuf/compiler:__pkg__",
+        "//src/google/protobuf/compiler/kotlin:__subpackages__",
     ],
     deps = [
         ":generator_common",
@@ -182,25 +186,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "kotlin",
-    srcs = ["kotlin_generator.cc"],
-    hdrs = ["kotlin_generator.h"],
-    strip_include_prefix = "/src",
-    visibility = [
-        "//pkg:__pkg__",
-        "//src/google/protobuf/compiler:__pkg__",
-    ],
-    deps = [
-        ":helpers",
-        ":java",
-        "//src/google/protobuf",
-        "//src/google/protobuf:port",
-        "//src/google/protobuf/compiler:code_generator",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
 cc_test(
     name = "doc_comment_unittest",
     srcs = ["doc_comment_unittest.cc"],

src/google/protobuf/compiler/java/full/BUILD.bazel

@@ -89,7 +89,6 @@ cc_library(
         "//src/google/protobuf/io:printer",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
     ],
 )
 

src/google/protobuf/compiler/java/full/enum.cc

@@ -11,21 +11,18 @@
 
 #include "google/protobuf/compiler/java/full/enum.h"
 
-#include <algorithm>
-#include <cmath>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/string_view.h"
 #include "google/protobuf/compiler/java/context.h"
 #include "google/protobuf/compiler/java/doc_comment.h"
 #include "google/protobuf/compiler/java/helpers.h"
 #include "google/protobuf/compiler/java/internal_helpers.h"
 #include "google/protobuf/compiler/java/name_resolver.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/io/printer.h"
 
@@ -37,7 +34,6 @@ namespace protobuf {
 namespace compiler {
 namespace java {
 
-
 EnumNonLiteGenerator::EnumNonLiteGenerator(const EnumDescriptor* descriptor,
                                            bool immutable_api, Context* context)
     : descriptor_(descriptor),
@@ -383,7 +379,6 @@ void EnumNonLiteGenerator::Generate(io::Printer* printer) {
   printer->Print("}\n\n");
 }
 
-
 bool EnumNonLiteGenerator::CanUseEnumValues() {
   if (canonical_values_.size() != descriptor_->value_count()) {
     return false;

src/google/protobuf/compiler/java/full/enum.h

@@ -71,7 +71,6 @@ class EnumNonLiteGenerator : public EnumGenerator {
   ClassNameResolver* name_resolver_;
 
   bool CanUseEnumValues();
-
 };
 
 }  // namespace java

src/google/protobuf/compiler/java/internal_helpers.cc

@@ -11,9 +11,22 @@
 
 #include "google/protobuf/compiler/java/internal_helpers.h"
 
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "absl/log/absl_log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
+#include "google/protobuf/compiler/java/context.h"
+#include "google/protobuf/compiler/java/doc_comment.h"
 #include "google/protobuf/compiler/java/helpers.h"
 #include "google/protobuf/compiler/java/name_resolver.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor.pb.h"
 
 // Must be last.
@@ -106,6 +119,7 @@ int GetExperimentalJavaFieldType(const FieldDescriptor* field) {
   }
 }
 
+
 }  // namespace java
 }  // namespace compiler
 }  // namespace protobuf

src/google/protobuf/compiler/java/internal_helpers.h

@@ -13,7 +13,9 @@
 #define GOOGLE_PROTOBUF_COMPILER_JAVA_INTERNAL_HELPERS_H__
 
 #include "google/protobuf/compiler/java/java_features.pb.h"
+#include "google/protobuf/compiler/java/context.h"
 #include "google/protobuf/compiler/java/generator.h"
+#include "google/protobuf/compiler/java/name_resolver.h"
 #include "google/protobuf/compiler/java/names.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor.pb.h"

src/google/protobuf/compiler/java/java_features.pb.cc

@@ -82,25 +82,25 @@ const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fjava_2fjava_
     protodesc_cold) = {
     "\n1google/protobuf/compiler/java/java_fea"
     "tures.proto\022\002pb\032 google/protobuf/descrip"
-    "tor.proto\"\367\004\n\014JavaFeatures\022\374\001\n\022legacy_cl"
-    "osed_enum\030\001 \001(\010B\337\001\210\001\001\230\001\004\230\001\001\242\001\t\022\004true\030\204\007\242"
-    "\001\n\022\005false\030\347\007\262\001\271\001\010\350\007\020\350\007\032\260\001The legacy clos"
-    "ed enum treatment in Java is deprecated "
-    "and is scheduled to be removed in editio"
-    "n 2025.  Mark enum type on the enum defi"
-    "nitions themselves rather than on fields"
-    ".\022\237\002\n\017utf8_validation\030\002 \001(\0162\037.pb.JavaFea"
-    "tures.Utf8ValidationB\344\001\210\001\001\230\001\004\230\001\001\242\001\014\022\007DEF"
-    "AULT\030\204\007\262\001\310\001\010\350\007\020\351\007\032\277\001The Java-specific ut"
-    "f8 validation feature is deprecated and "
-    "is scheduled to be removed in edition 20"
-    "25.  Utf8 validation behavior should use"
-    " the global cross-language utf8_validati"
-    "on feature.\"F\n\016Utf8Validation\022\033\n\027UTF8_VA"
-    "LIDATION_UNKNOWN\020\000\022\013\n\007DEFAULT\020\001\022\n\n\006VERIF"
-    "Y\020\002:<\n\004java\022\033.google.protobuf.FeatureSet"
-    "\030\351\007 \001(\0132\020.pb.JavaFeaturesB(\n\023com.google."
-    "protobufB\021JavaFeaturesProto"
+    "tor.proto\"\371\004\n\014JavaFeatures\022\376\001\n\022legacy_cl"
+    "osed_enum\030\001 \001(\010B\341\001\210\001\001\230\001\004\230\001\001\242\001\t\022\004true\030\204\007\242"
+    "\001\n\022\005false\030\347\007\262\001\273\001\010\350\007\020\350\007\032\262\001The legacy clos"
+    "ed enum behavior in Java is deprecated a"
+    "nd is scheduled to be removed in edition"
+    " 2025.  See http://protobuf.dev/programm"
+    "ing-guides/enum/#java for more informati"
+    "on.\022\237\002\n\017utf8_validation\030\002 \001(\0162\037.pb.JavaF"
+    "eatures.Utf8ValidationB\344\001\210\001\001\230\001\004\230\001\001\242\001\014\022\007D"
+    "EFAULT\030\204\007\262\001\310\001\010\350\007\020\351\007\032\277\001The Java-specific "
+    "utf8 validation feature is deprecated an"
+    "d is scheduled to be removed in edition "
+    "2025.  Utf8 validation behavior should u"
+    "se the global cross-language utf8_valida"
+    "tion feature.\"F\n\016Utf8Validation\022\033\n\027UTF8_"
+    "VALIDATION_UNKNOWN\020\000\022\013\n\007DEFAULT\020\001\022\n\n\006VER"
+    "IFY\020\002:<\n\004java\022\033.google.protobuf.FeatureS"
+    "et\030\351\007 \001(\0132\020.pb.JavaFeaturesB(\n\023com.googl"
+    "e.protobufB\021JavaFeaturesProto"
 };
 static const ::_pbi::DescriptorTable* const descriptor_table_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_deps[1] =
     {
@@ -110,7 +110,7 @@ static ::absl::once_flag descriptor_table_google_2fprotobuf_2fcompiler_2fjava_2f
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto = {
     false,
     false,
-    827,
+    829,
     descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto,
     "google/protobuf/compiler/java/java_features.proto",
     &descriptor_table_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_once,

src/google/protobuf/compiler/java/lite/enum.cc

@@ -12,12 +12,15 @@
 #include "google/protobuf/compiler/java/lite/enum.h"
 
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_cat.h"
 #include "google/protobuf/compiler/java/context.h"
 #include "google/protobuf/compiler/java/doc_comment.h"
 #include "google/protobuf/compiler/java/helpers.h"
+#include "google/protobuf/compiler/java/internal_helpers.h"
 #include "google/protobuf/compiler/java/name_resolver.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/io/printer.h"
@@ -54,6 +57,8 @@ EnumLiteGenerator::~EnumLiteGenerator() {}
 void EnumLiteGenerator::Generate(io::Printer* printer) {
   WriteEnumDocComment(printer, descriptor_, context_->options());
   MaybePrintGeneratedAnnotation(context_, printer, descriptor_, immutable_api_);
+
+
   printer->Print(
       "$deprecation$public enum $classname$\n"
       "    implements com.google.protobuf.Internal.EnumLite {\n",

src/google/protobuf/compiler/kotlin/BUILD.bazel

@@ -0,0 +1,19 @@
+cc_library(
+    name = "kotlin",
+    srcs = ["generator.cc"],
+    hdrs = ["generator.h"],
+    strip_include_prefix = "/src",
+    visibility = [
+        "//pkg:__pkg__",
+        "//src/google/protobuf/compiler:__pkg__",
+    ],
+    deps = [
+        "//src/google/protobuf",
+        "//src/google/protobuf:port",
+        "//src/google/protobuf/compiler:code_generator",
+        "//src/google/protobuf/compiler/java",
+        "//src/google/protobuf/compiler/java:helpers",
+        "//src/google/protobuf/io:printer",
+        "@com_google_absl//absl/strings",
+    ],
+)

src/google/protobuf/compiler/kotlin/README.md

@@ -0,0 +1,16 @@
+
+# Kotlin DSL Generator
+
+This code generator implements the Kotlin DSL. The Kotlin DSL sits on top of
+another proto implementation (written in Java or Kotlin) and adds convenient
+support for building proto messages using DSL syntax, as documented in
+[Kotlin Generated Code Guide](https://protobuf.dev/reference/kotlin/kotlin-generated/).
+
+This code generator is invoked by passing `--kotlin_out` to `protoc`.
+
+When using Kotlin on the JVM, you will also need to pass `--java_out` to
+generate the Java code that implements the generated classes themselves.
+
+When using Kotlin on other platforms (eg. Kotlin Native), there is currently no
+support for generating message classes, so it is not possible to use the Kotlin
+DSL at this time.

src/google/protobuf/compiler/kotlin/generator.cc

@@ -5,14 +5,20 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "google/protobuf/compiler/java/kotlin_generator.h"
+#include "google/protobuf/compiler/kotlin/generator.h"
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/compiler/java/file.h"
-#include "google/protobuf/compiler/java/generator.h"
 #include "google/protobuf/compiler/java/helpers.h"
 #include "google/protobuf/compiler/java/options.h"
+#include "google/protobuf/io/printer.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/compiler/kotlin/generator.h

@@ -7,10 +7,12 @@
 
 // Generates Kotlin code for a given .proto file.
 
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H__
+#ifndef GOOGLE_PROTOBUF_COMPILER_KOTLIN_GENERATOR_H__
+#define GOOGLE_PROTOBUF_COMPILER_KOTLIN_GENERATOR_H__
 
+#include <cstdint>
 #include <string>
+#include <vector>
 
 #include "google/protobuf/compiler/java/java_features.pb.h"
 #include "google/protobuf/compiler/code_generator.h"
@@ -58,4 +60,4 @@ class PROTOC_EXPORT KotlinGenerator : public CodeGenerator {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H__
+#endif  // GOOGLE_PROTOBUF_COMPILER_KOTLIN_GENERATOR_H__

src/google/protobuf/compiler/main.cc

@@ -10,7 +10,7 @@
 #include "google/protobuf/compiler/cpp/generator.h"
 #include "google/protobuf/compiler/csharp/csharp_generator.h"
 #include "google/protobuf/compiler/java/generator.h"
-#include "google/protobuf/compiler/java/kotlin_generator.h"
+#include "google/protobuf/compiler/kotlin/generator.h"
 #include "google/protobuf/compiler/objectivec/generator.h"
 #include "google/protobuf/compiler/php/php_generator.h"
 #include "google/protobuf/compiler/python/generator.h"

src/google/protobuf/compiler/rust/accessors/repeated_field.cc

@@ -114,7 +114,7 @@ void RepeatedField::InMsgImpl(Context& ctx, const FieldDescriptor& field,
                     pub fn set_$raw_field_name$(&mut self, src: impl $pb$::IntoProxied<$pb$::Repeated<$RsType$>>) {
                       let minitable_field = unsafe {
                         $pbr$::upb_MiniTable_FindFieldByNumber(
-                          <Self as $pbr$::AssociatedMiniTable>::MINI_TABLE,
+                          <Self as $pbr$::AssociatedMiniTable>::mini_table(),
                           $field_number$
                         )
                       };

src/google/protobuf/compiler/rust/generator.cc

@@ -177,15 +177,6 @@ bool RustGenerator::Generate(const FileDescriptor* file,
       {"Phantom", "::__std::marker::PhantomData"},
   });
 
-  // On upb we need to enable this feature to be able to have const pointers to
-  // upb_MiniTables while using the upb C minitable codegen. This
-  // feature appears that it'll imminently be considered stabilized
-  // (https://github.com/rust-lang/rust/issues/128183), and if we emit the
-  // MiniTables as const directly in .rs rather than using the upb minitable .h
-  // this could be avoided regardless.
-  if (ctx.is_upb() && file == &rust_generator_context.primary_file()) {
-    ctx.Emit("#![feature(const_refs_to_static)]\n");
-  }
 
   ctx.Emit({{"kernel", KernelRsName(ctx.opts().kernel)}}, R"rs(
     extern crate protobuf_$kernel$ as __pb;

src/google/protobuf/compiler/rust/message.cc

@@ -80,7 +80,7 @@ void MessageSerialize(Context& ctx, const Descriptor& msg) {
         // SAFETY: `MINI_TABLE` is the one associated with `self.raw_msg()`.
         let encoded = unsafe {
           $pbr$::wire::encode(self.raw_msg(),
-              <Self as $pbr$::AssociatedMiniTable>::MINI_TABLE)
+              <Self as $pbr$::AssociatedMiniTable>::mini_table())
         };
         //~ TODO: This discards the info we have about the reason
         //~ of the failure, we should try to keep it instead.
@@ -102,12 +102,11 @@ void MessageMutClear(Context& ctx, const Descriptor& msg) {
       return;
     case Kernel::kUpb:
       ctx.Emit(
-          {
-              {"minitable", UpbMinitableName(msg)},
-          },
           R"rs(
           unsafe {
-            $pbr$::upb_Message_Clear(self.raw_msg(), $std$::ptr::addr_of!($minitable$))
+            $pbr$::upb_Message_Clear(
+                self.raw_msg(),
+                <Self as $pbr$::AssociatedMiniTable>::mini_table())
           }
         )rs");
       return;
@@ -148,7 +147,7 @@ void MessageClearAndParse(Context& ctx, const Descriptor& msg) {
           $pbr$::wire::decode(
               data,
               msg.raw_msg(),
-              <Self as $pbr$::AssociatedMiniTable>::MINI_TABLE,
+              <Self as $pbr$::AssociatedMiniTable>::mini_table(),
               msg.arena())
         };
         match status {
@@ -183,7 +182,7 @@ void MessageDebug(Context& ctx, const Descriptor& msg) {
         let string = unsafe {
           $pbr$::debug_string(
             self.raw_msg(),
-            <Self as $pbr$::AssociatedMiniTable>::MINI_TABLE
+            <Self as $pbr$::AssociatedMiniTable>::mini_table()
           )
         };
         write!(f, "{}", string)
@@ -297,7 +296,7 @@ void IntoProxiedForMessage(Context& ctx, const Descriptor& msg) {
             unsafe { $pbr$::upb_Message_DeepCopy(
               dst.inner.msg,
               self.msg,
-              <Self as $pbr$::AssociatedMiniTable>::MINI_TABLE,
+              <Self as $pbr$::AssociatedMiniTable>::mini_table(),
               dst.inner.arena.raw(),
             ) };
             dst
@@ -319,16 +318,25 @@ void IntoProxiedForMessage(Context& ctx, const Descriptor& msg) {
 void UpbGeneratedMessageTraitImpls(Context& ctx, const Descriptor& msg) {
   if (ctx.opts().kernel == Kernel::kUpb) {
     ctx.Emit({{"minitable", UpbMinitableName(msg)}}, R"rs(
-      unsafe impl $pbr$::AssociatedMiniTable for $Msg$ {
-        const MINI_TABLE: *const $pbr$::upb_MiniTable = unsafe { $std$::ptr::addr_of!($minitable$) };
+      impl $pbr$::AssociatedMiniTable for $Msg$ {
+        #[inline(always)]
+        unsafe fn mini_table() -> *const $pbr$::upb_MiniTable {
+          $std$::ptr::addr_of!($minitable$)
+        }
       }
 
-      unsafe impl $pbr$::AssociatedMiniTable for $Msg$View<'_> {
-        const MINI_TABLE: *const $pbr$::upb_MiniTable = unsafe { $std$::ptr::addr_of!($minitable$) };
+      impl $pbr$::AssociatedMiniTable for $Msg$View<'_> {
+        #[inline(always)]
+        unsafe fn mini_table() -> *const $pbr$::upb_MiniTable {
+          $std$::ptr::addr_of!($minitable$)
+        }
       }
 
-      unsafe impl $pbr$::AssociatedMiniTable for $Msg$Mut<'_> {
-        const MINI_TABLE: *const $pbr$::upb_MiniTable = unsafe { $std$::ptr::addr_of!($minitable$) };
+      impl $pbr$::AssociatedMiniTable for $Msg$Mut<'_> {
+        #[inline(always)]
+        unsafe fn mini_table() -> *const $pbr$::upb_MiniTable {
+          $std$::ptr::addr_of!($minitable$)
+        }
       }
     )rs");
   }
@@ -362,7 +370,7 @@ void MessageMutMergeFrom(Context& ctx, const Descriptor& msg) {
                 assert!(
                   $pbr$::upb_Message_MergeFrom(self.raw_msg(),
                     src.as_view().raw_msg(),
-                    <Self as $pbr$::AssociatedMiniTable>::MINI_TABLE,
+                    <Self as $pbr$::AssociatedMiniTable>::mini_table(),
                     // Use a nullptr for the ExtensionRegistry.
                     $std$::ptr::null(),
                     self.arena().raw())
@@ -568,7 +576,7 @@ void MessageProxiedInRepeated(Context& ctx, const Descriptor& msg) {
               // SAFETY:
               // - Elements of `src` and `dest` have message minitable `MINI_TABLE`.
               unsafe {
-                $pbr$::repeated_message_copy_from(src, dest, <Self as $pbr$::AssociatedMiniTable>::MINI_TABLE);
+                $pbr$::repeated_message_copy_from(src, dest, <Self as $pbr$::AssociatedMiniTable>::mini_table());
               }
           }