Skip to content

Commit 4685890

Browse files
zygoloidgoogle-labs-jules[bot]
zygoloid
and
google-labs-jules[bot]
authored
Rename FloatLiteral to FloatValue. (#5911)
In preparation for `FloatValue` being used more generally, and not only for literals. --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent bd2483b commit 4685890

24 files changed

+64
-64
lines changed

‎toolchain/check/eval.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static auto MakeFloatResult(Context& context, SemIR::TypeId type_id,
336336
llvm::APFloat value) -> SemIR::ConstantId {
337337
auto result = context.floats().Add(std::move(value));
338338
return MakeConstantResult(
339-
context, SemIR::FloatLiteral{.type_id = type_id, .float_id = result},
339+
context, SemIR::FloatValue{.type_id = type_id, .float_id = result},
340340
Phase::Concrete);
341341
}
342342

@@ -1405,7 +1405,7 @@ static auto PerformBuiltinUnaryFloatOp(Context& context,
14051405
SemIR::BuiltinFunctionKind builtin_kind,
14061406
SemIR::InstId arg_id)
14071407
-> SemIR::ConstantId {
1408-
auto op = context.insts().GetAs<SemIR::FloatLiteral>(arg_id);
1408+
auto op = context.insts().GetAs<SemIR::FloatValue>(arg_id);
14091409
auto op_val = context.floats().Get(op.float_id);
14101410

14111411
switch (builtin_kind) {
@@ -1425,8 +1425,8 @@ static auto PerformBuiltinBinaryFloatOp(Context& context,
14251425
SemIR::InstId lhs_id,
14261426
SemIR::InstId rhs_id)
14271427
-> SemIR::ConstantId {
1428-
auto lhs = context.insts().GetAs<SemIR::FloatLiteral>(lhs_id);
1429-
auto rhs = context.insts().GetAs<SemIR::FloatLiteral>(rhs_id);
1428+
auto lhs = context.insts().GetAs<SemIR::FloatValue>(lhs_id);
1429+
auto rhs = context.insts().GetAs<SemIR::FloatValue>(rhs_id);
14301430
auto lhs_val = context.floats().Get(lhs.float_id);
14311431
auto rhs_val = context.floats().Get(rhs.float_id);
14321432

@@ -1457,8 +1457,8 @@ static auto PerformBuiltinFloatComparison(
14571457
Context& context, SemIR::BuiltinFunctionKind builtin_kind,
14581458
SemIR::InstId lhs_id, SemIR::InstId rhs_id, SemIR::TypeId bool_type_id)
14591459
-> SemIR::ConstantId {
1460-
auto lhs = context.insts().GetAs<SemIR::FloatLiteral>(lhs_id);
1461-
auto rhs = context.insts().GetAs<SemIR::FloatLiteral>(rhs_id);
1460+
auto lhs = context.insts().GetAs<SemIR::FloatValue>(lhs_id);
1461+
auto rhs = context.insts().GetAs<SemIR::FloatValue>(rhs_id);
14621462
const auto& lhs_val = context.floats().Get(lhs.float_id);
14631463
const auto& rhs_val = context.floats().Get(rhs.float_id);
14641464

‎toolchain/check/handle_literal.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ auto HandleParseNode(Context& context, Parse::RealLiteralId node_id) -> bool {
8080
real_value.exponent.getSExtValue());
8181

8282
auto float_id = context.sem_ir().floats().Add(llvm::APFloat(double_val));
83-
AddInstAndPush<SemIR::FloatLiteral>(
83+
AddInstAndPush<SemIR::FloatValue>(
8484
context, node_id,
8585
{.type_id = GetSingletonType(context, SemIR::LegacyFloatType::TypeInstId),
8686
.float_id = float_id});

‎toolchain/check/testdata/basics/numeric_literals.carbon‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ let e: f64 = 5.0e39999999999999999993;
9595
// CHECK:STDOUT: %int_8.b85: Core.IntLiteral = int_value 8 [concrete]
9696
// CHECK:STDOUT: %int_9.988: Core.IntLiteral = int_value 9 [concrete]
9797
// CHECK:STDOUT: %int_2147483647.d89: Core.IntLiteral = int_value 2147483647 [concrete]
98-
// CHECK:STDOUT: %float.952: f64 = float_literal 0.90000000000000002 [concrete]
99-
// CHECK:STDOUT: %float.298: f64 = float_literal 8 [concrete]
100-
// CHECK:STDOUT: %float.dcb: f64 = float_literal 80 [concrete]
101-
// CHECK:STDOUT: %float.1d0: f64 = float_literal 1.0E+7 [concrete]
102-
// CHECK:STDOUT: %float.9f6: f64 = float_literal 1.0E+8 [concrete]
103-
// CHECK:STDOUT: %float.401: f64 = float_literal 1.0E-8 [concrete]
98+
// CHECK:STDOUT: %float.2c5: f64 = float_value 0.90000000000000002 [concrete]
99+
// CHECK:STDOUT: %float.613: f64 = float_value 8 [concrete]
100+
// CHECK:STDOUT: %float.707: f64 = float_value 80 [concrete]
101+
// CHECK:STDOUT: %float.213: f64 = float_value 1.0E+7 [concrete]
102+
// CHECK:STDOUT: %float.577: f64 = float_value 1.0E+8 [concrete]
103+
// CHECK:STDOUT: %float.ef9: f64 = float_value 1.0E-8 [concrete]
104104
// CHECK:STDOUT: }
105105
// CHECK:STDOUT:
106106
// CHECK:STDOUT: imports {
@@ -116,12 +116,12 @@ let e: f64 = 5.0e39999999999999999993;
116116
// CHECK:STDOUT: %int_2147483647.loc13: Core.IntLiteral = int_value 2147483647 [concrete = constants.%int_2147483647.d89]
117117
// CHECK:STDOUT: %int_2147483647.loc14: Core.IntLiteral = int_value 2147483647 [concrete = constants.%int_2147483647.d89]
118118
// CHECK:STDOUT: <elided>
119-
// CHECK:STDOUT: %float.loc19: f64 = float_literal 0.90000000000000002 [concrete = constants.%float.952]
120-
// CHECK:STDOUT: %float.loc20: f64 = float_literal 8 [concrete = constants.%float.298]
121-
// CHECK:STDOUT: %float.loc21: f64 = float_literal 80 [concrete = constants.%float.dcb]
122-
// CHECK:STDOUT: %float.loc22: f64 = float_literal 1.0E+7 [concrete = constants.%float.1d0]
123-
// CHECK:STDOUT: %float.loc23: f64 = float_literal 1.0E+8 [concrete = constants.%float.9f6]
124-
// CHECK:STDOUT: %float.loc24: f64 = float_literal 1.0E-8 [concrete = constants.%float.401]
119+
// CHECK:STDOUT: %float.loc19: f64 = float_value 0.90000000000000002 [concrete = constants.%float.2c5]
120+
// CHECK:STDOUT: %float.loc20: f64 = float_value 8 [concrete = constants.%float.613]
121+
// CHECK:STDOUT: %float.loc21: f64 = float_value 80 [concrete = constants.%float.707]
122+
// CHECK:STDOUT: %float.loc22: f64 = float_value 1.0E+7 [concrete = constants.%float.213]
123+
// CHECK:STDOUT: %float.loc23: f64 = float_value 1.0E+8 [concrete = constants.%float.577]
124+
// CHECK:STDOUT: %float.loc24: f64 = float_value 1.0E-8 [concrete = constants.%float.ef9]
125125
// CHECK:STDOUT: <elided>
126126
// CHECK:STDOUT: }
127127
// CHECK:STDOUT:

‎toolchain/check/testdata/function/call/fail_param_type.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn F() {
4141
// CHECK:STDOUT: %G: %G.type = struct_value () [concrete]
4242
// CHECK:STDOUT: %F.type: type = fn_type @F [concrete]
4343
// CHECK:STDOUT: %F: %F.type = struct_value () [concrete]
44-
// CHECK:STDOUT: %float: f64 = float_literal 1 [concrete]
44+
// CHECK:STDOUT: %float: f64 = float_value 1 [concrete]
4545
// CHECK:STDOUT: %ImplicitAs.type.cc7: type = generic_interface_type @ImplicitAs [concrete]
4646
// CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.cc7 = struct_value () [concrete]
4747
// CHECK:STDOUT: }
@@ -86,7 +86,7 @@ fn F() {
8686
// CHECK:STDOUT: fn @F() {
8787
// CHECK:STDOUT: !entry:
8888
// CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G]
89-
// CHECK:STDOUT: %float: f64 = float_literal 1 [concrete = constants.%float]
89+
// CHECK:STDOUT: %float: f64 = float_value 1 [concrete = constants.%float]
9090
// CHECK:STDOUT: %.loc28: %i32 = converted %float, <error> [concrete = <error>]
9191
// CHECK:STDOUT: %G.call: init %empty_tuple.type = call %G.ref(<error>)
9292
// CHECK:STDOUT: return

‎toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn Run() {
3535
// CHECK:STDOUT: %Foo.type: type = fn_type @Foo [concrete]
3636
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
3737
// CHECK:STDOUT: %Foo: %Foo.type = struct_value () [concrete]
38-
// CHECK:STDOUT: %float: f64 = float_literal 1 [concrete]
38+
// CHECK:STDOUT: %float: f64 = float_value 1 [concrete]
3939
// CHECK:STDOUT: %Run.type: type = fn_type @Run [concrete]
4040
// CHECK:STDOUT: %Run: %Run.type = struct_value () [concrete]
4141
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
@@ -90,7 +90,7 @@ fn Run() {
9090
// CHECK:STDOUT:
9191
// CHECK:STDOUT: fn @Foo() -> f64 {
9292
// CHECK:STDOUT: !entry:
93-
// CHECK:STDOUT: %float: f64 = float_literal 1 [concrete = constants.%float]
93+
// CHECK:STDOUT: %float: f64 = float_value 1 [concrete = constants.%float]
9494
// CHECK:STDOUT: return %float
9595
// CHECK:STDOUT: }
9696
// CHECK:STDOUT:

‎toolchain/check/testdata/index/fail_array_non_int_indexing.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var b: i32 = a[2.6];
5353
// CHECK:STDOUT: %bound_method: <bound method> = bound_method %int_12.6a3, %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn [concrete]
5454
// CHECK:STDOUT: %int_12.1e1: %i32 = int_value 12 [concrete]
5555
// CHECK:STDOUT: %array: %array_type = tuple_value (%int_12.1e1) [concrete]
56-
// CHECK:STDOUT: %float: f64 = float_literal 2.6000000000000001 [concrete]
56+
// CHECK:STDOUT: %float: f64 = float_value 2.6000000000000001 [concrete]
5757
// CHECK:STDOUT: }
5858
// CHECK:STDOUT:
5959
// CHECK:STDOUT: imports {
@@ -117,7 +117,7 @@ var b: i32 = a[2.6];
117117
// CHECK:STDOUT: %.loc15_1: init %array_type = converted %.loc15_28.1, %.loc15_28.5 [concrete = constants.%array]
118118
// CHECK:STDOUT: assign file.%a.var, %.loc15_1
119119
// CHECK:STDOUT: %a.ref: ref %array_type = name_ref a, file.%a [concrete = file.%a.var]
120-
// CHECK:STDOUT: %float: f64 = float_literal 2.6000000000000001 [concrete = constants.%float]
120+
// CHECK:STDOUT: %float: f64 = float_value 2.6000000000000001 [concrete = constants.%float]
121121
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete = constants.%int_32]
122122
// CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32]
123123
// CHECK:STDOUT: %.loc23_16: %i32 = converted %float, <error> [concrete = <error>]

‎toolchain/check/testdata/interop/cpp/function/arithmetic_types_bridged.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ fn F() {
10961096
// CHECK:STDOUT: %Float: %Float.type = struct_value () [concrete]
10971097
// CHECK:STDOUT: %foo.type: type = fn_type @foo [concrete]
10981098
// CHECK:STDOUT: %foo: %foo.type = struct_value () [concrete]
1099-
// CHECK:STDOUT: %float: f64 = float_literal 0.80000000000000004 [concrete]
1099+
// CHECK:STDOUT: %float: f64 = float_value 0.80000000000000004 [concrete]
11001100
// CHECK:STDOUT: }
11011101
// CHECK:STDOUT:
11021102
// CHECK:STDOUT: imports {
@@ -1115,7 +1115,7 @@ fn F() {
11151115
// CHECK:STDOUT: !entry:
11161116
// CHECK:STDOUT: %Cpp.ref: <namespace> = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp]
11171117
// CHECK:STDOUT: %foo.ref: %foo.type = name_ref foo, imports.%foo.decl [concrete = constants.%foo]
1118-
// CHECK:STDOUT: %float: f64 = float_literal 0.80000000000000004 [concrete = constants.%float]
1118+
// CHECK:STDOUT: %float: f64 = float_value 0.80000000000000004 [concrete = constants.%float]
11191119
// CHECK:STDOUT: %int_64: Core.IntLiteral = int_value 64 [concrete = constants.%int_64]
11201120
// CHECK:STDOUT: %Float.call: init type = call constants.%Float(%int_64) [concrete = f64]
11211121
// CHECK:STDOUT: %.loc8_18.1: type = value_of_initializer %Float.call [concrete = f64]

‎toolchain/check/testdata/interop/cpp/function/param_unsupported.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fn F() {
6767
// CHECK:STDOUT: --- fail_todo_import_unsupported_primitive_type.carbon
6868
// CHECK:STDOUT:
6969
// CHECK:STDOUT: constants {
70-
// CHECK:STDOUT: %float: f64 = float_literal 1.1000000000000001 [concrete]
70+
// CHECK:STDOUT: %float: f64 = float_value 1.1000000000000001 [concrete]
7171
// CHECK:STDOUT: }
7272
// CHECK:STDOUT:
7373
// CHECK:STDOUT: imports {
@@ -81,15 +81,15 @@ fn F() {
8181
// CHECK:STDOUT: !entry:
8282
// CHECK:STDOUT: %Cpp.ref: <namespace> = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp]
8383
// CHECK:STDOUT: %foo.ref: <error> = name_ref foo, <error> [concrete = <error>]
84-
// CHECK:STDOUT: %float: f64 = float_literal 1.1000000000000001 [concrete = constants.%float]
84+
// CHECK:STDOUT: %float: f64 = float_value 1.1000000000000001 [concrete = constants.%float]
8585
// CHECK:STDOUT: <elided>
8686
// CHECK:STDOUT: }
8787
// CHECK:STDOUT:
8888
// CHECK:STDOUT: --- fail_todo_import_unsupported_primitive_type_among_params.carbon
8989
// CHECK:STDOUT:
9090
// CHECK:STDOUT: constants {
9191
// CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete]
92-
// CHECK:STDOUT: %float: f64 = float_literal 2 [concrete]
92+
// CHECK:STDOUT: %float: f64 = float_value 2 [concrete]
9393
// CHECK:STDOUT: }
9494
// CHECK:STDOUT:
9595
// CHECK:STDOUT: imports {
@@ -104,7 +104,7 @@ fn F() {
104104
// CHECK:STDOUT: %Cpp.ref: <namespace> = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp]
105105
// CHECK:STDOUT: %foo.ref: <error> = name_ref foo, <error> [concrete = <error>]
106106
// CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1]
107-
// CHECK:STDOUT: %float: f64 = float_literal 2 [concrete = constants.%float]
107+
// CHECK:STDOUT: %float: f64 = float_value 2 [concrete = constants.%float]
108108
// CHECK:STDOUT: <elided>
109109
// CHECK:STDOUT: }
110110
// CHECK:STDOUT:

‎toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn Main() {
5353
// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn: <specific function> = specific_function %Core.IntLiteral.as.ImplicitAs.impl.Convert.956, @Core.IntLiteral.as.ImplicitAs.impl.Convert(%int_32) [concrete]
5454
// CHECK:STDOUT: %bound_method: <bound method> = bound_method %int_3.1ba, %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn [concrete]
5555
// CHECK:STDOUT: %int_3.822: %i32 = int_value 3 [concrete]
56-
// CHECK:STDOUT: %float: f64 = float_literal 5.6000000000000005 [concrete]
56+
// CHECK:STDOUT: %float: f64 = float_value 5.6000000000000005 [concrete]
5757
// CHECK:STDOUT: %T.as.Destroy.impl.Op.type.a17: type = fn_type @T.as.Destroy.impl.Op, @T.as.Destroy.impl(%i32) [concrete]
5858
// CHECK:STDOUT: %T.as.Destroy.impl.Op.e6a: %T.as.Destroy.impl.Op.type.a17 = struct_value () [concrete]
5959
// CHECK:STDOUT: %ptr.235: type = ptr_type %i32 [concrete]
@@ -105,7 +105,7 @@ fn Main() {
105105
// CHECK:STDOUT: }
106106
// CHECK:STDOUT: %a: ref %i32 = bind_name a, %a.var
107107
// CHECK:STDOUT: %a.ref: ref %i32 = name_ref a, %a
108-
// CHECK:STDOUT: %float: f64 = float_literal 5.6000000000000005 [concrete = constants.%float]
108+
// CHECK:STDOUT: %float: f64 = float_value 5.6000000000000005 [concrete = constants.%float]
109109
// CHECK:STDOUT: %.loc24: %i32 = converted %float, <error> [concrete = <error>]
110110
// CHECK:STDOUT: assign %a.ref, <error>
111111
// CHECK:STDOUT: %T.as.Destroy.impl.Op.bound: <bound method> = bound_method %a.var, constants.%T.as.Destroy.impl.Op.e6a

‎toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn Main() -> i32 {
3333
// CHECK:STDOUT: %Main.type: type = fn_type @Main [concrete]
3434
// CHECK:STDOUT: %Main: %Main.type = struct_value () [concrete]
3535
// CHECK:STDOUT: %empty_struct_type: type = struct_type {} [concrete]
36-
// CHECK:STDOUT: %float: f64 = float_literal 3.4000000000000004 [concrete]
36+
// CHECK:STDOUT: %float: f64 = float_value 3.4000000000000004 [concrete]
3737
// CHECK:STDOUT: %AddWith.type.e05: type = generic_interface_type @AddWith [concrete]
3838
// CHECK:STDOUT: %AddWith.generic: %AddWith.type.e05 = struct_value () [concrete]
3939
// CHECK:STDOUT: %int_12: Core.IntLiteral = int_value 12 [concrete]
@@ -70,7 +70,7 @@ fn Main() -> i32 {
7070
// CHECK:STDOUT: fn @Main() -> %i32 {
7171
// CHECK:STDOUT: !entry:
7272
// CHECK:STDOUT: %.loc22: %empty_struct_type = struct_literal ()
73-
// CHECK:STDOUT: %float: f64 = float_literal 3.4000000000000004 [concrete = constants.%float]
73+
// CHECK:STDOUT: %float: f64 = float_value 3.4000000000000004 [concrete = constants.%float]
7474
// CHECK:STDOUT: %int_12: Core.IntLiteral = int_value 12 [concrete = constants.%int_12]
7575
// CHECK:STDOUT: %impl.elem1: <error> = impl_witness_access <error>, element1 [concrete = <error>]
7676
// CHECK:STDOUT: return <error>

0 commit comments

Comments
 (0)