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

Replace typeid(T).name() with llvm::getTypeName<T>(). (#7554)

Browse Source 
This produces prettier, demangled type names, and works when building
with `-fno-rtti`.

Before:
```
Optional N6Carbon5Parse13NodeIdForKindIL_ZNS0_8NodeKind16LibrarySpecifierEEEE: begin
```
After:
```
Optional Carbon::Parse::NodeIdForKind<Carbon::Parse::NodeKind::LibrarySpecifier>: begin
```

Assisted-by: Gemini via Antigravity
This commit is contained in:
Richard Smith
2026-07-22 20:25:41 +00:00
committed by GitHub
parent 453b5474e4
commit 43df8c474a
6 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/extract.cpp
+7 -7
View File
@@ -5,12 +5,12 @@
#include <initializer_list>
#include <optional>
#include <tuple>
#include <typeinfo>
#include <utility>
#include "common/error.h"
#include "common/find.h"
#include "common/struct_reflection.h"
#include "llvm/Support/TypeName.h"
#include "toolchain/parse/tree.h"
#include "toolchain/parse/tree_and_subtrees.h"
#include "toolchain/parse/typed_nodes.h"
@@ -288,13 +288,13 @@ template <typename T>
struct Extractable<std::optional<T>> {
static auto Extract(NodeExtractor& extractor)
-> std::optional<std::optional<T>> {
extractor.MaybeTrace("Optional {0}: begin\n", typeid(T).name());
extractor.MaybeTrace("Optional {0}: begin\n", llvm::getTypeName<T>());
auto checkpoint = extractor.Checkpoint();
std::optional<T> value = Extractable<T>::Extract(extractor);
if (value) {
extractor.MaybeTrace("Optional {0}: found\n", typeid(T).name());
extractor.MaybeTrace("Optional {0}: found\n", llvm::getTypeName<T>());
} else {
extractor.MaybeTrace("Optional {0}: missing\n", typeid(T).name());
extractor.MaybeTrace("Optional {0}: missing\n", llvm::getTypeName<T>());
extractor.RestoreCheckpoint(checkpoint);
}
return value;
@@ -349,7 +349,7 @@ auto NodeExtractor::ExtractTupleLikeType(
std::index_sequence<Index...> /*indices*/, std::tuple<U...>* /*type*/)
-> std::optional<T> {
std::tuple<std::optional<U>...> fields;
MaybeTrace("Aggregate {0}: begin\n", typeid(T).name());
MaybeTrace("Aggregate {0}: begin\n", llvm::getTypeName<T>());
// Use a fold over the `=` operator to parse fields from right to left.
[[maybe_unused]] int unused;
bool ok = true;
@@ -358,11 +358,11 @@ auto NodeExtractor::ExtractTupleLikeType(
.has_value()),
unused) = ... = 0));
if (!ok) {
MaybeTrace("Aggregate {0}: error\n", typeid(T).name());
MaybeTrace("Aggregate {0}: error\n", llvm::getTypeName<T>());
return std::nullopt;
}
MaybeTrace("Aggregate {0}: success\n", typeid(T).name());
MaybeTrace("Aggregate {0}: success\n", llvm::getTypeName<T>());
return T{std::move(std::get<Index>(fields).value())...};
}