review

Author: danakj

scripts/lldbinit.py

@@ -44,14 +44,16 @@ def print_usage() -> None:
 Dumps the value of an associated ID, using the C++ Dump() functions.
 
 Usage:
-  dump <CONTEXT> [<EXPR>|-- <EXPR>|<TYPE><ID>|<IR>.<TYPE><ID>]
+  dump <CONTEXT> [<EXPR>|-- <EXPR>|[<IR>.]<TYPE><ID>]
 
 Args:
   CONTEXT is the dump context, such a SemIR::Context reference, a SemIR::File,
           a Parse::Context, or a Lex::TokenizeBuffer.
   EXPR is a C++ expression such as a variable name. Use `--` to prevent it from
        being treated as a TYPE and ID.
-  IR is the CheckIRId(N) in the form `irN`.
+  IR is the CheckIRId(N) in the form `irN`. Not all ID types have an `ir`
+       prefix, the ones which do are dumped with that prefix, such as for
+       InstId as `ir1.inst2`.
   TYPE can be `inst`, `constant`, `generic`, `impl`, `entity_name`, etc. See
        the `Label` string in `IdBase` classes to find possible TYPE names,
        though only Id types that have a matching `Make...Id()` function are
@@ -76,7 +78,7 @@ def print_usage() -> None:
     context = args[0]
 
     # The set of "Make" functions in dump.cpp. These use ADL to find the factory
-    # function in `context/` or in `sem_ir/`.
+    # function in `check/` or in `sem_ir/`.
     id_types = {
         "inst": "MakeInstId",
     }

toolchain/check/dump.cpp

@@ -11,20 +11,21 @@
 // - lldb: `expr Dump(context, id)`
 // - gdb: `call Dump(context, id)`
 
-#include "toolchain/sem_ir/ids.h"
 #ifndef NDEBUG
 
+#include "toolchain/lex/dump.h"
+
 #include <string>
 
 #include "common/check.h"
 #include "common/raw_string_ostream.h"
 #include "toolchain/check/context.h"
-#include "toolchain/lex/dump.h"
 #include "toolchain/lex/tokenized_buffer.h"
 #include "toolchain/parse/dump.h"
 #include "toolchain/parse/tree.h"
 #include "toolchain/sem_ir/dump.h"
 #include "toolchain/sem_ir/file.h"
+#include "toolchain/sem_ir/ids.h"
 
 namespace Carbon::Check {
 

toolchain/sem_ir/dump.cpp

@@ -454,9 +454,12 @@ LLVM_DUMP_METHOD static auto MakeInstBlockId(int id) -> InstBlockId {
 }
 LLVM_DUMP_METHOD auto MakeInstId(const SemIR::File& file, int check_ir_id,
                                  int id) -> InstId {
-  CARBON_CHECK(file.check_ir_id() == SemIR::CheckIRId(check_ir_id),
-               "SemIR::MakeInstId given a CheckIRId for the wrong SemIR::File. "
-               "Maybe you want to dump from a Check::Context.");
+  if (file.check_ir_id() != SemIR::CheckIRId(check_ir_id)) {
+    llvm::errs()
+        << "SemIR::MakeInstId given a CheckIRId for the wrong SemIR::File. "
+           "Maybe you want to dump from a Check::Context.\n";
+    return SemIR::InstId::None;
+  }
   return InstId(file.insts().GetIdTag().Apply(id));
 }
 LLVM_DUMP_METHOD static auto MakeInterfaceId(int id) -> InterfaceId {