AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove a leading $ during name mangling.

Browse Source 
If SkSL inlined a private function, its name mangled version was coming
out as `_123_$function` which isn't a legal symbol name.

Change-Id: I2317731479b31c2edf6ff7e34997807dc8a0c488
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/526459
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
This commit is contained in:
John Stiles 2022-03-31 22:18:33 -04:00 committed by SkCQ
parent a990ef91b3
commit 3ff3c662b5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sksl/SkSLMangler.cpp
View File

@ -18,6 +18,12 @@ namespace SkSL {
std::string Mangler::uniqueName(std::string_view baseName, SymbolTable* symbolTable) { std::string Mangler::uniqueName(std::string_view baseName, SymbolTable* symbolTable) {
SkASSERT(symbolTable); SkASSERT(symbolTable);
// Private names might begin with a $. Strip that off.
if (skstd::starts_with(baseName, '$')) {
baseName.remove_prefix(1);
}
// The inliner runs more than once, so the base name might already have been mangled and have a // The inliner runs more than once, so the base name might already have been mangled and have a
// prefix like "_123_x". Let's strip that prefix off to make the generated code easier to read. // prefix like "_123_x". Let's strip that prefix off to make the generated code easier to read.
if (skstd::starts_with(baseName, '_')) { if (skstd::starts_with(baseName, '_')) {