Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 30 additions & 6 deletions src/dmd/dmangle.d
Original file line number Diff line number Diff line change
Expand Up @@ -591,12 +591,8 @@ public:
assert(slice.length);
foreach (const char c; slice)
{
assert(c == '_' ||
c == '@' ||
c == '?' ||
c == '$' ||
isalnum(c) ||
c & 0x80);
assert(c.isValidMangling, "The mangled name '" ~ slice ~ "' " ~
"contains an invalid character: " ~ c);
}
}
}
Expand Down Expand Up @@ -1101,6 +1097,34 @@ public:
}
}

/// Returns: `true` if the given character is a valid mangled character
package bool isValidMangling(dchar c)
{
return
c >= 'A' && c <= 'Z' ||
c >= 'a' && c <= 'z' ||
c >= '0' && c <= '9' ||
c != 0 && strchr("$%().:?@[]_", c);
}

// valid mangled characters
unittest
{
assert('a'.isValidMangling);
assert('B'.isValidMangling);
assert('2'.isValidMangling);
assert('@'.isValidMangling);
assert('_'.isValidMangling);
}

// invalid mangled characters
unittest
{
assert(!'-'.isValidMangling);
assert(!0.isValidMangling);
assert(!'/'.isValidMangling);
assert(!'\\'.isValidMangling);
}

/******************************************************************************
* Returns exact mangled name of function.
Expand Down
3 changes: 2 additions & 1 deletion src/dmd/dsymbolsem.d
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import dmd.declaration;
import dmd.denum;
import dmd.dimport;
import dmd.dinterpret;
import dmd.dmangle;
import dmd.dmodule;
import dmd.dscope;
import dmd.dstruct;
Expand Down Expand Up @@ -1744,7 +1745,7 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor
dchar c = p[i];
if (c < 0x80)
{
if (c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' || c >= '0' && c <= '9' || c != 0 && strchr("$%().:?@[]_", c))
if (c.isValidMangling)
{
++i;
continue;
Expand Down