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

Redeclaration support for impl declarations. (#3717)

Browse Source 
Maintain a mapping from (self type, constraint) to `ImplId` on the
`Impl` value store so that we can perform redeclaration lookup.
This commit is contained in:
Richard Smith
2024-02-22 20:26:36 +00:00
committed by GitHub
parent b1850920e4
commit eed33c3b8c
8 changed files with 157 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/impl/fail_redefinition.carbon
Vendored
+41
View File
@@ -0,0 +1,41 @@
// 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
interface I {}
impl i32 as I {}
// CHECK:STDERR: fail_redefinition.carbon:[[@LINE+6]]:1: ERROR: Redefinition of `impl i32 as I`.
// CHECK:STDERR: impl i32 as I {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~
// CHECK:STDERR: fail_redefinition.carbon:[[@LINE-5]]:1: Previous definition was here.
// CHECK:STDERR: impl i32 as I {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~
impl i32 as I {}
// CHECK:STDOUT: --- fail_redefinition.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.1: type = interface_type @I [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.I = %I.decl} [template]
// CHECK:STDOUT: %I.decl = interface_decl @I, ()
// CHECK:STDOUT: impl_decl @impl, (<unexpected instref inst+3>)
// CHECK:STDOUT: impl_decl @impl, (<unexpected instref inst+5>)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: interface @I {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: impl @impl: i32 as I {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/impl/todo_redefinition.carbon → toolchain/check/testdata/impl/redeclaration.carbon
Vendored
+16 -9
View File
@@ -6,22 +6,28 @@
interface I {}
impl i32 as I;
class X {
impl i32 as I;
}
impl i32 as I {}
// TODO: Reject this redefinition.
impl i32 as I {}
// CHECK:STDOUT: --- todo_redefinition.carbon
// CHECK:STDOUT: --- redeclaration.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.1: type = interface_type @I [template]
// CHECK:STDOUT: %X: type = class_type @X [template]
// CHECK:STDOUT: %.2: type = struct_type {} [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.I = %I.decl} [template]
// CHECK:STDOUT: package: <namespace> = namespace {.I = %I.decl, .X = %X.decl} [template]
// CHECK:STDOUT: %I.decl = interface_decl @I, ()
// CHECK:STDOUT: impl_decl @impl.1, (<unexpected instref inst+3>)
// CHECK:STDOUT: impl_decl @impl.2, (<unexpected instref inst+5>)
// CHECK:STDOUT: impl_decl @impl, (<unexpected instref inst+3>)
// CHECK:STDOUT: %X.decl = class_decl @X, ()
// CHECK:STDOUT: impl_decl @impl, (<unexpected instref inst+10>)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: interface @I {
@@ -29,12 +35,13 @@ impl i32 as I {}
// CHECK:STDOUT: !members:
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: impl @impl.1: i32 as I {
// CHECK:STDOUT: impl @impl: i32 as I {
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: impl @impl.2: i32 as I {
// CHECK:STDOUT: class @X {
// CHECK:STDOUT: impl_decl @impl, (<unexpected instref inst+7>)
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: }