1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index d48c9f91cb..132c277e82 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -644,6 +644,11 @@ public final class CcCommon {
     allRequestedFeaturesBuilder.addAll(requestedFeatures);
 
     allRequestedFeaturesBuilder.addAll(DEFAULT_ACTION_CONFIGS);
+
+    if (CppHelper.useFission(ruleContext.getFragment(CppConfiguration.class), toolchain)) {
+      allRequestedFeaturesBuilder.add(CppRuleClasses.PER_OBJECT_DEBUG_INFO);
+    }
+
     try {
       FeatureConfiguration configuration =
           toolchain.getFeatures().getFeatureConfiguration(allRequestedFeaturesBuilder.build());