mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-20 21:16:43 +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.
113 lines
4.2 KiB
Plaintext
113 lines
4.2 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 {
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE+3]]:8: ERROR: `self` can only be declared in an implicit parameter list.
|
|
// CHECK:STDERR: fn F(self: Class);
|
|
// CHECK:STDERR: ^~~~~~~~~~~
|
|
fn F(self: Class);
|
|
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE+6]]:10: ERROR: Function returns incomplete type `Class`.
|
|
// CHECK:STDERR: fn G() -> Class;
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE-9]]:1: Class is incomplete within its definition.
|
|
// CHECK:STDERR: class Class {
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~
|
|
fn G() -> Class;
|
|
}
|
|
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE+3]]:12: ERROR: `self` can only be declared in an implicit parameter list.
|
|
// CHECK:STDERR: fn Class.F(self: Class) {
|
|
// CHECK:STDERR: ^~~~~~~~~~~
|
|
fn Class.F(self: Class) {
|
|
}
|
|
|
|
fn Class.G() -> Class {
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE+3]]:7: ERROR: `self` can only be declared in an implicit parameter list.
|
|
// CHECK:STDERR: var self: Class;
|
|
// CHECK:STDERR: ^~~~~~~~~~~
|
|
var self: Class;
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE+3]]:10: ERROR: Cannot copy value of type `Class`.
|
|
// CHECK:STDERR: return self;
|
|
// CHECK:STDERR: ^~~~
|
|
return self;
|
|
}
|
|
|
|
class WrongSelf {
|
|
fn F[self: Class]();
|
|
}
|
|
|
|
fn CallWrongSelf(ws: WrongSelf) {
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE+6]]:3: ERROR: Cannot implicitly convert from `WrongSelf` to `Class`.
|
|
// CHECK:STDERR: ws.F();
|
|
// CHECK:STDERR: ^~~~~
|
|
// CHECK:STDERR: fail_self.carbon:[[@LINE-7]]:8: Initializing `self` parameter of method declared here.
|
|
// CHECK:STDERR: fn F[self: Class]();
|
|
// CHECK:STDERR: ^~~~
|
|
ws.F();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- fail_self.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Class: type = class_type @Class [template]
|
|
// CHECK:STDOUT: %.1: type = struct_type {} [template]
|
|
// CHECK:STDOUT: %.2: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %.3: type = ptr_type {} [template]
|
|
// CHECK:STDOUT: %WrongSelf: type = class_type @WrongSelf [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.Class = %Class.decl, .WrongSelf = %WrongSelf.decl, .CallWrongSelf = %CallWrongSelf} [template]
|
|
// CHECK:STDOUT: %Class.decl = class_decl @Class, ()
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F.1 [template]
|
|
// CHECK:STDOUT: %G: <function> = fn_decl @G [template]
|
|
// CHECK:STDOUT: %WrongSelf.decl = class_decl @WrongSelf, ()
|
|
// CHECK:STDOUT: %CallWrongSelf: <function> = fn_decl @CallWrongSelf [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: class @WrongSelf {
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F.2 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .F = %F
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F.1(%self: Class) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G() -> %return: Class {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %Class.ref: type = name_ref Class, constants.%Class [template = constants.%Class]
|
|
// CHECK:STDOUT: %self.var: ref Class = var self
|
|
// CHECK:STDOUT: %self: ref Class = bind_name self, %self.var
|
|
// CHECK:STDOUT: %self.ref: ref Class = name_ref self, %self
|
|
// CHECK:STDOUT: %.loc36: Class = bind_value %self.ref
|
|
// CHECK:STDOUT: return <error>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F.2[%self: Class]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @CallWrongSelf(%ws: WrongSelf) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %ws.ref: WrongSelf = name_ref ws, %ws
|
|
// CHECK:STDOUT: %.loc50_5: <bound method> = bound_method %ws.ref, @WrongSelf.%F
|
|
// CHECK:STDOUT: %.loc50_7: init () = call %.loc50_5(<invalid>)
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|