mongodb/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-117641 use output base directly for compiledb (#46797)

Browse Source 
GitOrigin-RevId: 457eb6c6e63dbe160594ab6763b79e2484edb596
This commit is contained in:
Daniel Moody 2026-01-22 13:01:24 -06:00 committed by MongoDB Bot
parent 5abd6d2769
commit 081b72ba74
3 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.bazel
View File

@ -129,6 +129,10 @@ genrule(
srcs = ["compile_commands.json"],
outs = ["compile_commands_done"],
cmd = "echo noop > $(location :compile_commands_done)",
tags = [
"no-cache",
"no-remote-exec",
],
)
# This sets up targets for install-wiredtiger and archive-wiredtiger

101
bazel/wrapper_hook/compiledb.py
View File

@ -48,25 +48,58 @@ def run_pty_command(cmd):
def generate_compiledb(bazel_bin, persistent_compdb, enterprise, atlas):
# compiledb ignores command line args so just make a version rc file in anycase
write_wrapper_hook_bazelrc([])
def rewrite_args(args, out_root_str, external_root_str):
rewritten = []
for arg in args:
if out_root_str and arg.startswith("bazel-out/"):
arg = out_root_str + "/" + arg[len("bazel-out/") :]
elif external_root_str and arg.startswith("external/"):
arg = external_root_str + "/" + arg[len("external/") :]
else:
# Preserve compiler prefixes while rewriting paths.
m = re.match(r"^(/external:I)(bazel-out|external)/(.*)$", arg)
if m:
prefix, root, rest = m.groups()
if root == "bazel-out" and out_root_str:
arg = f"{prefix}{out_root_str}/{rest}"
elif root == "external" and external_root_str:
arg = f"{prefix}{external_root_str}/{rest}"
else:
m = re.match(r"^(-isystem)(bazel-out|external)/(.*)$", arg)
if m:
prefix, root, rest = m.groups()
if root == "bazel-out" and out_root_str:
arg = f"{prefix}{out_root_str}/{rest}"
elif root == "external" and external_root_str:
arg = f"{prefix}{external_root_str}/{rest}"
else:
# Generic: preserve any two-character prefix (e.g. "-I", "/I").
m = re.match(r"^(.{2})(bazel-out|external)/(.*)$", arg)
if m:
prefix, root, rest = m.groups()
if root == "bazel-out" and out_root_str:
arg = f"{prefix}{out_root_str}/{rest}"
elif root == "external" and external_root_str:
arg = f"{prefix}{external_root_str}/{rest}"
rewritten.append(arg)
return rewritten
info_proc = subprocess.run([bazel_bin, "info", "output_base"], capture_output=True, text=True)
if persistent_compdb:
info_proc = subprocess.run(
[bazel_bin, "info", "output_base"], capture_output=True, text=True
)
output_base = pathlib.Path(info_proc.stdout.strip() + "_bazel_compiledb")
os.makedirs(REPO_ROOT / ".compiledb", exist_ok=True)
symlink_prefix = REPO_ROOT / ".compiledb" / "compiledb-"
# Prefer real paths in compile_commands.json (avoid symlink forest paths like
# ".compiledb/compiledb-out/..."). We resolve the symlink targets once and
# substitute those roots when rewriting args.
symlink_out_root = pathlib.Path(f"{symlink_prefix}out")
real_out_root = pathlib.Path(os.path.realpath(symlink_out_root))
# "external" sits alongside "bazel-out" under the execroot.
real_external_root = pathlib.Path(
os.path.realpath(real_out_root / ".." / ".." / ".." / "external")
)
# Use forward slashes consistently in compile_commands.json across platforms.
real_out_root_str = real_out_root.as_posix()
real_external_root_str = real_external_root.as_posix()
else:
output_base = pathlib.Path(info_proc.stdout.strip())
# Prefer real paths in compile_commands.json (avoid symlink forest paths like
# ".compiledb/compiledb-out/..."). Resolve via output_base to avoid symlink prefix.
real_out_root = pathlib.Path(os.path.realpath(output_base / "execroot" / "_main" / "bazel-out"))
real_external_root = pathlib.Path(os.path.realpath(output_base / "external"))
# Use forward slashes consistently in compile_commands.json across platforms.
real_out_root_str = real_out_root.as_posix()
real_external_root_str = real_external_root.as_posix()
compiledb_bazelrc = []
compiledb_config = []
@ -142,39 +175,7 @@ def generate_compiledb(bazel_bin, persistent_compdb, enterprise, atlas):
if persistent_compdb:
# We need to adjust the args so actions can be runnable locally
args = []
for arg in action["arguments"]:
if arg.startswith("bazel-out/"):
arg = real_out_root_str + "/" + arg[len("bazel-out/") :]
elif arg.startswith("external/"):
arg = real_external_root_str + "/" + arg[len("external/") :]
else:
# Preserve compiler prefixes while rewriting paths.
m = re.match(r"^(/external:I)(bazel-out|external)/(.*)$", arg)
if m:
prefix, root, rest = m.groups()
if root == "bazel-out":
arg = f"{prefix}{real_out_root_str}/{rest}"
else:
arg = f"{prefix}{real_external_root_str}/{rest}"
else:
m = re.match(r"^(-isystem)(bazel-out|external)/(.*)$", arg)
if m:
prefix, root, rest = m.groups()
if root == "bazel-out":
arg = f"{prefix}{real_out_root_str}/{rest}"
else:
arg = f"{prefix}{real_external_root_str}/{rest}"
else:
# Generic: preserve any two-character prefix (e.g. "-I", "/I").
m = re.match(r"^(.{2})(bazel-out|external)/(.*)$", arg)
if m:
prefix, root, rest = m.groups()
if root == "bazel-out":
arg = f"{prefix}{real_out_root_str}/{rest}"
else:
arg = f"{prefix}{real_external_root_str}/{rest}"
args.append(arg)
args = rewrite_args(action["arguments"], real_out_root_str, real_external_root_str)
output_json.append(
{
@ -188,7 +189,9 @@ def generate_compiledb(bazel_bin, persistent_compdb, enterprise, atlas):
output_json.append(
{
"file": input_file,
"arguments": action["arguments"],
"arguments": rewrite_args(
action["arguments"], real_out_root_str, real_external_root_str
),
"directory": repo_root_resolved,
"output": output_file,
}

7
etc/evergreen_yml_components/tasks/compile_tasks.yml
View File

@ -366,6 +366,13 @@ tasks:
- func: bazel run
vars:
target: //evergreen:validate_compile_commands
- func: "bazel compile"
vars:
targets: compiledb
bazel_args: --intree_compdb
- func: bazel run
vars:
target: //evergreen:validate_compile_commands
- name: compile_upload_benchmarks
tags: ["assigned_to_jira_team_devprod_build", "auxiliary"]