Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

core.demangle: Fix mangling ambiguity, follow-up to #3408 #3423

Merged
merged 1 commit into from
Apr 2, 2021
Merged

core.demangle: Fix mangling ambiguity, follow-up to #3408 #3423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/core/demangle.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,13 +1469,16 @@ pure @safe:
foreach ( i; 0 .. n )
{
putComma(i);
if (front == '_') // function literal symbol
parseMangledName(false, 1);
else
parseValue();
parseValue();
}
put( ')' );
return;
case 'f':
// f MangledName
// A function literal symbol
popFront();
parseMangledName(false, 1);
return;
default:
error();
}
Expand Down Expand Up @@ -2506,7 +2509,7 @@ else
"pure @safe int std.format.getNth!(\"integer width\", std.traits.isIntegral, int, uint, uint).getNth(uint, uint, uint)"],
["_D3std11parallelism42__T16RoundRobinBufferTDFKAaZvTDxFNaNdNeZbZ16RoundRobinBuffer5primeMFZv",
"void std.parallelism.RoundRobinBuffer!(void delegate(ref char[]), bool delegate() pure @property @trusted const).RoundRobinBuffer.prime()"],
["_D6mangle__T8fun21753VSQv6S21753S1_DQBi10__lambda71MFNaNbNiNfZvZQCaQp",
["_D6mangle__T8fun21753VSQv6S21753S1f_DQBj10__lambda71MFNaNbNiNfZvZQCbQp",
"void function() pure nothrow @nogc @safe mangle.fun21753!(mangle.S21753(mangle.__lambda71())).fun21753"],
// Lname '0'
["_D3std9algorithm9iteration__T9MapResultSQBmQBlQBe005stripTAAyaZQBi7opSliceMFNaNbNiNfmmZSQDiQDhQDa__TQCtSQDyQDxQDq00QCmTQCjZQDq",
Expand Down