Increase memory limit for 'dbg' CppLink actions to 24g (alternate ver…

…sion). Update the current Blaze build default for 'dbg' compilation mode, to increase CppLink memory limits to 24g, to significantly reduce debug build failures. PiperOrigin-RevId: 698832543 Change-Id: I1ed0c727d369f7a1092f1dd496a681205425fbd4
bazelbuild · Nov 21, 2024 · d52aa7b · d52aa7b
1 parent 6906ba6
commit d52aa7b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
@@ -34,6 +34,7 @@
 import com.google.devtools.build.lib.rules.cpp.CppCompileActionBuilder;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CppFileTypes;
+import com.google.devtools.build.lib.rules.cpp.CppLinkActionBuilder;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
 import net.starlark.java.eval.EvalException;
 import net.starlark.java.eval.Sequence;
@@ -119,6 +120,10 @@ public void finalizeCompileActionBuilder(
     }
   }
 
+  @Override
+  public void finalizeLinkActionBuilder(
+      CppConfiguration configuration, CppLinkActionBuilder actionBuilder) throws EvalException {}
+
   @Override
   public boolean allowIncludeScanning() {
     return true;

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
@@ -867,6 +867,8 @@ public CppLinkAction build() throws EvalException, InterruptedException {
             .addAll(cppConfiguration.getLinkopts())
             .build();
 
+    cppSemantics.finalizeLinkActionBuilder(cppConfiguration, this);
+
     return buildLinkAction(
         linkType.getActionName(),
         /* mnemonic= */ mnemonic == null ? "CppLink" : mnemonic,

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
@@ -47,6 +47,15 @@ void finalizeCompileActionBuilder(
       CppCompileActionBuilder actionBuilder)
       throws EvalException;
 
+  /**
+   * Called before a C++ link action is built.
+   *
+   * <p>Gives the semantics implementation the opportunity to change link actions at the last
+   * minute.
+   */
+  void finalizeLinkActionBuilder(CppConfiguration configuration, CppLinkActionBuilder actionBuilder)
+      throws EvalException;
+
   /**
    * Returns if include scanning is allowed.
    *

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
@@ -54,6 +54,10 @@ public void finalizeCompileActionBuilder(
       FeatureConfiguration featureConfiguration,
       CppCompileActionBuilder actionBuilder) {}
 
+  @Override
+  public void finalizeLinkActionBuilder(
+      CppConfiguration configuration, CppLinkActionBuilder actionBuilder) {}
+
   @Override
   public boolean allowIncludeScanning() {
     return false;