mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-03 09:55:50 +01:00
Jon Ross-Perkins
f8c8861e5f
This doesn't significantly change logic, although I'm trying to add the location to used state. The issue I'm trying to address is how to identify a declaration as "allowed to be redeclared". Consider: ``` library "a" api; extern fn F(); ``` ``` library "b" api; extern fn F(); ``` ``` library "c" api; import library "a"; import library "b"; var x: auto = F(); fn F(); ``` What currently happens is: 1. On import of "a", `F` becomes ImportRefUnused 2. On import of "b", `F` becomes ImportRefUsed in order to merge. 3. In "c", the call `F()` doesn't change the state. 4. In "c", the declaration `fn F();` needs some breadcrumb to understand whether "F" has been referenced, as in step (3) here. What I want to happen is: 1. On import of "a", `F` becomes ImportRefUnloaded 2. On import of "b", `F` becomes ImportRefLoaded in order to merge. 3. In "c", the call `F()` causes `F` to become ImportRefUsed 4. In "c", the declaration `fn F();` detects that `F` is already ImportRefUsed, and can use the associated `used_id` for a diagnostic about why redeclaring is invalid. Note this PR isn't implementing (4). I'm focused on the refactoring to add a new ImportRef state here.
89 lines
4.2 KiB
Plaintext
89 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
|
|
|
|
// --- core.carbon
|
|
|
|
package Core api;
|
|
|
|
fn Add(a: i32, b: i32) -> i32 = "int.add";
|
|
|
|
// --- use.carbon
|
|
|
|
import Core;
|
|
|
|
var arr: [i32; Core.Add(1, 2)] = (1, 2, 3);
|
|
|
|
// CHECK:STDOUT: --- core.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Add = %Add
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Add: <function> = fn_decl @Add [template] {
|
|
// CHECK:STDOUT: %a.loc4_8.1: i32 = param a
|
|
// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc4_8.1
|
|
// CHECK:STDOUT: %b.loc4_16.1: i32 = param b
|
|
// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc4_16.1
|
|
// CHECK:STDOUT: %return.var: ref i32 = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Add(%a: i32, %b: i32) -> i32 = "int.add";
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- use.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: i32 = int_literal 1 [template]
|
|
// CHECK:STDOUT: %.2: i32 = int_literal 2 [template]
|
|
// CHECK:STDOUT: %.3: i32 = int_literal 3 [template]
|
|
// CHECK:STDOUT: %.4: type = array_type %.3, i32 [template]
|
|
// CHECK:STDOUT: %.5: type = ptr_type [i32; 3] [template]
|
|
// CHECK:STDOUT: %.6: type = tuple_type (i32, i32, i32) [template]
|
|
// CHECK:STDOUT: %.7: i32 = int_literal 0 [template]
|
|
// CHECK:STDOUT: %.8: [i32; 3] = tuple_value (%.1, %.2, %.3) [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Core = %Core
|
|
// CHECK:STDOUT: .arr = %arr
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Core: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: %Core.ref: <namespace> = name_ref Core, %Core [template = %Core]
|
|
// CHECK:STDOUT: %import_ref: <function> = import_ref ir1, inst+6, loc_11 [template = imports.%Add]
|
|
// CHECK:STDOUT: %Add.ref: <function> = name_ref Add, %import_ref [template = imports.%Add]
|
|
// CHECK:STDOUT: %.loc4_25: i32 = int_literal 1 [template = constants.%.1]
|
|
// CHECK:STDOUT: %.loc4_28: i32 = int_literal 2 [template = constants.%.2]
|
|
// CHECK:STDOUT: %.loc4_24: init i32 = call %Add.ref(%.loc4_25, %.loc4_28) [template = constants.%.3]
|
|
// CHECK:STDOUT: %.loc4_30: type = array_type %.loc4_24, i32 [template = constants.%.4]
|
|
// CHECK:STDOUT: %arr.var: ref [i32; 3] = var arr
|
|
// CHECK:STDOUT: %arr: ref [i32; 3] = bind_name arr, %arr.var
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Add(%a: i32, %b: i32) -> i32 = "int.add";
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @__global_init() {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc4_35: i32 = int_literal 1 [template = constants.%.1]
|
|
// CHECK:STDOUT: %.loc4_38: i32 = int_literal 2 [template = constants.%.2]
|
|
// CHECK:STDOUT: %.loc4_41: i32 = int_literal 3 [template = constants.%.3]
|
|
// CHECK:STDOUT: %.loc4_42.1: (i32, i32, i32) = tuple_literal (%.loc4_35, %.loc4_38, %.loc4_41)
|
|
// CHECK:STDOUT: %.loc4_42.2: i32 = int_literal 0 [template = constants.%.7]
|
|
// CHECK:STDOUT: %.loc4_42.3: ref i32 = array_index file.%arr.var, %.loc4_42.2
|
|
// CHECK:STDOUT: %.loc4_42.4: init i32 = initialize_from %.loc4_35 to %.loc4_42.3 [template = constants.%.1]
|
|
// CHECK:STDOUT: %.loc4_42.5: i32 = int_literal 1 [template = constants.%.1]
|
|
// CHECK:STDOUT: %.loc4_42.6: ref i32 = array_index file.%arr.var, %.loc4_42.5
|
|
// CHECK:STDOUT: %.loc4_42.7: init i32 = initialize_from %.loc4_38 to %.loc4_42.6 [template = constants.%.2]
|
|
// CHECK:STDOUT: %.loc4_42.8: i32 = int_literal 2 [template = constants.%.2]
|
|
// CHECK:STDOUT: %.loc4_42.9: ref i32 = array_index file.%arr.var, %.loc4_42.8
|
|
// CHECK:STDOUT: %.loc4_42.10: init i32 = initialize_from %.loc4_41 to %.loc4_42.9 [template = constants.%.3]
|
|
// CHECK:STDOUT: %.loc4_42.11: init [i32; 3] = array_init (%.loc4_42.4, %.loc4_42.7, %.loc4_42.10) to file.%arr.var [template = constants.%.8]
|
|
// CHECK:STDOUT: %.loc4_42.12: init [i32; 3] = converted %.loc4_42.1, %.loc4_42.11 [template = constants.%.8]
|
|
// CHECK:STDOUT: assign file.%arr.var, %.loc4_42.12
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|