diff --git a/toolchain/check/cpp/import.cpp b/toolchain/check/cpp/import.cpp index c7f15dbfebd2..192019547183 100644 --- a/toolchain/check/cpp/import.cpp +++ b/toolchain/check/cpp/import.cpp @@ -2085,8 +2085,7 @@ static auto ImportMacro(Context& context, SemIR::LocId loc_id, SemIR::NameScopeId scope_id, SemIR::NameId name_id, clang::MacroInfo* macro_info) -> SemIR::ScopeLookupResult { - auto inst_id = - TryEvaluateMacroToConstant(context, loc_id, name_id, macro_info); + auto inst_id = TryEvaluateMacro(context, loc_id, name_id, macro_info); if (inst_id == SemIR::ErrorInst::InstId) { return SemIR::ScopeLookupResult::MakeNotFound(); } diff --git a/toolchain/check/cpp/macros.cpp b/toolchain/check/cpp/macros.cpp index c634ceab9e13..0e9e525a5450 100644 --- a/toolchain/check/cpp/macros.cpp +++ b/toolchain/check/cpp/macros.cpp @@ -44,9 +44,9 @@ static auto MapConstant(Context& context, SemIR::LocId loc_id, return SemIR::ErrorInst::InstId; } -auto TryEvaluateMacroToConstant(Context& context, SemIR::LocId loc_id, - SemIR::NameId name_id, - clang::MacroInfo* macro_info) -> SemIR::InstId { +auto TryEvaluateMacro(Context& context, SemIR::LocId loc_id, + SemIR::NameId name_id, clang::MacroInfo* macro_info) + -> SemIR::InstId { auto name_str_opt = context.names().GetAsStringIfIdentifier(name_id); CARBON_CHECK(macro_info, "macro info missing"); @@ -102,30 +102,41 @@ auto TryEvaluateMacroToConstant(Context& context, SemIR::LocId loc_id, } clang::Expr::EvalResult evaluated_result; - CARBON_CHECK(result_expr->EvaluateAsConstantExpr(evaluated_result, - sema.getASTContext())); + if (!result_expr->EvaluateAsConstantExpr(evaluated_result, + sema.getASTContext())) { + CARBON_FATAL("failed to evaluate macro as constant expression"); + } clang::APValue ap_value = evaluated_result.Val; // TODO: Add support for other types. - if (ap_value.isLValue()) { - if (!result_expr->EvaluateAsInt(evaluated_result, sema.getASTContext())) { - context.TODO(loc_id, - "Unsupported: macro evaluated to a non-integer LValue"); + if (result_expr->isGLValue()) { + const auto* value_decl = + ap_value.getLValueBase().get(); + + auto key = SemIR::ClangDeclKey::ForNonFunctionDecl( + // TODO: can this const_cast be avoided? + const_cast(value_decl)); + + if (ap_value.hasLValuePath() && ap_value.getLValuePath().size() > 0) { + context.TODO(loc_id, "Macro evaluated to an lvalue with a path: " + + ap_value.getAsString(context.ast_context(), + result_expr->getType())); return SemIR::ErrorInst::InstId; } - ap_value = evaluated_result.Val; - } - auto const_id = - MapAPValueToConstant(context, loc_id, ap_value, result_expr->getType()); - if (const_id == SemIR::ConstantId::NotConstant) { - context.TODO(loc_id, - "Unsupported: macro evaluated to a constant of type: " + - result_expr->getType().getAsString()); - return SemIR::ErrorInst::InstId; - } + return ImportCppDecl(context, loc_id, key); + } else { + auto const_id = + MapAPValueToConstant(context, loc_id, ap_value, result_expr->getType()); + if (const_id == SemIR::ConstantId::NotConstant) { + context.TODO(loc_id, + "Unsupported: macro evaluated to a constant of type: " + + result_expr->getType().getAsString()); + return SemIR::ErrorInst::InstId; + } - return context.constant_values().GetInstId(const_id); + return context.constant_values().GetInstId(const_id); + } } } // namespace Carbon::Check diff --git a/toolchain/check/cpp/macros.h b/toolchain/check/cpp/macros.h index 1cfa66d8d925..27b9a5a5f2d7 100644 --- a/toolchain/check/cpp/macros.h +++ b/toolchain/check/cpp/macros.h @@ -9,12 +9,12 @@ namespace Carbon::Check { -// Tries to evaluate the given macro to a constant expression. Returns the -// evaluated expression on success or nullptr otherwise. -// TODO: Add support for all literal types. -auto TryEvaluateMacroToConstant(Context& context, SemIR::LocId loc_id, - SemIR::NameId name_id, - clang::MacroInfo* macro_info) -> SemIR::InstId; +// Tries to evaluate the given macro. The macro will be evaluated as a +// constant if possible. Returns an `InstId` on success or +// `SemIR::ErrorInst::InstId` otherwise. +auto TryEvaluateMacro(Context& context, SemIR::LocId loc_id, + SemIR::NameId name_id, clang::MacroInfo* macro_info) + -> SemIR::InstId; } // namespace Carbon::Check diff --git a/toolchain/check/testdata/interop/cpp/macros.carbon b/toolchain/check/testdata/interop/cpp/macros.carbon index ca1be7b16573..61f9aeb9ec90 100644 --- a/toolchain/check/testdata/interop/cpp/macros.carbon +++ b/toolchain/check/testdata/interop/cpp/macros.carbon @@ -666,6 +666,19 @@ fn F() { //@dump-sem-ir-end } +// --- constexpr_int_addr.carbon + +library "[[@TEST_NAME]]"; + +import Cpp inline ''' +constexpr int n = 1; +#define N n +'''; + +//@dump-sem-ir-begin +let p: const i32* = &Cpp.N; +//@dump-sem-ir-end + // --- import_constexpr_no_scope.carbon library "[[@TEST_NAME]]"; @@ -679,7 +692,7 @@ fn F() { let unused a: i32 = Cpp.M_CONSTEXPR_NO_SCOPE; } -// --- fail_todo_import_macro_constexpr_float.carbon +// --- import_macro_constexpr_float.carbon library "[[@TEST_NAME]]"; @@ -689,17 +702,6 @@ import Cpp inline ''' '''; fn F() { - // CHECK:STDERR: fail_todo_import_macro_constexpr_float.carbon:[[@LINE+11]]:23: error: semantics TODO: `Unsupported: macro evaluated to a non-integer LValue` [SemanticsTodo] - // CHECK:STDERR: let unused a: f32 = Cpp.M_CONSTEXPR_FLOAT; - // CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~ - // CHECK:STDERR: fail_todo_import_macro_constexpr_float.carbon:[[@LINE+8]]:23: note: in `Cpp` name lookup for `M_CONSTEXPR_FLOAT` [InCppNameLookup] - // CHECK:STDERR: let unused a: f32 = Cpp.M_CONSTEXPR_FLOAT; - // CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~ - // CHECK:STDERR: - // CHECK:STDERR: fail_todo_import_macro_constexpr_float.carbon:[[@LINE+4]]:23: error: member name `M_CONSTEXPR_FLOAT` not found in `Cpp` [MemberNameNotFoundInInstScope] - // CHECK:STDERR: let unused a: f32 = Cpp.M_CONSTEXPR_FLOAT; - // CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~ - // CHECK:STDERR: let unused a: f32 = Cpp.M_CONSTEXPR_FLOAT; } @@ -852,6 +854,70 @@ fn F() { Cpp.HEADER_GUARD_MACRO_H_; } +// --- assign.carbon +library "[[@TEST_NAME]]"; + +import Cpp inline ''' +int v = 1; +#define m v +'''; + +fn F() { + //@dump-sem-ir-begin + Cpp.m = 2; + //@dump-sem-ir-end +} + +// --- fail_todo_assign_through_pointer.carbon +library "[[@TEST_NAME]]"; + +import Cpp inline ''' +int v = 1; +#define m &v +'''; + +fn F() { + // CHECK:STDERR: fail_todo_assign_through_pointer.carbon:[[@LINE+11]]:5: error: semantics TODO: `Unsupported: macro evaluated to a constant of type: int *` [SemanticsTodo] + // CHECK:STDERR: (*Cpp.m) = 2; + // CHECK:STDERR: ^~~~~ + // CHECK:STDERR: fail_todo_assign_through_pointer.carbon:[[@LINE+8]]:5: note: in `Cpp` name lookup for `m` [InCppNameLookup] + // CHECK:STDERR: (*Cpp.m) = 2; + // CHECK:STDERR: ^~~~~ + // CHECK:STDERR: + // CHECK:STDERR: fail_todo_assign_through_pointer.carbon:[[@LINE+4]]:5: error: member name `m` not found in `Cpp` [MemberNameNotFoundInInstScope] + // CHECK:STDERR: (*Cpp.m) = 2; + // CHECK:STDERR: ^~~~~ + // CHECK:STDERR: + (*Cpp.m) = 2; +} + +// --- fail_todo_assign_subobject.carbon + +library "[[@TEST_NAME]]"; + +import Cpp inline ''' +struct Struct { + int field; +}; +Struct s; +#define m s.field +'''; + +fn F() { + // CHECK:STDERR: fail_todo_assign_subobject.carbon:[[@LINE+11]]:3: error: semantics TODO: `Macro evaluated to an lvalue with a path: &s.field` [SemanticsTodo] + // CHECK:STDERR: Cpp.m = 2; + // CHECK:STDERR: ^~~~~ + // CHECK:STDERR: fail_todo_assign_subobject.carbon:[[@LINE+8]]:3: note: in `Cpp` name lookup for `m` [InCppNameLookup] + // CHECK:STDERR: Cpp.m = 2; + // CHECK:STDERR: ^~~~~ + // CHECK:STDERR: + // CHECK:STDERR: fail_todo_assign_subobject.carbon:[[@LINE+4]]:3: error: member name `m` not found in `Cpp` [MemberNameNotFoundInInstScope] + // CHECK:STDERR: Cpp.m = 2; + // CHECK:STDERR: ^~~~~ + // CHECK:STDERR: + Cpp.m = 2; +} + // CHECK:STDOUT: --- import_integer_literal_replacement_token.carbon // CHECK:STDOUT: // CHECK:STDOUT: constants { @@ -1736,15 +1802,19 @@ fn F() { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete] // CHECK:STDOUT: %pattern_type.7ce: type = pattern_type %i32 [concrete] // CHECK:STDOUT: %const: type = const_type %i32 [concrete] -// CHECK:STDOUT: %int_1.22e: %const = int_value 1 [concrete] -// CHECK:STDOUT: %int_1.5d2: %i32 = int_value 1 [concrete] +// CHECK:STDOUT: %pattern_type.a65: type = pattern_type %const [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var imports.%a.var_patt [concrete] +// CHECK:STDOUT: %int_1: %i32 = int_value 1 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { -// CHECK:STDOUT: .M_CONSTEXPR_INT = constants.%int_1.22e +// CHECK:STDOUT: .M_CONSTEXPR_INT = %a.var // CHECK:STDOUT: import Cpp//... // CHECK:STDOUT: } +// CHECK:STDOUT: %a.patt: %pattern_type.a65 = ref_binding_pattern a [concrete] +// CHECK:STDOUT: %a.var_patt: %pattern_type.a65 = var_pattern %a.patt [concrete] +// CHECK:STDOUT: %a.var: ref %const = var %a.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { @@ -1754,11 +1824,56 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: -// CHECK:STDOUT: %M_CONSTEXPR_INT.ref: %const = name_ref M_CONSTEXPR_INT, constants.%int_1.22e [concrete = constants.%int_1.22e] +// CHECK:STDOUT: %M_CONSTEXPR_INT.ref: ref %const = name_ref M_CONSTEXPR_INT, imports.%a.var [concrete = imports.%a.var] // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %.loc11_26.1: %i32 = as_compatible %M_CONSTEXPR_INT.ref [concrete = constants.%int_1.5d2] -// CHECK:STDOUT: %.loc11_26.2: %i32 = converted %M_CONSTEXPR_INT.ref, %.loc11_26.1 [concrete = constants.%int_1.5d2] -// CHECK:STDOUT: %a: %i32 = value_binding a, %.loc11_26.2 +// CHECK:STDOUT: %.loc11_26.1: ref %i32 = as_compatible %M_CONSTEXPR_INT.ref [concrete = constants.%a.var] +// CHECK:STDOUT: %.loc11_26.2: ref %i32 = converted %M_CONSTEXPR_INT.ref, %.loc11_26.1 [concrete = constants.%a.var] +// CHECK:STDOUT: +// CHECK:STDOUT: %.loc11_26.3: %i32 = acquire_value %.loc11_26.2 [concrete = constants.%int_1] +// CHECK:STDOUT: %a: %i32 = value_binding a, %.loc11_26.3 +// CHECK:STDOUT: +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- constexpr_int_addr.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: constants { +// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete] +// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete] +// CHECK:STDOUT: %const: type = const_type %i32 [concrete] +// CHECK:STDOUT: %ptr: type = ptr_type %const [concrete] +// CHECK:STDOUT: %pattern_type.bff: type = pattern_type %ptr [concrete] +// CHECK:STDOUT: %pattern_type.a65: type = pattern_type %const [concrete] +// CHECK:STDOUT: %addr: %ptr = addr_of imports.%n.var [concrete] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: imports { +// CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { +// CHECK:STDOUT: .N = %n.var +// CHECK:STDOUT: import Cpp//... +// CHECK:STDOUT: } +// CHECK:STDOUT: %n.patt: %pattern_type.a65 = ref_binding_pattern n [concrete] +// CHECK:STDOUT: %n.var_patt: %pattern_type.a65 = var_pattern %n.patt [concrete] +// CHECK:STDOUT: %n.var: ref %const = var %n.var_patt [concrete] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: name_binding_decl { +// CHECK:STDOUT: %p.patt: %pattern_type.bff = value_binding_pattern p [concrete] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc10: type = splice_block %ptr [concrete = constants.%ptr] { +// CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] +// CHECK:STDOUT: %const: type = const_type %i32 [concrete = constants.%const] +// CHECK:STDOUT: %ptr: type = ptr_type %const [concrete = constants.%ptr] +// CHECK:STDOUT: } +// CHECK:STDOUT: %p: %ptr = value_binding p, @__global_init.%addr +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @__global_init() { +// CHECK:STDOUT: !entry: +// CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] +// CHECK:STDOUT: +// CHECK:STDOUT: %N.ref: ref %const = name_ref N, imports.%n.var [concrete = imports.%n.var] +// CHECK:STDOUT: %addr: %ptr = addr_of %N.ref [concrete = constants.%addr] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1849,3 +1964,54 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: +// CHECK:STDOUT: --- assign.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: constants { +// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete] +// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete] +// CHECK:STDOUT: %pattern_type.7ce: type = pattern_type %i32 [concrete] +// CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [concrete] +// CHECK:STDOUT: %ImplicitAs.type.e8c: type = facet_type <@ImplicitAs, @ImplicitAs(%i32)> [concrete] +// CHECK:STDOUT: %To: Core.IntLiteral = symbolic_binding To, 0 [symbolic] +// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.type.4e6: type = fn_type @Core.IntLiteral.as.ImplicitAs.impl.Convert, @Core.IntLiteral.as.ImplicitAs.impl(%To) [symbolic] +// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.3c2: %Core.IntLiteral.as.ImplicitAs.impl.Convert.type.4e6 = struct_value () [symbolic] +// CHECK:STDOUT: %ImplicitAs.impl_witness.6bc: = impl_witness imports.%ImplicitAs.impl_witness_table.74f, @Core.IntLiteral.as.ImplicitAs.impl(%int_32) [concrete] +// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e0d: type = fn_type @Core.IntLiteral.as.ImplicitAs.impl.Convert, @Core.IntLiteral.as.ImplicitAs.impl(%int_32) [concrete] +// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.0b5: %Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e0d = struct_value () [concrete] +// CHECK:STDOUT: %ImplicitAs.facet: %ImplicitAs.type.e8c = facet_value Core.IntLiteral, (%ImplicitAs.impl_witness.6bc) [concrete] +// CHECK:STDOUT: %ImplicitAs.WithSelf.Convert.type.b37: type = fn_type @ImplicitAs.WithSelf.Convert, @ImplicitAs.WithSelf(%i32, %ImplicitAs.facet) [concrete] +// CHECK:STDOUT: %.545: type = fn_type_with_self_type %ImplicitAs.WithSelf.Convert.type.b37, %ImplicitAs.facet [concrete] +// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.bound: = bound_method %int_2.ecc, %Core.IntLiteral.as.ImplicitAs.impl.Convert.0b5 [concrete] +// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn: = specific_function %Core.IntLiteral.as.ImplicitAs.impl.Convert.0b5, @Core.IntLiteral.as.ImplicitAs.impl.Convert(%int_32) [concrete] +// CHECK:STDOUT: %bound_method: = bound_method %int_2.ecc, %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn [concrete] +// CHECK:STDOUT: %int_2.ef8: %i32 = int_value 2 [concrete] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: imports { +// CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { +// CHECK:STDOUT: .m = %v.var +// CHECK:STDOUT: import Cpp//... +// CHECK:STDOUT: } +// CHECK:STDOUT: %v.patt: %pattern_type.7ce = ref_binding_pattern v [concrete] +// CHECK:STDOUT: %v.var_patt: %pattern_type.7ce = var_pattern %v.patt [concrete] +// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt [concrete] +// CHECK:STDOUT: %Core.import_ref.42d: @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.4e6) = import_ref Core//prelude/types/int, loc{{\d+_\d+}}, loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.3c2)] +// CHECK:STDOUT: %ImplicitAs.impl_witness_table.74f = impl_witness_table (%Core.import_ref.42d), @Core.IntLiteral.as.ImplicitAs.impl [concrete] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @F() { +// CHECK:STDOUT: !entry: +// CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] +// CHECK:STDOUT: +// CHECK:STDOUT: %m.ref: ref %i32 = name_ref m, imports.%v.var [concrete = imports.%v.var] +// CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] +// CHECK:STDOUT: %impl.elem0: %.545 = impl_witness_access constants.%ImplicitAs.impl_witness.6bc, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.0b5] +// CHECK:STDOUT: %bound_method.loc10_9.1: = bound_method %int_2, %impl.elem0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] +// CHECK:STDOUT: %specific_fn: = specific_function %impl.elem0, @Core.IntLiteral.as.ImplicitAs.impl.Convert(constants.%int_32) [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn] +// CHECK:STDOUT: %bound_method.loc10_9.2: = bound_method %int_2, %specific_fn [concrete = constants.%bound_method] +// CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call: init %i32 = call %bound_method.loc10_9.2(%int_2) [concrete = constants.%int_2.ef8] +// CHECK:STDOUT: %.loc10: init %i32 = converted %int_2, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_2.ef8] +// CHECK:STDOUT: assign %m.ref, %.loc10 +// CHECK:STDOUT: +// CHECK:STDOUT: } +// CHECK:STDOUT: