[7.2.0] Combined cc_shared_library cherry-picks

MODULE.bazel

@@ -29,7 +29,7 @@ bazel_dep(name = "rules_graalvm", version = "0.11.1")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 bazel_dep(name = "rules_jvm_external", version = "6.0")
 bazel_dep(name = "rules_python", version = "0.26.0")
-bazel_dep(name = "rules_testing", version = "0.0.4")
+bazel_dep(name = "rules_testing", version = "0.6.0")
 bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest")
 bazel_dep(name = "with_cfg.bzl", version = "0.2.4")
 

src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java

@@ -1056,6 +1056,9 @@ public Object call(StarlarkThread thread, Tuple args, Dict<String, Object> kwarg
       BazelStarlarkContext bazelStarlarkContext = BazelStarlarkContext.fromOrFail(thread);
       try {
         thread.setThreadLocal(BazelStarlarkContext.class, null);
+        // Allow access to the LabelConverter to support native.package_relative_label() in an
+        // initializer.
+        thread.setThreadLocal(LabelConverter.class, pkgContext.getBuilder().getLabelConverter());
         thread.setUncheckedExceptionContext(() -> "an initializer");
 
         // We call all the initializers of the rule and its ancestor rules, proceeding from child to
@@ -1143,6 +1146,7 @@ public Object call(StarlarkThread thread, Tuple args, Dict<String, Object> kwarg
           }
         }
       } finally {
+        thread.setThreadLocal(LabelConverter.class, null);
         bazelStarlarkContext.storeInThread(thread);
       }
 

src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java

@@ -627,13 +627,17 @@ public String repoName(StarlarkThread thread) throws EvalException {
 
   @Override
   public Label packageRelativeLabel(Object input, StarlarkThread thread) throws EvalException {
-    BazelStarlarkContext.checkLoadingPhase(thread, "native.package_relative_label");
-    if (input instanceof Label) {
-      return (Label) input;
+    // In an initializer, BazelStarlarkContext isn't available, just the label converter.
+    LabelConverter labelConverter = thread.getThreadLocal(LabelConverter.class);
+    if (labelConverter == null) {
+      BazelStarlarkContext.checkLoadingPhase(thread, "native.package_relative_label");
+      labelConverter = getContext(thread).getBuilder().getLabelConverter();
+    }
+    if (input instanceof Label inputLabel) {
+      return inputLabel;
     }
     try {
-      String s = (String) input;
-      return getContext(thread).getBuilder().getLabelConverter().convert(s);
+      return labelConverter.convert((String) input);
     } catch (LabelSyntaxException e) {
       throw Starlark.errorf("invalid label in native.package_relative_label: %s", e.getMessage());
     }

src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl

@@ -19,6 +19,7 @@ load(":common/cc/cc_helper.bzl", "cc_helper")
 load(":common/cc/cc_info.bzl", "CcInfo")
 load(":common/cc/cc_shared_library_hint_info.bzl", "CcSharedLibraryHintInfo")
 load(":common/cc/semantics.bzl", "semantics")
+load(":common/paths.bzl", "paths")
 load(":common/proto/proto_info.bzl", "ProtoInfo")
 
 # TODO(#5200): Add export_define to library_to_link and cc_library
@@ -682,6 +683,15 @@ def _cc_shared_library_impl(ctx):
     if ctx.attr.shared_lib_name:
         main_output = ctx.actions.declare_file(ctx.attr.shared_lib_name)
 
+    additional_output_groups = {}
+    pdb_file = None
+    if cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "generate_pdb_file"):
+        if ctx.attr.shared_lib_name:
+            pdb_file = ctx.actions.declare_file(paths.replace_extension(ctx.attr.shared_lib_name, ".pdb"))
+        else:
+            pdb_file = ctx.actions.declare_file(ctx.label.name + ".pdb")
+        additional_output_groups["pdb_file"] = depset([pdb_file])
+
     win_def_file = None
     if cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "targets_windows"):
         object_files = []
@@ -699,6 +709,7 @@ def _cc_shared_library_impl(ctx):
         generated_def_file = None
         if def_parser != None:
             generated_def_file = cc_helper.generate_def_file(ctx, def_parser, object_files, ctx.label.name)
+            additional_output_groups["def_file"] = depset([generated_def_file])
         custom_win_def_file = ctx.file.win_def_file
         win_def_file = cc_helper.get_windows_def_file_for_linking(ctx, custom_win_def_file, generated_def_file, feature_configuration)
 
@@ -714,6 +725,7 @@ def _cc_shared_library_impl(ctx):
         name = ctx.label.name,
         output_type = "dynamic_library",
         main_output = main_output,
+        pdb_file = pdb_file,
         win_def_file = win_def_file,
     )
 
@@ -772,6 +784,7 @@ def _cc_shared_library_impl(ctx):
         OutputGroupInfo(
             main_shared_library_output = depset(library),
             interface_library = depset(interface_library),
+            **additional_output_groups
         ),
         CcSharedLibraryInfo(
             dynamic_deps = merged_cc_shared_library_info,