This is an archive of the discontinued LLVM Phabricator instance.

Differential D111431

[Demangle] Add support for D function literals and null literal value
Needs ReviewPublic

Authored by ljmf00 on Oct 8 2021, 8:45 AM.
This revision needs review, but there are no reviewers specified.

Details

Reviewers
None
Summary
Signed-off-by: Luís Ferreira <contact@lsferreira.net>

Diff Detail

Revision Contents

PathSize
llvm/
lib/
Demangle/
14 lines
unittests/
Demangle/
5 lines

Diff 378253

llvm/lib/Demangle/DLangDemangle.cpp

Show First 20 Lines • Show All 1,730 Lines • ▼ Show 20 Lines
} }
const char *Demangler::parseValue(OutputString *Decl, const char *Mangled, const char *Demangler::parseValue(OutputString *Decl, const char *Mangled,
const char *Name, char Type) { const char *Name, char Type) {
if (Mangled == nullptr || *Mangled == '\0') if (Mangled == nullptr || *Mangled == '\0')
return nullptr; return nullptr;
switch (*Mangled) { switch (*Mangled) {
// Null value
case 'n':
Mangled++;
Decl->append("null");
break;
// Integral values // Integral values
case 'N': case 'N':
Mangled++; Mangled++;
Decl->append('-'); Decl->append('-');
Mangled = parseInteger(Decl, Mangled, Type); Mangled = parseInteger(Decl, Mangled, Type);
break; break;
case 'i': case 'i':
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines case 'A':
break; break;
// Struct values // Struct values
case 'S': case 'S':
Mangled++; Mangled++;
Mangled = parseStructLiteral(Decl, Mangled, Name); Mangled = parseStructLiteral(Decl, Mangled, Name);
break; break;
// Function literal symbol
case 'f':
Mangled++;
if (strncmp(Mangled, "_D", 2) != 0 || !isSymbolName(Mangled + 2))
return nullptr;
Mangled = parseMangle(Decl, Mangled);
break;
default: default:
return nullptr; return nullptr;
} }
return Mangled; return Mangled;
} }
const char *Demangler::parseStructLiteral(OutputString *Decl, const char *Demangler::parseStructLiteral(OutputString *Decl,
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines

llvm/unittests/Demangle/DLangDemangleTest.cpp

Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines ExpectedVal ExpectedArray[] = {
{"_D8demangle25__T4testVAdA2e08P1eN08P1Zv", {"_D8demangle25__T4testVAdA2e08P1eN08P1Zv",
"demangle.test!([0x0.8p1, -0x0.8p1])"}, "demangle.test!([0x0.8p1, -0x0.8p1])"},
{"_D8demangle23__T4testVHiiA2i1i2i3i4Zv", "demangle.test!([1:2, 3:4])"}, {"_D8demangle23__T4testVHiiA2i1i2i3i4Zv", "demangle.test!([1:2, 3:4])"},
{"_D8demangle39__T4testVHAxaiA2a3_616263i1a3_646566i2Zv", {"_D8demangle39__T4testVHAxaiA2a3_616263i1a3_646566i2Zv",
"demangle.test!([\"abc\":1, \"def\":2])"}, "demangle.test!([\"abc\":1, \"def\":2])"},
{"_D8demangle28__T4testVS8demangle1SS2i1i2Zv", {"_D8demangle28__T4testVS8demangle1SS2i1i2Zv",
"demangle.test!(demangle.S(1, 2))"}, "demangle.test!(demangle.S(1, 2))"},
{"_D8demangle35__T4testVS8demangle1SS2i1a3_616263Zv", {"_D8demangle35__T4testVS8demangle1SS2i1a3_616263Zv",
"demangle.test!(demangle.S(1, \"abc\"))"} "demangle.test!(demangle.S(1, \"abc\"))"},
{"_D8demangle13__T4testVPinZv", "demangle.test!(null)"},
{"_D8demangle__T3abcS_DQt10__lambda13FNaNbNiNfZiZQBhFZi",
"demangle.abc!(demangle.__lambda13()).abc()"}
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-        "demangle.abc!(demangle.__lambda13()).abc()"}
-  };
+       "demangle.abc!(demangle.__lambda13()).abc()"}};
Lint: Pre-merge checks: clang-format: please reformat the code ``` - "demangle.abc!(demangle.__lambda13()).abc…
}; };
for (ExpectedVal Val : ExpectedArray) { for (ExpectedVal Val : ExpectedArray) {
char *Demangled = llvm::dlangDemangle(Val.Mangled); char *Demangled = llvm::dlangDemangle(Val.Mangled);
EXPECT_STREQ(Demangled, Val.Expected); EXPECT_STREQ(Demangled, Val.Expected);
std::free(Demangled); std::free(Demangled);
} }
} }