mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-10 12:28:25 +00:00
Chandler Carruth
2c9739799b
Diagnostic rendering was part of the data model: `Loc::FormatLocation` and `Loc::FormatSnippet` wrote plain text to a stream, so no capability, color, or terminal width could reach them. A diagnostic is now one message with labels, contexts, and location information attached, and `Diagnostics::Renderer` draws it into a `Terminal::Buffer`. The design is in `toolchain/docs/diagnostics_rendering.md` (#7668), authoring in `toolchain/docs/diagnostics.md`. Before: ``` example.carbon:6:3: error: 1 argument passed to function expecting 0 arguments Run0(1); ^~~~~~~ example.carbon:3:1: note: calling function declared here fn Run0() {} ^~~~~~~~~~~ ``` After: ``` error: 1 argument passed to function expecting 0 arguments ╭─┤ example.carbon:6:3 ┆ 3 │ fn Run0() {} · ─────┬───── · ╰──┤ calling function declared here ┆ -> 6 │ Run0(1); · ─────── ╰──────────── ``` `--no-diagnostic-snippets` gives a compact form, `example.carbon:6:3-9`. File tests use it; the rendering tests under `toolchain/diagnostics/testdata` ask for snippets. C++ interop diagnostics are data now rather than text Clang drew: `SemIR::ClangSourceLocId` names a `clang::SourceRange`, and a Clang location is marked as the point it names. `StreamConsumer` moves to a `:renderer` target that `:emitter` does not depend on, keeping `common/terminal` out of `consumer.h`. Capabilities come from the file behind the error stream, so tests get plain ASCII. `renderer_fuzzer` draws diagnostics built from fuzzer bytes with every capability combination, since a shape the renderer doesn't expect must never be why the compiler dies while reporting a problem. TODOs mark the follow-ups: line weights and crossing lines, wrapping that keeps a quoted type whole, and ordering diagnostics that share a byte offset. Also: `IncorrectExtension`'s hint moves into its message, since its note had no location of its own, and `strip_noise` in `check_diagnostics.py` blanks multi-line `#define`s instead of deleting them. Assisted-by: Claude Code
66 lines
2.5 KiB
C++
66 lines
2.5 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "common/exe_path.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/Support/MemoryBuffer.h"
|
|
#include "llvm/Support/VirtualFileSystem.h"
|
|
#include "testing/fuzzing/libfuzzer.h"
|
|
#include "toolchain/driver/driver.h"
|
|
|
|
namespace Carbon::Testing {
|
|
|
|
static const InstallPaths* install_paths = nullptr;
|
|
|
|
// NOLINTNEXTLINE(readability-non-const-parameter): External API required types.
|
|
extern "C" auto LLVMFuzzerInitialize(int* argc, char*** argv) -> int {
|
|
CARBON_CHECK(*argc >= 1, "Need the `argv[0]` value to initialize!");
|
|
install_paths = new InstallPaths(
|
|
InstallPaths::MakeForBazelRunfiles(FindExecutablePath((*argv)[0])));
|
|
return 0;
|
|
}
|
|
|
|
// NOLINTNEXTLINE: Match the documented fuzzer entry point declaration style.
|
|
extern "C" int LLVMFuzzerTestOneInput(const unsigned char* data, size_t size) {
|
|
// Ignore large inputs.
|
|
// TODO: See tokenized_buffer_fuzzer.cpp.
|
|
if (size > 100000) {
|
|
return 0;
|
|
}
|
|
|
|
static constexpr llvm::StringLiteral TestFileName = "test.carbon";
|
|
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> fs =
|
|
new llvm::vfs::InMemoryFileSystem;
|
|
llvm::StringRef data_ref(reinterpret_cast<const char*>(data), size);
|
|
CARBON_CHECK(fs->addFile(
|
|
TestFileName, /*ModificationTime=*/0,
|
|
llvm::MemoryBuffer::getMemBuffer(data_ref, /*BufferName=*/TestFileName,
|
|
/*RequiresNullTerminator=*/false)));
|
|
|
|
llvm::raw_null_ostream null_ostream;
|
|
Driver driver(fs, install_paths, /*input_stream=*/nullptr, &null_ostream,
|
|
&null_ostream, /*error_file=*/{}, /*fuzzing=*/true);
|
|
|
|
// Force Unicode and color output. The output stream isn't a terminal, so
|
|
// diagnostics would otherwise render as plain ASCII without color, and the
|
|
// fuzzer would never reach the renderer's handling of UTF-8 and double-width
|
|
// characters.
|
|
static constexpr llvm::StringLiteral RenderArgs[] = {
|
|
"--terminal-unicode=always", "--color=always"};
|
|
|
|
// TODO: Get checking to a point where it can handle invalid parse trees
|
|
// without crashing.
|
|
if (!driver
|
|
.RunCommand({RenderArgs[0], RenderArgs[1], "compile",
|
|
"--phase=parse", TestFileName})
|
|
.success) {
|
|
return 0;
|
|
}
|
|
driver.RunCommand(
|
|
{RenderArgs[0], RenderArgs[1], "compile", "--phase=check", TestFileName});
|
|
return 0;
|
|
}
|
|
|
|
} // namespace Carbon::Testing
|