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

Provide the callee expression to the Call node. (#3291)

Browse Source 
Track the callee expression in full, instead of only tracking the
callee's FunctionId. This results in the `name_reference` denoting the
function actually being used.

Lowering now propagates a `llvm::Function*` as the value associated with
expressions of type `<function>`.

We were not creating `NameReference` node for names produced by member
access into a namespace, such as the second name in
`Namespace.Function`, which caused lowering of calls to such names to
fail. This is now fixed, but the resulting `NameReference` node only
refers to the name and the lookup result, not to the `Namespace.`
qualifier. We'll need to decide how to fit a third operand into that
node (perhaps we can stop storing the `name_id`, since it can be derived
from the lookup result) but for now the qualifier is not tracked.
This commit is contained in:
Richard Smith
2023-10-13 22:06:23 +00:00
committed by GitHub
parent c61b6a0e1d
commit 1ae5fe0cd5
43 changed files with 110 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/function/call/empty_struct.carbon
Vendored
+1 -1
View File
@@ -28,6 +28,6 @@ fn Main() {
// CHECK:STDOUT: %Echo.ref: <function> = name_reference "Echo", package.%Echo
// CHECK:STDOUT: %.loc12_9.1: {} = struct_literal ()
// CHECK:STDOUT: %.loc12_9.2: {} = struct_value %.loc12_9.1, ()
// CHECK:STDOUT: %.loc12_7: init {} = call @Echo(%.loc12_9.2)
// CHECK:STDOUT: %.loc12_7: init {} = call %Echo.ref(%.loc12_9.2)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/empty_tuple.carbon
Vendored
+1 -1
View File
@@ -28,6 +28,6 @@ fn Main() {
// CHECK:STDOUT: %Echo.ref: <function> = name_reference "Echo", package.%Echo
// CHECK:STDOUT: %.loc12_9.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc12_9.2: () = tuple_value %.loc12_9.1, ()
// CHECK:STDOUT: %.loc12_7: init () = call @Echo(%.loc12_9.2)
// CHECK:STDOUT: %.loc12_7: init () = call %Echo.ref(%.loc12_9.2)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ fn Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %x: ref i32 = var "x"
// CHECK:STDOUT: %Foo.ref: <function> = name_reference "Foo", package.%Foo
// CHECK:STDOUT: %.loc13: init f64 = call @Foo()
// CHECK:STDOUT: %.loc13: init f64 = call %Foo.ref()
// CHECK:STDOUT: assign %x, <error>
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/i32.carbon
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ fn Main() {
// CHECK:STDOUT: %b: ref i32 = var "b"
// CHECK:STDOUT: %Echo.ref: <function> = name_reference "Echo", package.%Echo
// CHECK:STDOUT: %.loc12_21: i32 = int_literal 1
// CHECK:STDOUT: %.loc12_20: init i32 = call @Echo(%.loc12_21)
// CHECK:STDOUT: %.loc12_20: init i32 = call %Echo.ref(%.loc12_21)
// CHECK:STDOUT: assign %b, %.loc12_20
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/more_param_ir.carbon
Vendored
+1 -1
View File
@@ -34,6 +34,6 @@ fn Main() {
// CHECK:STDOUT: %.loc11_20: i32 = add %.loc11_18, %.loc11_22
// CHECK:STDOUT: %.loc11_25: i32 = int_literal 6
// CHECK:STDOUT: %.loc11_6.1: type = tuple_type ()
// CHECK:STDOUT: %.loc11_6.2: init () = call @Foo(%.loc11_13, %.loc11_20, %.loc11_25)
// CHECK:STDOUT: %.loc11_6.2: init () = call %Foo.ref(%.loc11_13, %.loc11_20, %.loc11_25)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/params_one.carbon
Vendored
+1 -1
View File
@@ -25,6 +25,6 @@ fn Main() {
// CHECK:STDOUT: %Foo.ref: <function> = name_reference "Foo", package.%Foo
// CHECK:STDOUT: %.loc10_7: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_6.1: type = tuple_type ()
// CHECK:STDOUT: %.loc10_6.2: init () = call @Foo(%.loc10_7)
// CHECK:STDOUT: %.loc10_6.2: init () = call %Foo.ref(%.loc10_7)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/params_one_comma.carbon
Vendored
+2 -2
View File
@@ -26,9 +26,9 @@ fn Main() {
// CHECK:STDOUT: %Foo.ref.loc10: <function> = name_reference "Foo", package.%Foo
// CHECK:STDOUT: %.loc10_7: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_6.1: type = tuple_type ()
// CHECK:STDOUT: %.loc10_6.2: init () = call @Foo(%.loc10_7)
// CHECK:STDOUT: %.loc10_6.2: init () = call %Foo.ref.loc10(%.loc10_7)
// CHECK:STDOUT: %Foo.ref.loc11: <function> = name_reference "Foo", package.%Foo
// CHECK:STDOUT: %.loc11_7: i32 = int_literal 1
// CHECK:STDOUT: %.loc11_6: init () = call @Foo(%.loc11_7)
// CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/params_two.carbon
Vendored
+1 -1
View File
@@ -26,6 +26,6 @@ fn Main() {
// CHECK:STDOUT: %.loc10_7: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_10: i32 = int_literal 2
// CHECK:STDOUT: %.loc10_6.1: type = tuple_type ()
// CHECK:STDOUT: %.loc10_6.2: init () = call @Foo(%.loc10_7, %.loc10_10)
// CHECK:STDOUT: %.loc10_6.2: init () = call %Foo.ref(%.loc10_7, %.loc10_10)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/params_two_comma.carbon
Vendored
+2 -2
View File
@@ -27,10 +27,10 @@ fn Main() {
// CHECK:STDOUT: %.loc10_7: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_10: i32 = int_literal 2
// CHECK:STDOUT: %.loc10_6.1: type = tuple_type ()
// CHECK:STDOUT: %.loc10_6.2: init () = call @Foo(%.loc10_7, %.loc10_10)
// CHECK:STDOUT: %.loc10_6.2: init () = call %Foo.ref.loc10(%.loc10_7, %.loc10_10)
// CHECK:STDOUT: %Foo.ref.loc11: <function> = name_reference "Foo", package.%Foo
// CHECK:STDOUT: %.loc11_7: i32 = int_literal 1
// CHECK:STDOUT: %.loc11_10: i32 = int_literal 2
// CHECK:STDOUT: %.loc11_6: init () = call @Foo(%.loc11_7, %.loc11_10)
// CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7, %.loc11_10)
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/params_zero.carbon
Vendored
+1 -1
View File
@@ -24,6 +24,6 @@ fn Main() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %Foo.ref: <function> = name_reference "Foo", package.%Foo
// CHECK:STDOUT: %.loc10_6.1: type = tuple_type ()
// CHECK:STDOUT: %.loc10_6.2: init () = call @Foo()
// CHECK:STDOUT: %.loc10_6.2: init () = call %Foo.ref()
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/function/call/return_implicit.carbon
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ fn Main() {
// CHECK:STDOUT: %.loc11_11.2: () = tuple_literal ()
// CHECK:STDOUT: %b: ref () = var "b"
// CHECK:STDOUT: %MakeImplicitEmptyTuple.ref: <function> = name_reference "MakeImplicitEmptyTuple", package.%MakeImplicitEmptyTuple
// CHECK:STDOUT: %.loc11_37: init () = call @MakeImplicitEmptyTuple()
// CHECK:STDOUT: %.loc11_37: init () = call %MakeImplicitEmptyTuple.ref()
// CHECK:STDOUT: assign %b, %.loc11_37
// CHECK:STDOUT: return
// CHECK:STDOUT: }