carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename and rearrange entities in tests to avoid name reuse (#7656)

Browse Source 
Fix a bunch of cases where we use the same external name to mean
multiple different things in the same test. We've historically gotten
away with this, but under `--share-cpp-ast`, it becomes an error, at
least if the entity is either defined in, or used from, C++ code.

Assisted-by: Gemini via Antigravity (original change) and Claude Code
(suggested edits in review)

---------

Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
This commit is contained in:
Richard Smith
2026-08-21 01:36:40 +00:00
committed by GitHub
co-authored by Chandler Carruth
parent 6eb900dff5
commit c588eadb57
53 changed files with 7794 additions and 7705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/interop/cpp/function/export/array.carbon
Vendored
+42 -23
View File
@@ -15,19 +15,19 @@ library "[[@TEST_NAME]]";
import Cpp;
fn F(a: array(i32, 5)) -> i32 { return a[2]; }
fn FArrayValueParam(a: array(i32, 5)) -> i32 { return a[2]; }
inline Cpp '''
int G() {
int GArrayValueParam() {
int arr[5];
//@dump-sem-ir-begin
return Carbon::F(arr);
return Carbon::FArrayValueParam(arr);
//@dump-sem-ir-end
}
int H() {
int HArrayValueParam() {
//@dump-sem-ir-begin
return Carbon::F({1, 2, 3, 4, 5});
return Carbon::FArrayValueParam({1, 2, 3, 4, 5});
//@dump-sem-ir-end
}
''';
@@ -44,23 +44,34 @@ import Cpp;
// TODO: These diagnostics are very bad.
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+8]]:1: error: semantics TODO: `by-var array parameter` [SemanticsTodo]
// CHECK:STDERR: fn F(var a: array(i32, 5)) -> i32 { return a[2]; }
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: fn FArrayVarParam(var a: array(i32, 5)) -> i32 { return a[2]; }
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+4]]:1: error: semantics TODO: `failed to map C++ type to Carbon` [SemanticsTodo]
// CHECK:STDERR: fn F(var a: array(i32, 5)) -> i32 { return a[2]; }
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: fn FArrayVarParam(var a: array(i32, 5)) -> i32 { return a[2]; }
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
fn F(var a: array(i32, 5)) -> i32 { return a[2]; }
fn FArrayVarParam(var a: array(i32, 5)) -> i32 { return a[2]; }
inline Cpp '''
int G() {
int GArrayVarParam() {
//@dump-sem-ir-begin
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+4]]:18: error: no member named 'F' in namespace 'Carbon' [CppInteropParseError]
// CHECK:STDERR: 28 | return Carbon::F({1, 2, 3, 4, 5});
// CHECK:STDERR: | ^
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+15]]:10: error: no member named 'FArrayVarParam' in namespace 'Carbon'; did you mean 'GArrayVarParam'? [CppInteropParseError]
// CHECK:STDERR: 39 | return Carbon::FArrayVarParam({1, 2, 3, 4, 5});
// CHECK:STDERR: | ^~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: | GArrayVarParam
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE-6]]:5: note: 'GArrayVarParam' declared here [CppInteropParseNote]
// CHECK:STDERR: 22 | int GArrayVarParam() {
// CHECK:STDERR: | ^
// CHECK:STDERR:
return Carbon::F({1, 2, 3, 4, 5});
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE+7]]:33: error: too many arguments to function call, expected 0, have 1 [CppInteropParseError]
// CHECK:STDERR: 39 | return Carbon::FArrayVarParam({1, 2, 3, 4, 5});
// CHECK:STDERR: | ~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~
// CHECK:STDERR: fail_todo_array_var_param.carbon:[[@LINE-13]]:5: note: 'GArrayVarParam' declared here [CppInteropParseNote]
// CHECK:STDERR: 22 | int GArrayVarParam() {
// CHECK:STDERR: | ^
// CHECK:STDERR:
return Carbon::FArrayVarParam({1, 2, 3, 4, 5});
//@dump-sem-ir-end
}
''';
@@ -75,20 +86,28 @@ import Cpp;
// TODO: Support this, perhaps by returning a `std::array`.
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+4]]:1: error: semantics TODO: `array return type` [SemanticsTodo]
// CHECK:STDERR: fn F() -> array(i32, 5) {
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: fn FArrayReturn() -> array(i32, 5) {
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
fn F() -> array(i32, 5) {
fn FArrayReturn() -> array(i32, 5) {
return (1, 2, 3, 4, 5);
}
inline Cpp '''
int G() {
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+4]]:24: error: no member named 'F' in namespace 'Carbon' [CppInteropParseError]
// CHECK:STDERR: 23 | auto &&arr = Carbon::F();
// CHECK:STDERR: | ^
int GArrayReturn() {
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+8]]:16: error: no member named 'FArrayReturn' in namespace 'Carbon'; did you mean 'GArrayReturn'? [CppInteropParseError]
// CHECK:STDERR: 27 | auto &&arr = Carbon::FArrayReturn();
// CHECK:STDERR: | ^~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: | GArrayReturn
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE-5]]:5: note: 'GArrayReturn' declared here [CppInteropParseNote]
// CHECK:STDERR: 18 | int GArrayReturn() {
// CHECK:STDERR: | ^
// CHECK:STDERR:
auto &&arr = Carbon::FArrayReturn();
// CHECK:STDERR: fail_todo_array_return.carbon:[[@LINE+4]]:13: error: subscripted value is not an array, pointer, or vector [CppInteropParseError]
// CHECK:STDERR: 32 | return arr[0];
// CHECK:STDERR: | ~~~^~
// CHECK:STDERR:
auto &&arr = Carbon::F();
return arr[0];
}
''';