From 08389c7a7409c658b0c3c3bd5f0261e5f98f1ee2 Mon Sep 17 00:00:00 2001
From: Tomasz Strejczek <tomasz.strejczek@outlook.com>
Date: Tue, 15 Sep 2020 17:04:34 +0200
Subject: [PATCH] Provide MSVC compiler PDB support

---
 cc/private/toolchain/BUILD.windows.tpl        |  1 +
 .../toolchain/windows_cc_toolchain_config.bzl | 45 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/cc/private/toolchain/BUILD.windows.tpl b/cc/private/toolchain/BUILD.windows.tpl
index 66dbafd8..6b5703c1 100644
--- a/cc/private/toolchain/BUILD.windows.tpl
+++ b/cc/private/toolchain/BUILD.windows.tpl
@@ -195,6 +195,7 @@ cc_toolchain_config(
         "objcopy": "wrapper/bin/msvc_nop.bat",
         "objdump": "wrapper/bin/msvc_nop.bat",
         "strip": "wrapper/bin/msvc_nop.bat",
+        "dwp": "wrapper/bin/msvc_nop.bat",
     },
     default_link_flags = ["/MACHINE:X64"],
     dbg_mode_debug_flag = "%{dbg_mode_debug_flag}",
diff --git a/cc/private/toolchain/windows_cc_toolchain_config.bzl b/cc/private/toolchain/windows_cc_toolchain_config.bzl
index f057b8d2..69ea90b6 100644
--- a/cc/private/toolchain/windows_cc_toolchain_config.bzl
+++ b/cc/private/toolchain/windows_cc_toolchain_config.bzl
@@ -533,6 +533,47 @@ def _impl(ctx):
             requires = [feature_set(features = ["dbg"])],
         )
 
+        fission_support_feature = feature(
+            name = "fission_support",
+            flag_sets = [
+                flag_set(
+                    actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile],
+                    flag_groups = [
+                        flag_group(
+                            flags = ["/Zi"],
+                            expand_if_available = "is_using_fission",
+                        ),
+                        flag_group(
+                            flags = ["/Fd%{per_object_debug_info_file}"],
+                            expand_if_available = "per_object_debug_info_file",
+                        ),
+                    ],
+                ),
+            ],
+        )
+
+        per_object_debug_info_feature = feature(
+            name = "per_object_debug_info",
+            flag_sets = [
+                flag_set(
+                    actions = [
+                        ACTION_NAMES.c_compile,
+                        ACTION_NAMES.cpp_compile,
+                    ],
+                    flag_groups = [
+                        flag_group(
+                            flags = ["/Zi"],
+                            expand_if_available = "is_using_fission",
+                        ),
+                        flag_group(
+                            flags = ["/Fd%{per_object_debug_info_file}"],
+                            expand_if_available = "per_object_debug_info_file",
+                        ),
+                    ],
+                ),
+            ],
+        )
+
         dbg_feature = feature(
             name = "dbg",
             flag_sets = [
@@ -549,7 +590,7 @@ def _impl(ctx):
                     ],
                 ),
             ],
-            implies = ["generate_pdb_file"],
+            implies = ["generate_pdb_file", "fission_support", "per_object_debug_info"],
         )
 
         opt_feature = feature(
@@ -1101,6 +1142,8 @@ def _impl(ctx):
             no_windows_export_all_symbols_feature,
             supports_dynamic_linker_feature,
             supports_interface_shared_libraries_feature,
+            fission_support_feature,
+            per_object_debug_info_feature,
         ]
     else:
         targets_windows_feature = feature(