error-in-import

Author: danakj

toolchain/check/eval.cpp

@@ -891,9 +891,9 @@ auto AddImportedConstant(Context& context, SemIR::Inst inst)
                inst.kind());
   Phase phase = GetPhase(context.constant_values(),
                          context.types().GetConstantId(inst.type_id()));
-  if (!ReplaceAllFieldsWithConstantValues(eval_context, &inst, &phase)) {
-    return SemIR::ConstantId::NotConstant;
-  }
+  // We ignore the return value of ReplaceAllFieldsWithConstantValues and just
+  // propagate runtime and error constant values into the resulting ConstantId.
+  ReplaceAllFieldsWithConstantValues(eval_context, &inst, &phase);
   return MakeConstantResult(context, inst, phase);
 }
 
@@ -2068,6 +2068,9 @@ auto TryEvalTypedInst<SemIR::WhereExpr>(EvalContext& eval_context,
                          inst_id)) {
         if (IsPeriodSelf(eval_context,
                          eval_context.constant_values().Get(impls->lhs_id))) {
+          if (impls->rhs_id == SemIR::ErrorInst::InstId) {
+            return SemIR::ErrorInst::ConstantId;
+          }
           if (impls->rhs_id == SemIR::TypeType::TypeInstId) {
             // `.Self impls type` -> nothing to do.
           } else if (auto facet_type =

toolchain/check/testdata/where_expr/constraints.carbon

@@ -125,6 +125,28 @@ fn NotEmptyStruct() {
   EmptyStruct(C);
 }
 
+// --- fail_error_in_constraint.carbon
+
+library "[[@TEST_NAME]]";
+
+//@dump-sem-ir-begin
+// CHECK:STDERR: fail_error_in_constraint.carbon:[[@LINE+4]]:41: error: name `I` not found [NameNotFound]
+// CHECK:STDERR: fn WithError(U:! type where .Self impls I);
+// CHECK:STDERR:                                         ^
+// CHECK:STDERR:
+fn WithError(U:! type where .Self impls I);
+//@dump-sem-ir-end
+
+// --- import_error_in_constraint.carbon
+
+library "[[@TEST_NAME]]";
+
+import library "error_in_constraint";
+
+fn F() {
+  WithError(());
+}
+
 // CHECK:STDOUT: --- state_constraints.carbon
 // CHECK:STDOUT:
 // CHECK:STDOUT: constants {
@@ -301,3 +323,36 @@ fn NotEmptyStruct() {
 // CHECK:STDOUT:   %W.loc12_24.2 => constants.%W
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
+// CHECK:STDOUT: --- fail_error_in_constraint.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: constants {
+// CHECK:STDOUT:   %.Self: type = bind_symbolic_name .Self [symbolic_self]
+// CHECK:STDOUT:   %WithError.type: type = fn_type @WithError [concrete]
+// CHECK:STDOUT:   %WithError: %WithError.type = struct_value () [concrete]
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: imports {
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
+// CHECK:STDOUT:   %WithError.decl: %WithError.type = fn_decl @WithError [concrete = constants.%WithError] {
+// CHECK:STDOUT:     %U.patt: <error> = symbolic_binding_pattern U, 0 [concrete]
+// CHECK:STDOUT:   } {
+// CHECK:STDOUT:     %.loc9_23.1: type = splice_block %.loc9_23.2 [concrete = <error>] {
+// CHECK:STDOUT:       <elided>
+// CHECK:STDOUT:       %.Self.ref: type = name_ref .Self, %.Self [symbolic_self = constants.%.Self]
+// CHECK:STDOUT:       %I.ref: <error> = name_ref I, <error> [concrete = <error>]
+// CHECK:STDOUT:       %.loc9_23.2: type = where_expr %.Self [concrete = <error>] {
+// CHECK:STDOUT:         requirement_impls %.Self.ref, <error>
+// CHECK:STDOUT:       }
+// CHECK:STDOUT:     }
+// CHECK:STDOUT:     %U: <error> = bind_symbolic_name U, 0 [concrete = <error>]
+// CHECK:STDOUT:   }
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: generic fn @WithError(%U: <error>) {
+// CHECK:STDOUT:   fn();
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: specific @WithError(<error>) {}
+// CHECK:STDOUT: