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

Formalize Cpp as a PackageNameId (#6306)

Browse Source 
This turns `Cpp` into a keyword, and makes it map to `NameId::Cpp` and
`PackageNameId::Cpp`.

Per discussion with zygoloid, the keyword versus identifier question is
deliberately kept open by #4846. This PR switches to a keyword because
mapping to a specific `PackageNameId` works best with a special `NameId`
not backed by an `IdentifierId`. We could in theory make it work using
`IdentifierId` or a runtime-tracked `PackageNameId` for `Cpp` (e.g.
stored on `SemIR::File`), but this approach is consistent with `Core`
and so seemed like a good starting point.

---------

Co-authored-by: Dana Jansens <danakj@orodu.net>
This commit is contained in:
Jon Ross-Perkins
2025-11-05 17:21:41 +00:00
committed by GitHub
co-authored by Dana Jansens
parent ae50e0f623
commit 8166f9a7cf
22 changed files with 162 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/interop/cpp/class/access.carbon
Vendored
-10
View File
@@ -1687,7 +1687,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .F = %Derived.F.decl
// CHECK:STDOUT: .instance_data = <poisoned>
@@ -1819,7 +1818,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .F = %Derived.F.decl
// CHECK:STDOUT: .instance_fn = <poisoned>
@@ -1862,7 +1860,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .F = %Derived.F.decl
// CHECK:STDOUT: .static_fn = <poisoned>
@@ -2088,7 +2085,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%D
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .D = <poisoned>
// CHECK:STDOUT: .MakePublic = %D.MakePublic.decl
@@ -2346,7 +2342,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .F = %Derived.F.decl
// CHECK:STDOUT: .Overload = <poisoned>
@@ -2468,7 +2463,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .F = %Derived.F.decl
// CHECK:STDOUT: .Overload = <poisoned>
@@ -2581,7 +2575,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .CallStatic = %Derived.CallStatic.decl
// CHECK:STDOUT: .CallInstance = %Derived.CallInstance.decl
@@ -2678,7 +2671,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .CallStatic = %Derived.CallStatic.decl
// CHECK:STDOUT: .CallInstance = %Derived.CallInstance.decl
@@ -2759,7 +2751,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .CallStatic = %Derived.CallStatic.decl
// CHECK:STDOUT: .CallInstance = %Derived.CallInstance.decl
@@ -2876,7 +2867,6 @@ fn Call(var instance: Cpp.PublicPrivate) {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc7
// CHECK:STDOUT: .CallStatic = %Derived.CallStatic.decl
// CHECK:STDOUT: .CallInstance = %Derived.CallInstance.decl
toolchain/check/testdata/interop/cpp/class/class.carbon
Vendored
-1
View File
@@ -553,7 +553,6 @@ fn MyF(bar: Cpp.Bar*);
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Self = constants.%Derived
// CHECK:STDOUT: .Cpp = <poisoned>
// CHECK:STDOUT: .base = %.loc8
// CHECK:STDOUT: .foo = <poisoned>
// CHECK:STDOUT: extend %Bar.ref