mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-21 04:16:45 +00:00
Building on #3636 which handles the general import case, add special casing for namespaces. Namespaces can be combined cross-IR, so it's a little more complex. The implementation adds import_id to the Namespace instruction as a reference to find the original using the normal structure. This is achieved by moving the name_id to NameScope to free up space. --- I considered a few alternatives... I considered adding import_id to NameScope, but: 1. It's more consistent with things such as Function or Class that provide name_id on the info object rather than the instruction. 2. I thought it more likely that there would be more NameScope cases that might want a name_id rather than the import_id, since ImportRef will typically be used. I considered putting the import source (cross-ref IR id + inst id) on the NameScope versus a separate ImportRef, which seems like the strongest argument towards the NameScope approach because it removes an instruction. That just felt inconsistent though, and the overhead of instruction-per-imported-namespace should be low (theoretically few namespaces should be used). Plus I feel a bit odd adding two generally-unused ids to NameScope. A specialized Namespace structure could also have been created to store the import_id, but that would add an indirection to the NameScope.
91 lines
3.7 KiB
Plaintext
91 lines
3.7 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
|
|
//
|
|
// AUTOUPDATE
|
|
|
|
class Class {
|
|
fn F[addr self: Class*]();
|
|
fn G[addr self: Class]();
|
|
}
|
|
|
|
fn F(c: Class, p: Class*) {
|
|
// CHECK:STDERR: fail_addr_self.carbon:[[@LINE+6]]:6: ERROR: `addr self` method cannot be invoked on a value.
|
|
// CHECK:STDERR: c.F();
|
|
// CHECK:STDERR: ^
|
|
// CHECK:STDERR: fail_addr_self.carbon:[[@LINE-8]]:13: Initializing `addr self` parameter of method declared here.
|
|
// CHECK:STDERR: fn F[addr self: Class*]();
|
|
// CHECK:STDERR: ^~~~
|
|
c.F();
|
|
|
|
// CHECK:STDERR: fail_addr_self.carbon:[[@LINE+6]]:6: ERROR: `addr self` method cannot be invoked on a value.
|
|
// CHECK:STDERR: c.G();
|
|
// CHECK:STDERR: ^
|
|
// CHECK:STDERR: fail_addr_self.carbon:[[@LINE-15]]:13: Initializing `addr self` parameter of method declared here.
|
|
// CHECK:STDERR: fn G[addr self: Class]();
|
|
// CHECK:STDERR: ^~~~
|
|
c.G();
|
|
|
|
// This call is OK.
|
|
(*p).F();
|
|
|
|
// CHECK:STDERR: fail_addr_self.carbon:[[@LINE+6]]:3: ERROR: Cannot implicitly convert from `Class*` to `Class`.
|
|
// CHECK:STDERR: (*p).G();
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR: fail_addr_self.carbon:[[@LINE-26]]:13: Initializing `addr self` parameter of method declared here.
|
|
// CHECK:STDERR: fn G[addr self: Class]();
|
|
// CHECK:STDERR: ^~~~
|
|
(*p).G();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- fail_addr_self.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Class: type = class_type @Class [template]
|
|
// CHECK:STDOUT: %.1: type = ptr_type Class [template]
|
|
// CHECK:STDOUT: %.2: type = struct_type {} [template]
|
|
// CHECK:STDOUT: %.3: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %.4: type = ptr_type {} [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.Class = %Class.decl, .F = %F} [template]
|
|
// CHECK:STDOUT: %Class.decl = class_decl @Class, ()
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F.2 [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Class {
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F.1 [template]
|
|
// CHECK:STDOUT: %G: <function> = fn_decl @G [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .F = %F
|
|
// CHECK:STDOUT: .G = %G
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F.1[addr %self: Class*]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G[addr %self: Class]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F.2(%c: Class, %p: Class*) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %c.ref.loc19: Class = name_ref c, %c
|
|
// CHECK:STDOUT: %.loc19_4: <bound method> = bound_method %c.ref.loc19, @Class.%F
|
|
// CHECK:STDOUT: %.loc19_6: init () = call %.loc19_4(<invalid>)
|
|
// CHECK:STDOUT: %c.ref.loc27: Class = name_ref c, %c
|
|
// CHECK:STDOUT: %.loc27_4: <bound method> = bound_method %c.ref.loc27, @Class.%G
|
|
// CHECK:STDOUT: %.loc27_6: init () = call %.loc27_4(<invalid>)
|
|
// CHECK:STDOUT: %p.ref.loc30: Class* = name_ref p, %p
|
|
// CHECK:STDOUT: %.loc30_4.1: ref Class = deref %p.ref.loc30
|
|
// CHECK:STDOUT: %.loc30_7: <bound method> = bound_method %.loc30_4.1, @Class.%F
|
|
// CHECK:STDOUT: %.loc30_4.2: Class* = addr_of %.loc30_4.1
|
|
// CHECK:STDOUT: %.loc30_9: init () = call %.loc30_7(%.loc30_4.2)
|
|
// CHECK:STDOUT: %p.ref.loc38: Class* = name_ref p, %p
|
|
// CHECK:STDOUT: %.loc38_4.1: ref Class = deref %p.ref.loc38
|
|
// CHECK:STDOUT: %.loc38_7: <bound method> = bound_method %.loc38_4.1, @Class.%G
|
|
// CHECK:STDOUT: %.loc38_4.2: Class* = addr_of %.loc38_4.1
|
|
// CHECK:STDOUT: %.loc38_9: init () = call %.loc38_7(<invalid>)
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|