review

Author: danakj

toolchain/check/convert.cpp

@@ -1225,9 +1225,6 @@ static auto PerformBuiltinConversion(
       // form. We can skip past the whole impl lookup step then and do that
       // here.
       //
-      // See also test:
-      // facet_access_type_converts_back_to_original_facet_value.carbon
-      //
       // TODO: This instruction is going to become a `SymbolicBindingType`, so
       // we'll need to handle that instead.
       auto const_type_inst_id =

toolchain/check/eval_inst.cpp

@@ -210,14 +210,12 @@ auto EvalConstantInst(Context& context, SemIR::FacetValue inst)
   if (auto access =
           context.insts().TryGetAs<SemIR::FacetAccessType>(inst.type_inst_id)) {
     auto bind_id = access->facet_value_inst_id;
-    auto bind = context.insts().Get(bind_id);
-    if (bind.Is<SemIR::BindSymbolicName>()) {
-      // If the FacetTypes are the same, then the FacetValue didn't add/remove
-      // any witnesses.
-      if (bind.type_id() == inst.type_id) {
-        return ConstantEvalResult::Existing(
-            context.constant_values().Get(bind_id));
-      }
+    auto bind = context.insts().TryGetAs<SemIR::BindSymbolicName>(bind_id);
+    // If the FacetTypes are the same, then the FacetValue didn't add/remove
+    // any witnesses.
+    if (bind.has_value() && bind->type_id == inst.type_id) {
+      return ConstantEvalResult::Existing(
+          context.constant_values().Get(bind_id));
     }
   }