Files
compiler-explorer/lib/tooling/compiler-dropin-tool.ts
Matt Godbolt ec1ac47033 Fix any types for delayCleanupTemp and toolchainPath (#8409)
## Summary

- Fixed `delayCleanupTemp: any` → `boolean`
- Fixed `toolchainPath: any` → `string | undefined`
- Changed `getToolchainPath()` to return `string | undefined` instead of
`string | false` (more idiomatic TypeScript)
- Fixed a latent bug in `changeOptionsBasedOnOverrides`

### Bug fix details

The bug was introduced in commit 079d49575 ("Compiler overrides #5001")
on May 16, 2023.

The original **correct** code (from commit 86a84f7f6) was:
```typescript
let sysrootPath: string | undefined;
const overriddenToolchainPath = this.getOverridenToolchainPath(overrides);
if (overriddenToolchainPath) {
    sysrootPath = getSysrootByToolchainPath(overriddenToolchainPath);
}
```

The buggy refactor changed it to:
```typescript
const sysrootPath = overriddenToolchainPath ?? 
    getSysrootByToolchainPath(overriddenToolchainPath);
```

This had two issues:
1. **The fallback was never reached**: `false ?? x` returns `false`
because `false` is not nullish (only `null`/`undefined` trigger `??`)
2. **The fallback passed the wrong variable**: It passed
`overriddenToolchainPath` to the fallback, but when the fallback is
needed, that variable would be `false`/`undefined`

Fixed to match the original correct behaviour:
```typescript
const sysrootPath = overriddenToolchainPath
    ? getSysrootByToolchainPath(overriddenToolchainPath)
    : this.toolchainPath
      ? getSysrootByToolchainPath(this.toolchainPath)
      : undefined;
```

The sysroot is now always computed via `getSysrootByToolchainPath()`,
since toolchain paths (e.g. `/opt/compiler-explorer/gcc-7.2.0`) differ
from sysroot paths (e.g.
`/opt/compiler-explorer/gcc-7.2.0/x86_64-pc-linux-gnu/sysroot`).

## Test plan
- [x] `npm run ts-check` passes
- [x] `npm run test-min` passes
- [x] Pre-commit hooks pass

🤖 Generated with [Claude Code](https://claude.ai/code)

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-02 21:31:18 -06:00

130 lines
5.5 KiB
TypeScript

// Copyright (c) 2019, Compiler Explorer Authors
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
import path from 'node:path';
import {splitArguments} from '../../shared/common-utils.js';
import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js';
import {ToolInfo, ToolResult} from '../../types/tool.interfaces.js';
import {OptionsHandlerLibrary} from '../options-handler.js';
import {getToolchainPath} from '../toolchain-utils.js';
import {ToolEnv} from './base-tool.interface.js';
import {BaseTool} from './base-tool.js';
export class CompilerDropinTool extends BaseTool {
static get key() {
return 'compiler-dropin-tool';
}
constructor(toolInfo: ToolInfo, env: ToolEnv) {
super(toolInfo, env);
this.addOptionsToToolArgs = false;
}
getToolchainPath(compilationInfo: CompilationInfo): string | undefined {
return getToolchainPath(compilationInfo.compiler.exe, compilationInfo.compiler.options);
}
getOrderedArguments(
compilationInfo: CompilationInfo,
includeflags: string[],
libOptions: string[],
args?: string[],
sourcefile?: string,
): string[] | false {
// order should be:
// 1) options from the compiler config (compilationInfo.compiler.options)
// 2) includes from the libraries (includeflags)
// 3) options from the tool config (this.tool.options)
// 4) options manually specified in the compiler tab (options)
// 5) flags from the clang-tidy tab
let compileFlags: string[] = [];
const argsToFilterOut = new Set([sourcefile, '-stdlib=libc++']);
const toolchainPath = this.getToolchainPath(compilationInfo);
let compilerOptions = compilationInfo.compiler.options ? splitArguments(compilationInfo.compiler.options) : [];
if (toolchainPath) {
// note: needs toolchain argument twice as the first time its sometimes ignored
compileFlags = compileFlags.concat(['--gcc-toolchain=' + toolchainPath]);
compileFlags = compileFlags.concat(['--gcc-toolchain=' + toolchainPath]);
compilerOptions = compilerOptions.filter(option => {
return !(option.indexOf('--gcc-toolchain=') === 0 || option.indexOf('--gxx-name=') === 0);
});
} else {
return false;
}
compilerOptions = compilerOptions.filter(option => !argsToFilterOut.has(option));
compileFlags = compileFlags.concat(compilerOptions);
compileFlags = compileFlags.concat(includeflags);
const manualCompileFlags = compilationInfo.options.filter((option: string) => !argsToFilterOut.has(option));
compileFlags = compileFlags.concat(manualCompileFlags);
const toolOptions = this.tool.options || [];
compileFlags = compileFlags.concat(toolOptions);
compileFlags = compileFlags.concat(libOptions);
compileFlags = compileFlags.concat(args || []);
const pathFilteredFlags: (string | false)[] = compileFlags.map(option => {
if (option && option.length > 1) {
if (option[0] === '/') {
return false;
}
}
return option;
});
return pathFilteredFlags.filter(Boolean) as string[];
}
override async runTool(
compilationInfo: CompilationInfo,
inputFilepath?: string,
args?: string[],
stdin?: string,
supportedLibraries?: Record<string, OptionsHandlerLibrary>,
): Promise<ToolResult> {
const sourcefile = inputFilepath;
const pathDir = inputFilepath ? path.dirname(inputFilepath) : undefined;
const includeflags = this.getIncludeArguments(compilationInfo.libraries, supportedLibraries || {}, pathDir);
const libOptions = this.getLibraryOptions(compilationInfo.libraries, supportedLibraries || {});
const compileFlags = this.getOrderedArguments(compilationInfo, includeflags, libOptions, args, sourcefile);
if (!compileFlags) {
return new Promise(resolve => {
resolve(this.createErrorResponse('Unable to run tool with selected compiler'));
});
}
return super.runTool(compilationInfo, sourcefile, compileFlags);
}
}