Checkpoint progress.

carbon-language · Jan 2, 2025 · 2a49a77 · 2a49a77
1 parent 3909ec3
commit 2a49a77
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/toolchain/check/impl.cpp b/toolchain/check/impl.cpp
@@ -135,10 +135,7 @@ static auto CheckAssociatedFunctionImplementation(
 // Builds an initial empty witness.
 auto ImplWitnessForDeclaration(Context& context, const SemIR::Impl& impl)
     -> SemIR::InstId {
-  // FIXME: CARBON_CHECK(!impl.has_started_definition());
-  CARBON_CHECK(!impl.is_being_defined());
-  CARBON_CHECK(!impl.is_defined());
-  // FIXME
+  CARBON_CHECK(!impl.has_definition_started());
 
   auto facet_type_id = context.GetTypeIdForTypeInst(impl.constraint_id);
   if (facet_type_id == SemIR::ErrorInst::SingletonTypeId) {

diff --git a/toolchain/check/import_ref.cpp b/toolchain/check/import_ref.cpp
@@ -1726,12 +1726,16 @@ static auto MakeFunctionDecl(ImportContext& context,
       .type_id = SemIR::TypeId::Invalid,
       .function_id = SemIR::FunctionId::Invalid,
       .decl_block_id = SemIR::InstBlockId::Empty};
+#if 0
+  // FIXME: Better workaround for bug.
   auto function_decl_id = context.local_context().AddPlaceholderInstInNoBlock(
-      // FIXME: Better workaround for bug.
-      SemIR::LocIdAndInst::NoLoc(
-          // context.local_context().MakeImportedLocAndInst(
-          //    AddImportIRInst(context, import_function.first_decl_id()),
+      SemIR::LocIdAndInst::NoLoc(function_decl));
+#else
+  auto function_decl_id = context.local_context().AddPlaceholderInstInNoBlock(
+      context.local_context().MakeImportedLocAndInst(
+          AddImportIRInst(context, import_function.first_decl_id()),
           function_decl));
+#endif
 
   // Start with an incomplete function.
   function_decl.function_id = context.local_functions().Add(