mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-14 12:38:29 +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
94 lines
3.8 KiB
Plaintext
94 lines
3.8 KiB
Plaintext
// 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-FILE: toolchain/testing/testdata/min_prelude/array.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/interop/cpp/function/export/array.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/interop/cpp/function/export/array.carbon
|
|
|
|
// --- array_value_param.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import Cpp;
|
|
|
|
fn FArrayValueParam(a: array(i32, 5)) -> i32 { return a[2]; }
|
|
|
|
inline Cpp '''
|
|
int GArrayValueParam() {
|
|
int arr[5];
|
|
//@dump-sem-ir-begin
|
|
return Carbon::FArrayValueParam(arr);
|
|
//@dump-sem-ir-end
|
|
}
|
|
|
|
int HArrayValueParam() {
|
|
//@dump-sem-ir-begin
|
|
return Carbon::FArrayValueParam({1, 2, 3, 4, 5});
|
|
//@dump-sem-ir-end
|
|
}
|
|
''';
|
|
|
|
// --- fail_todo_array_var_param.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import Cpp;
|
|
|
|
// We do not currently support C++ calls to functions with by-var array
|
|
// parameters, as C++ does not have such parameters.
|
|
// TODO: Support this, perhaps using Clang's `ArrayParameterType`, which is an
|
|
// HLSL extension, or by mapping to a `std::array` parameter.
|
|
|
|
// TODO: These diagnostics are very bad.
|
|
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+4]]:1-48: error: semantics TODO: `by-var array parameter` [SemanticsTodo]
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+2]]:1-48: error: semantics TODO: `failed to map C++ type to Carbon` [SemanticsTodo]
|
|
// CHECK:STDERR:
|
|
fn FArrayVarParam(var a: array(i32, 5)) -> i32 { return a[2]; }
|
|
|
|
inline Cpp '''
|
|
int GArrayVarParam() {
|
|
//@dump-sem-ir-begin
|
|
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+7]]:10: error: no member named 'FArrayVarParam' in namespace 'Carbon'; did you mean 'GArrayVarParam'? [CppInteropParseError]
|
|
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+6]]:10-31: note: replace with `GArrayVarParam` [CppInteropFixItReplacement]
|
|
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE-4]]:5: note: 'GArrayVarParam' declared here [CppInteropParseNote]
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+3]]:33-47: error: too many arguments to function call, expected 0, have 1 [CppInteropParseError]
|
|
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE-7]]:5: note: 'GArrayVarParam' declared here [CppInteropParseNote]
|
|
// CHECK:STDERR:
|
|
return Carbon::FArrayVarParam({1, 2, 3, 4, 5});
|
|
//@dump-sem-ir-end
|
|
}
|
|
''';
|
|
|
|
// --- fail_todo_array_return.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import Cpp;
|
|
|
|
// We do not currently support C++ calls to functions with array return
|
|
// types, as C++ does not have such return types.
|
|
// TODO: Support this, perhaps by returning a `std::array`.
|
|
|
|
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+2]]:1-36: error: semantics TODO: `array return type` [SemanticsTodo]
|
|
// CHECK:STDERR:
|
|
fn FArrayReturn() -> array(i32, 5) {
|
|
return (1, 2, 3, 4, 5);
|
|
}
|
|
|
|
inline Cpp '''
|
|
int GArrayReturn() {
|
|
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+4]]:16: error: no member named 'FArrayReturn' in namespace 'Carbon'; did you mean 'GArrayReturn'? [CppInteropParseError]
|
|
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+3]]:16-35: note: replace with `GArrayReturn` [CppInteropFixItReplacement]
|
|
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE-3]]:5: note: 'GArrayReturn' declared here [CppInteropParseNote]
|
|
// CHECK:STDERR:
|
|
auto &&arr = Carbon::FArrayReturn();
|
|
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+2]]:13: error: subscripted value is not an array, pointer, or vector [CppInteropParseError]
|
|
// CHECK:STDERR:
|
|
return arr[0];
|
|
}
|
|
''';
|