Removed the third_party/upb/upb/bazel directory.

We are absorbing its contents into other directories. This will reduce the 3:1 merge to `upb/bazel` in GitHub to 2:1 (soon to be 1:1).

PiperOrigin-RevId: 860299666

bazel/BUILD.bazel

@@ -52,18 +52,6 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "upb_proto_library_bzl",
-    srcs = [
-        "upb_c_proto_library.bzl",
-        "upb_minitable_proto_library.bzl",
-        "upb_proto_library.bzl",
-        "upb_proto_reflection_library.bzl",
-    ],
-    visibility = ["//visibility:public"],
-    deps = ["//bazel/private:upb_proto_library_internal_bzl"],
-)
-
 bzl_library(
     name = "proto_descriptor_set_bzl",
     srcs = ["proto_descriptor_set.bzl"],

bazel/private/BUILD

@@ -28,22 +28,6 @@ toolchain_type(
     visibility = ["//visibility:public"],
 )
 
-bzl_library(
-    name = "upb_proto_library_internal_bzl",
-    srcs = [
-        "upb_proto_library_internal/aspect.bzl",
-        "upb_proto_library_internal/cc_library_func.bzl",
-        "upb_proto_library_internal/copts.bzl",
-        "upb_proto_library_internal/rule.bzl",
-    ],
-    visibility = ["//bazel:__pkg__"],
-    deps = [
-        "//bazel/common:proto_common_bzl",
-        "@bazel_skylib//lib:paths",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
-    ],
-)
-
 bzl_library(
     name = "native_bzl",
     srcs = [

benchmarks/BUILD

@@ -9,9 +9,9 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_python//python:defs.bzl", "py_binary")
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:proto_library.bzl", "proto_library")
-load("//bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
+load("//upb/bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_c_proto_library",
     "upb_proto_reflection_library",
 )

editions/BUILD

@@ -9,7 +9,7 @@ load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("//bazel:java_proto_library.bzl", "java_proto_library")
 load("//bazel:proto_library.bzl", "proto_library")
-load("//bazel:upb_proto_library.bzl", "upb_c_proto_library", "upb_proto_reflection_library")
+load("//upb/bazel:upb_proto_library.bzl", "upb_c_proto_library", "upb_proto_reflection_library")
 load(":defaults.bzl", "compile_edition_defaults", "embed_edition_defaults")
 
 bzl_library(

hpb/bazel/BUILD

@@ -16,8 +16,8 @@ bzl_library(
     srcs = ["hpb_proto_library.bzl"],
     visibility = ["//visibility:public"],
     deps = [
-        "//bazel:upb_proto_library_bzl",
         "//bazel/common:proto_common_bzl",
+        "//upb/bazel:upb_proto_library_bzl",
         "@bazel_skylib//lib:paths",
         "@bazel_tools//tools/cpp:toolchain_utils.bzl",
     ],

hpb/bazel/hpb_proto_library.bzl

@@ -12,10 +12,10 @@
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "use_cpp_toolchain")
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
-load("//bazel:upb_proto_library.bzl", "GeneratedSrcsInfo", "UpbWrappedCcInfo", "upb_proto_library_aspect")
 load("//bazel/common:proto_common.bzl", "proto_common")
 load("//bazel/common:proto_info.bzl", "ProtoInfo")
-load("//bazel/private:upb_proto_library_internal/cc_library_func.bzl", "cc_library_func")  # buildifier: disable=bzl-visibility
+load("//upb/bazel:upb_proto_library.bzl", "GeneratedSrcsInfo", "UpbWrappedCcInfo", "upb_proto_library_aspect")
+load("//upb/bazel/private:upb_proto_library_internal/cc_library_func.bzl", "cc_library_func")  # buildifier: disable=bzl-visibility
 
 def upb_use_cpp_toolchain():
     return use_cpp_toolchain()

hpb_generator/tests/BUILD

@@ -12,17 +12,17 @@ load(
 )
 load("//bazel:proto_library.bzl", "proto_library")
 load(
-    "//bazel:upb_minitable_proto_library.bzl",
+    "//hpb/bazel:hpb_proto_library.bzl",
+    "hpb_proto_library",
+)
+load(
+    "//upb/bazel:upb_minitable_proto_library.bzl",
     "upb_minitable_proto_library",
 )
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_c_proto_library",
 )
-load(
-    "//hpb/bazel:hpb_proto_library.bzl",
-    "hpb_proto_library",
-)
 
 package(default_applicable_licenses = ["//:license"])
 

lua/BUILD.bazel

@@ -14,7 +14,7 @@ load(
     "lua_proto_library",
 )
 load(
-    "//upb/bazel:build_defs.bzl",
+    "//upb/bazel:copts.bzl",
     "UPB_DEFAULT_COPTS",
     "UPB_DEFAULT_CPPOPTS",
 )

python/BUILD.bazel

@@ -8,7 +8,7 @@
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
 load("//python:build_targets.bzl", "build_targets")
 load("//python:py_extension.bzl", "py_extension")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 build_targets(name = "python")
 

src/google/protobuf/BUILD.bazel

@@ -6,14 +6,14 @@ 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(
     "//bazel/tests:protobuf_test_proto_library.bzl",
     "protobuf_test_proto_library",
 )
 load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS")
+load("//upb/bazel:upb_c_proto_library.bzl", "upb_c_proto_library")
+load("//upb/bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
+load("//upb/bazel:upb_proto_reflection_library.bzl", "upb_proto_reflection_library")
 load("//upb/cmake:build_defs.bzl", "staleness_test")
 
 package(

src/google/protobuf/compiler/BUILD.bazel

@@ -7,14 +7,13 @@ load(
     "@rules_pkg//pkg:mappings.bzl",
     "pkg_attributes",
     "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_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("//upb/bazel:upb_c_proto_library.bzl", "upb_c_proto_library")
+load("//upb/bazel:upb_proto_reflection_library.bzl", "upb_proto_reflection_library")
 load(
     "//upb_generator:bootstrap_compiler.bzl",
     "bootstrap_cc_library",

upb/BUILD

@@ -8,9 +8,9 @@
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:defs.bzl", "py_binary")
-load("//bazel/private:upb_proto_library_internal/copts.bzl", "upb_proto_library_copts")
-load("//upb/bazel:amalgamation.bzl", "upb_amalgamation")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel/private:upb_proto_library_internal/copts.bzl", "upb_proto_library_copts")
+load("//upb/bazel/private/oss:amalgamation.bzl", "upb_amalgamation")  # buildifier: disable=bzl-visibility
 
 package(default_applicable_licenses = ["//:license"])
 
@@ -41,7 +41,7 @@ config_setting(
 bool_flag(
     name = "fasttable_enabled",
     build_setting_default = False,
-    visibility = ["//bazel:__pkg__"],
+    visibility = ["//upb/bazel:__pkg__"],
 )
 
 config_setting(
@@ -58,7 +58,7 @@ config_setting(
 upb_proto_library_copts(
     name = "upb_proto_library_copts",
     copts = UPB_DEFAULT_COPTS,
-    visibility = ["//bazel:__pkg__"],
+    visibility = ["//upb/bazel:__pkg__"],
 )
 
 # Please update copy.bara.sky target = ":friends" if

upb/base/BUILD

@@ -7,7 +7,7 @@
 
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/bazel/BUILD

@@ -5,11 +5,28 @@
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
 
-load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@rules_python//python:defs.bzl", "py_binary")
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
-py_binary(
-    name = "amalgamate",
-    srcs = ["amalgamate.py"],
-    visibility = ["//visibility:private"],
+package(default_applicable_licenses = ["//:license"])
+
+licenses(["notice"])
+
+bzl_library(
+    name = "upb_proto_library_bzl",
+    srcs = [
+        "upb_c_proto_library.bzl",
+        "upb_minitable_proto_library.bzl",
+        "upb_proto_library.bzl",
+        "upb_proto_reflection_library.bzl",
+        "visibility.bzl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//bazel/common:proto_common_bzl",
+        "//bazel/common:proto_info_bzl",
+        "//upb/bazel/private:upb_proto_library_internal_bzl",
+        "@rules_cc//cc/common",
+    ],
 )

upb/bazel/copts.bzl

@@ -0,0 +1,60 @@
+# Copyright (c) 2009-2021, 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
+
+"""Common copts for building upb."""
+
+visibility([
+    "//lua/...",
+    "//python/...",
+    "//upb/...",
+    "//upb_generator/...",
+])
+
+_DEFAULT_CPPOPTS = []
+_DEFAULT_COPTS = [
+    # this is a compile error in C++ clang and GNU C, but not clang C by default
+    "-Werror=incompatible-pointer-types",
+    # GCC does not seem to support the no_sanitize attribute in some places
+    # where we use it.
+    "-Wno-error=attributes",
+]
+
+_DEFAULT_CPPOPTS.extend([
+    "-Wextra",
+    # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
+    "-Wno-unused-parameter",
+    "-Wno-long-long",
+])
+_DEFAULT_COPTS.extend([
+    "-std=c99",
+    "-Wall",
+    "-Wstrict-prototypes",
+    # GCC (at least) emits spurious warnings for this that cannot be fixed
+    # without introducing redundant initialization (with runtime cost):
+    #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
+    #"-Wno-maybe-uninitialized",
+])
+
+UPB_DEFAULT_CPPOPTS = select({
+    "//upb:windows": [],
+    "//conditions:default": _DEFAULT_CPPOPTS,
+}) + select({
+    "//upb:fasttable_enabled_setting": ["-DUPB_ENABLE_FASTTABLE"],
+    "//conditions:default": [],
+}) + select({
+    "//conditions:default": [],
+})
+
+UPB_DEFAULT_COPTS = select({
+    "//upb:windows": [],
+    "//conditions:default": _DEFAULT_COPTS,
+}) + select({
+    "//upb:fasttable_enabled_setting": ["-DUPB_ENABLE_FASTTABLE"],
+    "//conditions:default": [],
+}) + select({
+    "//conditions:default": [],
+})

upb/bazel/private/BUILD

@@ -0,0 +1,28 @@
+# Copyright (c) 2009-2021, 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
+
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_skylib//lib:selects.bzl", "selects")
+
+bzl_library(
+    name = "upb_proto_library_internal_bzl",
+    srcs = [
+        "upb_proto_library_internal/aspect.bzl",
+        "upb_proto_library_internal/cc_library_func.bzl",
+        "upb_proto_library_internal/copts.bzl",
+        "upb_proto_library_internal/rule.bzl",
+    ],
+    visibility = [
+        "//upb/bazel:__pkg__",
+    ],
+    deps = [
+        "//bazel/common:proto_common_bzl",
+        "//bazel/common:proto_info_bzl",
+        "@bazel_skylib//lib:paths",
+        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
+    ],
+)

upb/bazel/private/oss/BUILD

@@ -0,0 +1,15 @@
+# Copyright (c) 2009-2021, 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
+
+load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@rules_python//python:defs.bzl", "py_binary")
+
+py_binary(
+    name = "amalgamate",
+    srcs = ["amalgamate.py"],
+    visibility = ["//visibility:private"],
+)

upb/bazel/private/oss/amalgamate.py

@@ -30,17 +30,20 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import sys
-import re
 import os
+import re
+import sys
 
 INCLUDE_RE = re.compile('^#include "([^"]*)"')
 
+
 def parse_include(line):
   match = INCLUDE_RE.match(line)
   return match.groups()[0] if match else None
 
+
 class Amalgamator:
+
   def __init__(self, h_out, c_out):
     self.include_paths = ["."]
     self.included = set()
@@ -52,6 +55,7 @@ class Amalgamator:
     self.h_files = set(h_files)
     self.output_c.write("/* Amalgamated source file */\n")
     self.output_c.write('#include "%s"\n' % (self.h_out))
+
     self.output_h.write("/* Amalgamated source file */\n")
 
     port_def = self._find_include_file("upb/port/def.inc")
@@ -99,7 +103,9 @@ class Amalgamator:
         or include.startswith("google")
     ):
       return False
-    if include and (include.endswith("port/def.inc") or include.endswith("port/undef.inc")):
+    if include and (
+        include.endswith("port/def.inc") or include.endswith("port/undef.inc")
+    ):
       # Skip, we handle this separately
       return True
     if include.endswith("hpp"):
@@ -120,7 +126,13 @@ class Amalgamator:
         self.included.add(include)
         self._process_file(h_file, self.output_h)
         return True
-      raise RuntimeError("Couldn't find include: " + include + ", h_files=" + repr(self.h_files))
+      raise RuntimeError(
+          "Couldn't find include: "
+          + include
+          + ", h_files="
+          + repr(self.h_files)
+      )
+
 
 # ---- main ----
 

upb/bazel/private/oss/amalgamation.bzl

@@ -7,7 +7,7 @@
 
 """Internal rules for building upb."""
 
-load("//bazel:upb_proto_library.bzl", "GeneratedSrcsInfo")
+load("//upb/bazel:upb_proto_library.bzl", "GeneratedSrcsInfo")
 
 # upb_amalgamation() rule, with file_list aspect.
 
@@ -54,7 +54,7 @@ upb_amalgamation = rule(
         "_amalgamator": attr.label(
             executable = True,
             cfg = "exec",
-            default = "//upb/bazel:amalgamate",
+            default = "//upb/bazel/private/oss:amalgamate",
         ),
         "prefix": attr.string(
             default = "",

upb/bazel/upb_c_proto_library.bzl

@@ -1,12 +1,12 @@
 """upb_c_proto_library() exposes upb's generated C API for protobuf (foo.upb.h)"""
 
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
-load("//bazel:upb_minitable_proto_library.bzl", "UpbMinitableCcInfo", "upb_minitable_proto_library_aspect")
-load("//bazel:visibility.bzl", "upb_clients")
 load("//bazel/common:proto_info.bzl", "ProtoInfo")
-load("//bazel/private:upb_proto_library_internal/aspect.bzl", "upb_proto_aspect_impl")
-load("//bazel/private:upb_proto_library_internal/cc_library_func.bzl", "upb_use_cpp_toolchain")
-load("//bazel/private:upb_proto_library_internal/rule.bzl", "upb_proto_rule_impl")
+load("//upb/bazel:upb_minitable_proto_library.bzl", "UpbMinitableCcInfo", "upb_minitable_proto_library_aspect")
+load("//upb/bazel:visibility.bzl", "upb_clients")
+load("//upb/bazel/private:upb_proto_library_internal/aspect.bzl", "upb_proto_aspect_impl")
+load("//upb/bazel/private:upb_proto_library_internal/cc_library_func.bzl", "upb_use_cpp_toolchain")
+load("//upb/bazel/private:upb_proto_library_internal/rule.bzl", "upb_proto_rule_impl")
 
 visibility(upb_clients)
 

upb/bazel/upb_minitable_proto_library.bzl

@@ -2,11 +2,11 @@
 
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
-load("//bazel:visibility.bzl", "upb_clients")
 load("//bazel/common:proto_info.bzl", "ProtoInfo")
-load("//bazel/private:upb_proto_library_internal/aspect.bzl", "upb_proto_aspect_impl")
-load("//bazel/private:upb_proto_library_internal/cc_library_func.bzl", "upb_use_cpp_toolchain")
-load("//bazel/private:upb_proto_library_internal/rule.bzl", "upb_proto_rule_impl")
+load("//upb/bazel:visibility.bzl", "upb_clients")
+load("//upb/bazel/private:upb_proto_library_internal/aspect.bzl", "upb_proto_aspect_impl")
+load("//upb/bazel/private:upb_proto_library_internal/cc_library_func.bzl", "upb_use_cpp_toolchain")
+load("//upb/bazel/private:upb_proto_library_internal/rule.bzl", "upb_proto_rule_impl")
 
 visibility(upb_clients)
 

upb/bazel/upb_proto_library.bzl

@@ -11,18 +11,18 @@
 """
 
 load(
-    "//bazel:upb_c_proto_library.bzl",
+    "//upb/bazel:upb_c_proto_library.bzl",
     _UpbWrappedCcInfo = "UpbWrappedCcInfo",
     _upb_c_proto_library = "upb_c_proto_library",
     _upb_c_proto_library_aspect = "upb_c_proto_library_aspect",
 )
 load(
-    "//bazel:upb_proto_reflection_library.bzl",
+    "//upb/bazel:upb_proto_reflection_library.bzl",
     _upb_proto_reflection_library = "upb_proto_reflection_library",
 )
-load("//bazel:visibility.bzl", "upb_clients")
+load("//upb/bazel:visibility.bzl", "upb_clients")
 load(
-    "//bazel/private:upb_proto_library_internal/aspect.bzl",
+    "//upb/bazel/private:upb_proto_library_internal/aspect.bzl",
     _GeneratedSrcsInfo = "GeneratedSrcsInfo",
 )
 

upb/bazel/upb_proto_reflection_library.bzl

@@ -1,13 +1,13 @@
 """upb_c_proto_reflection_library() exposes upb reflection for protobuf (foo.upbdefs.h)"""
 
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
-load("//bazel:upb_minitable_proto_library.bzl", "UpbMinitableCcInfo", "upb_minitable_proto_library_aspect")
-load("//bazel:visibility.bzl", "upb_clients")
 load("//bazel/common:proto_common.bzl", "proto_common")
 load("//bazel/common:proto_info.bzl", "ProtoInfo")
-load("//bazel/private:upb_proto_library_internal/aspect.bzl", "upb_proto_aspect_impl")
-load("//bazel/private:upb_proto_library_internal/cc_library_func.bzl", "upb_use_cpp_toolchain")
-load("//bazel/private:upb_proto_library_internal/rule.bzl", "upb_proto_rule_impl")
+load("//upb/bazel:upb_minitable_proto_library.bzl", "UpbMinitableCcInfo", "upb_minitable_proto_library_aspect")
+load("//upb/bazel:visibility.bzl", "upb_clients")
+load("//upb/bazel/private:upb_proto_library_internal/aspect.bzl", "upb_proto_aspect_impl")
+load("//upb/bazel/private:upb_proto_library_internal/cc_library_func.bzl", "upb_use_cpp_toolchain")
+load("//upb/bazel/private:upb_proto_library_internal/rule.bzl", "upb_proto_rule_impl")
 
 visibility(upb_clients)
 

upb/conformance/BUILD

@@ -7,16 +7,13 @@
 
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_shell//shell:sh_test.bzl", "sh_test")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
-load(
-    "//upb/bazel:build_defs.bzl",
-    "UPB_DEFAULT_COPTS",
-    "make_shell_script",
-)
+load(":build_defs.bzl", "make_shell_script")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/conformance/build_defs.bzl

@@ -7,51 +7,6 @@
 
 """Internal rules for building upb."""
 
-_DEFAULT_CPPOPTS = []
-_DEFAULT_COPTS = [
-    # this is a compile error in C++ clang and GNU C, but not clang C by default
-    "-Werror=incompatible-pointer-types",
-    # GCC does not seem to support the no_sanitize attribute in some places
-    # where we use it.
-    "-Wno-error=attributes",
-]
-
-_DEFAULT_CPPOPTS.extend([
-    "-Wextra",
-    # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
-    "-Wno-unused-parameter",
-    "-Wno-long-long",
-])
-_DEFAULT_COPTS.extend([
-    "-std=c99",
-    "-Wall",
-    "-Wstrict-prototypes",
-    # GCC (at least) emits spurious warnings for this that cannot be fixed
-    # without introducing redundant initialization (with runtime cost):
-    #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
-    #"-Wno-maybe-uninitialized",
-])
-
-UPB_DEFAULT_CPPOPTS = select({
-    "//upb:windows": [],
-    "//conditions:default": _DEFAULT_CPPOPTS,
-}) + select({
-    "//upb:fasttable_enabled_setting": ["-DUPB_ENABLE_FASTTABLE"],
-    "//conditions:default": [],
-}) + select({
-    "//conditions:default": [],
-})
-
-UPB_DEFAULT_COPTS = select({
-    "//upb:windows": [],
-    "//conditions:default": _DEFAULT_COPTS,
-}) + select({
-    "//upb:fasttable_enabled_setting": ["-DUPB_ENABLE_FASTTABLE"],
-    "//conditions:default": [],
-}) + select({
-    "//conditions:default": [],
-})
-
 runfiles_init = """\
 # --- begin runfiles.bash initialization v2 ---
 # Copy-pasted from the Bazel Bash runfiles library v2.

upb/hash/BUILD

@@ -7,7 +7,7 @@
 
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/json/BUILD

@@ -3,12 +3,12 @@
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:proto_library.bzl", "proto_library")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/lex/BUILD

@@ -7,7 +7,7 @@
 
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/mem/BUILD

@@ -7,7 +7,7 @@
 
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/message/BUILD

@@ -9,16 +9,16 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:proto_library.bzl", "proto_library")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS", "UPB_DEFAULT_CPPOPTS")
 load(
-    "//bazel:upb_minitable_proto_library.bzl",
+    "//upb/bazel:upb_minitable_proto_library.bzl",
     "upb_minitable_proto_library",
 )
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS", "UPB_DEFAULT_CPPOPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/mini_descriptor/BUILD

@@ -1,7 +1,7 @@
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load(
-    "//upb/bazel:build_defs.bzl",
+    "//upb/bazel:copts.bzl",
     "UPB_DEFAULT_COPTS",
     "UPB_DEFAULT_CPPOPTS",
 )

upb/mini_table/BUILD

@@ -10,12 +10,12 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:proto_library.bzl", "proto_library")
 load(
-    "//bazel:upb_minitable_proto_library.bzl",
-    "upb_minitable_proto_library",
+    "//upb/bazel:copts.bzl",
+    "UPB_DEFAULT_COPTS",
 )
 load(
-    "//upb/bazel:build_defs.bzl",
-    "UPB_DEFAULT_COPTS",
+    "//upb/bazel:upb_minitable_proto_library.bzl",
+    "upb_minitable_proto_library",
 )
 load(
     "//upb/cmake:build_defs.bzl",

upb/port/BUILD

@@ -6,7 +6,7 @@
 # https://developers.google.com/open-source/licenses/bsd
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/reflection/BUILD

@@ -12,7 +12,7 @@ load(
     "compile_edition_defaults",
     "embed_edition_defaults",
 )
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 load(
     "//upb/cmake:build_defs.bzl",
     "staleness_test",

upb/test/BUILD

@@ -9,18 +9,18 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:proto_library.bzl", "proto_library")
 load(
-    "//bazel:upb_minitable_proto_library.bzl",
+    "//upb/bazel:copts.bzl",
+    "UPB_DEFAULT_CPPOPTS",
+)
+load(
+    "//upb/bazel:upb_minitable_proto_library.bzl",
     "upb_minitable_proto_library",
 )
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
-load(
-    "//upb/bazel:build_defs.bzl",
-    "UPB_DEFAULT_CPPOPTS",
-)
 
 package(default_applicable_licenses = ["//:license"])
 

upb/text/BUILD

@@ -7,7 +7,7 @@
 
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/util/BUILD

@@ -2,7 +2,7 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:proto_library.bzl", "proto_library")
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_c_proto_library",
     "upb_proto_reflection_library",
 )

upb/wire/BUILD

@@ -8,7 +8,7 @@
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS", "UPB_DEFAULT_CPPOPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS", "UPB_DEFAULT_CPPOPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/wire/decode_fast/BUILD

@@ -9,7 +9,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_COPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb/wire/test_util/BUILD

@@ -6,7 +6,7 @@
 # https://developers.google.com/open-source/licenses/bsd
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_CPPOPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_CPPOPTS")
 
 package(default_applicable_licenses = ["//:license"])
 

upb_generator/BUILD

@@ -6,7 +6,7 @@
 # https://developers.google.com/open-source/licenses/bsd
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_CPPOPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_CPPOPTS")
 load(
     "//upb_generator:bootstrap_compiler.bzl",
     "bootstrap_cc_library",

upb_generator/bootstrap_compiler.bzl

@@ -3,11 +3,11 @@
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load(
-    "//bazel:upb_minitable_proto_library.bzl",
+    "//upb/bazel:upb_minitable_proto_library.bzl",
     "upb_minitable_proto_library",
 )
 load(
-    "//bazel:upb_proto_library.bzl",
+    "//upb/bazel:upb_proto_library.bzl",
     "upb_proto_library",
 )
 load(

upb_generator/c/BUILD

@@ -8,7 +8,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
 load(
-    "//upb/bazel:build_defs.bzl",
+    "//upb/bazel:copts.bzl",
     "UPB_DEFAULT_CPPOPTS",
 )
 load("//upb_generator:bootstrap_compiler.bzl", "bootstrap_cc_binary")
@@ -87,5 +87,5 @@ proto_lang_toolchain(
     plugin_format_flag = "--plugin=protoc-gen-upb=%s",
     progress_message = "Generating upb protos",
     runtime = "//upb:generated_code_support",
-    visibility = ["//bazel:__pkg__"],
+    visibility = ["//upb/bazel:__pkg__"],
 )

upb_generator/minitable/BUILD

@@ -7,7 +7,7 @@
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_CPPOPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_CPPOPTS")
 load(
     "//upb_generator:bootstrap_compiler.bzl",
     "bootstrap_cc_binary",
@@ -129,5 +129,5 @@ proto_lang_toolchain(
     plugin_format_flag = "--plugin=protoc-gen-upb_minitable=%s",
     progress_message = "Generating upb minitables",
     runtime = "//upb:generated_code_support",
-    visibility = ["//bazel:__pkg__"],
+    visibility = ["//upb/bazel:__pkg__"],
 )

upb_generator/reflection/BUILD

@@ -8,7 +8,7 @@
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_CPPOPTS")
+load("//upb/bazel:copts.bzl", "UPB_DEFAULT_CPPOPTS")
 
 package(default_applicable_licenses = ["//:license"])
 
@@ -75,5 +75,5 @@ proto_lang_toolchain(
     plugin_format_flag = "--plugin=protoc-gen-upbdefs=%s",
     progress_message = "Generating upb protos",
     runtime = "//upb/reflection:generated_reflection_support",
-    visibility = ["//bazel:__pkg__"],
+    visibility = ["//upb/bazel:__pkg__"],
 )