carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add dumping for NamedConstraintId and shorten untagged id printing (#6319)

Browse Source 
Adds support to the `dump` debugger command for named constraint ids,
which are printed as `constraint<number>`. While doing so, we print
whether the `constraint` is complete or not, and add the same to
`interface` to match.

And we noticed that the printing of name and name scope ids, which are
not tagged, are very verbose by adding 7 `0`s to them for no reason. So
make the dump output easier to read by dropping 0 prefixes.

Before:
```
name_scope00000000: {inst: inst0000000E, parent_scope: name_scope<none>, has_error: false, extended_scopes: [], names: {name00000000: inst6000000F, name00000001: inst60000011}} {kind: Namespace, arg0: name_scope00000000, arg1: inst<none>, type: type(inst(NamespaceType))} `package`
```

After:
```
name_scope0: {inst: instE, parent_scope: name_scope<none>, has_error: false, extended_scopes: [], names: {name0: inst6000000F, name1: inst60000011}} {kind: Namespace, arg0: name_scope0, arg1: inst<none>, type: type(inst(NamespaceType))} `package`
```
This commit is contained in:
Dana Jansens
2025-11-05 21:36:42 +00:00
committed by GitHub
parent 99cebcf0a3
commit ce109708bf
14 changed files with 537 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/sem_ir/dump.cpp
+39 -21
View File
@@ -174,6 +174,34 @@ LLVM_DUMP_METHOD auto Dump(const File& file, GenericId generic_id)
return out.TakeStr();
}
LLVM_DUMP_METHOD auto Dump(const File& file,
IdentifiedFacetTypeId identified_facet_type_id)
-> std::string {
RawStringOstream out;
out << identified_facet_type_id;
if (!identified_facet_type_id.has_value()) {
return out.TakeStr();
}
const auto& identified_facet_type =
file.identified_facet_types().Get(identified_facet_type_id);
for (auto [i, req_interface] :
llvm::enumerate(identified_facet_type.required_interfaces())) {
out << "\n - " << Dump(file, req_interface.interface_id);
if (req_interface.specific_id.has_value()) {
out << "; " << DumpSpecificSummary(file, req_interface.specific_id);
}
if (req_interface == identified_facet_type.impl_as_target_interface()) {
out << " (to impl)";
}
}
if (!identified_facet_type.is_valid_impl_as_target()) {
out << "\n - (" << identified_facet_type.num_interfaces_to_impl()
<< " to impl)\n";
}
return out.TakeStr();
}
LLVM_DUMP_METHOD auto Dump(const File& file, ImplId impl_id) -> std::string {
RawStringOstream out;
out << impl_id;
@@ -248,6 +276,7 @@ LLVM_DUMP_METHOD auto Dump(const File& file, InterfaceId interface_id)
if (interface_id.has_value()) {
const auto& interface = file.interfaces().Get(interface_id);
out << ": " << interface << DumpNameIfValid(file, interface.name_id);
out << "\n - complete: " << (interface.is_complete() ? "true" : "false");
}
return out.TakeStr();
}
@@ -335,29 +364,14 @@ LLVM_DUMP_METHOD auto Dump(const File& file, NameScopeId name_scope_id)
}
LLVM_DUMP_METHOD auto Dump(const File& file,
IdentifiedFacetTypeId identified_facet_type_id)
NamedConstraintId named_constraint_id)
-> std::string {
RawStringOstream out;
out << identified_facet_type_id;
if (!identified_facet_type_id.has_value()) {
return out.TakeStr();
}
const auto& identified_facet_type =
file.identified_facet_types().Get(identified_facet_type_id);
for (auto [i, req_interface] :
llvm::enumerate(identified_facet_type.required_interfaces())) {
out << "\n - " << Dump(file, req_interface.interface_id);
if (req_interface.specific_id.has_value()) {
out << "; " << DumpSpecificSummary(file, req_interface.specific_id);
}
if (req_interface == identified_facet_type.impl_as_target_interface()) {
out << " (to impl)";
}
}
if (!identified_facet_type.is_valid_impl_as_target()) {
out << "\n - (" << identified_facet_type.num_interfaces_to_impl()
<< " to impl)\n";
out << named_constraint_id;
if (named_constraint_id.has_value()) {
const auto& constraint = file.named_constraints().Get(named_constraint_id);
out << ": " << constraint << DumpNameIfValid(file, constraint.name_id);
out << "\n - complete: " << (constraint.is_complete() ? "true" : "false");
}
return out.TakeStr();
}
@@ -464,6 +478,10 @@ LLVM_DUMP_METHOD static auto MakeIdentifiedFacetTypeId(int id)
-> IdentifiedFacetTypeId {
return IdentifiedFacetTypeId(id);
}
LLVM_DUMP_METHOD static auto MakeNamedConstraintId(int id)
-> NamedConstraintId {
return NamedConstraintId(id);
}
LLVM_DUMP_METHOD static auto MakeSpecificId(int id) -> SpecificId {
return SpecificId(id);
}