Skip to content

[wasm-split] Escape names in manifest files #7898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 12, 2025
Merged

[wasm-split] Escape names in manifest files #7898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7367b67
[wasm-split] Escape names in manifest files
aheejin Sep 10, 2025
ee359ed
func -> name
aheejin Sep 12, 2025
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
27 changes: 14 additions & 13 deletions src/tools/wasm-split/wasm-split.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,14 +390,14 @@ void multiSplitModule(const WasmSplitOptions& options) {
parseInput(wasm, options);

// Map module names to the functions that should be in the modules.
std::map<std::string, std::unordered_set<std::string>> moduleFuncs;
std::map<Name, std::unordered_set<Name>> moduleFuncs;
// The module for which we are currently parsing a set of functions.
std::string currModule;
Name currModule;
// The set of functions we are currently inserting into.
std::unordered_set<std::string>* currFuncs = nullptr;
std::unordered_set<Name>* currFuncs = nullptr;
// Map functions to their modules to ensure no function is assigned to
// multiple modules.
std::unordered_map<std::string, std::string> funcModules;
std::unordered_map<Name, Name> funcModules;

std::string line;
bool newSection = true;
Expand All @@ -406,22 +406,23 @@ void multiSplitModule(const WasmSplitOptions& options) {
newSection = true;
continue;
}
Name func = WasmBinaryReader::escape(line);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe call this escaped or name so we don't end up with a module name in a variable called func.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Done.

if (newSection) {
currModule = line;
currFuncs = &moduleFuncs[line];
currModule = func;
currFuncs = &moduleFuncs[func];
newSection = false;
continue;
}
assert(currFuncs);
currFuncs->insert(line);
auto [it, inserted] = funcModules.insert({line, currModule});
currFuncs->insert(func);
auto [it, inserted] = funcModules.insert({func, currModule});
if (!inserted && it->second != currModule) {
Fatal() << "Function " << line << "cannot be assigned to module "
Fatal() << "Function " << func << "cannot be assigned to module "
<< currModule << "; it is already assigned to module "
<< it->second << '\n';
}
if (inserted && !options.quiet && !wasm.getFunctionOrNull(line)) {
std::cerr << "warning: Function " << line << " does not exist\n";
if (inserted && !options.quiet && !wasm.getFunctionOrNull(func)) {
std::cerr << "warning: Function " << func << " does not exist\n";
}
}

Expand All @@ -443,8 +444,8 @@ void multiSplitModule(const WasmSplitOptions& options) {
}
config.secondaryFuncs = std::set<Name>(funcs.begin(), funcs.end());
auto splitResults = ModuleSplitting::splitFunctions(wasm, config);
auto moduleName =
options.outPrefix + mod + (options.emitBinary ? ".wasm" : ".wast");
auto moduleName = options.outPrefix + mod.toString() +
(options.emitBinary ? ".wasm" : ".wast");
if (options.symbolMap) {
writeSymbolMap(*splitResults.secondary, moduleName + ".symbols");
}
Expand Down
216 changes: 216 additions & 0 deletions test/lit/wasm-split/multi-split-escape-names.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.

;; RUN: wasm-split -all -g --multi-split %s --manifest %s.manifest --out-prefix=%t -o %t.wasm
;; RUN: wasm-dis %t.wasm | filecheck %s --check-prefix=PRIMARY
;; RUN: wasm-dis %t1.wasm | filecheck %s --check-prefix=MOD1
;; RUN: wasm-dis %t2.wasm | filecheck %s --check-prefix=MOD2
;; RUN: wasm-dis %t3.wasm | filecheck %s --check-prefix=MOD3

(module
;; PRIMARY: (type $ret-i32 (func (result i32)))
(type $ret-i32 (func (result i32)))
;; PRIMARY: (type $ret-i64 (func (result i64)))
(type $ret-i64 (func (result i64)))
;; PRIMARY: (type $ret-f32 (func (result f32)))
(type $ret-f32 (func (result f32)))

;; MOD1: (type $0 (func (result f32)))

;; MOD1: (type $1 (func (result i64)))

;; MOD1: (type $2 (func (result i32)))

;; MOD1: (import "" "table" (table $timport$0 1 funcref))

;; MOD1: (import "" "std::operator<<\\28std::__2::basic_ostream<char\\2c\\20std::__2::char_traits<char>>&\\2c\\20wasm::Module&\\29" (func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)))

;; MOD1: (import "" "wasm::Literal::Literal\\28std::__2::array<wasm::Literal\\2c\\204ul>\\20const&\\29" (func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)))

;; MOD1: (elem $0 (i32.const 0) $wasm::Type::getFeatures\28\29\20const)

;; MOD1: (func $wasm::Type::getFeatures\28\29\20const (result i32)
;; MOD1-NEXT: (drop
;; MOD1-NEXT: (call_ref $2
;; MOD1-NEXT: (ref.func $wasm::Type::getFeatures\28\29\20const)
;; MOD1-NEXT: )
;; MOD1-NEXT: )
;; MOD1-NEXT: (drop
;; MOD1-NEXT: (call_ref $1
;; MOD1-NEXT: (ref.func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)
;; MOD1-NEXT: )
;; MOD1-NEXT: )
;; MOD1-NEXT: (drop
;; MOD1-NEXT: (call_ref $0
;; MOD1-NEXT: (ref.func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)
;; MOD1-NEXT: )
;; MOD1-NEXT: )
;; MOD1-NEXT: (i32.const 0)
;; MOD1-NEXT: )
(func $wasm::Type::getFeatures\28\29\20const (type $ret-i32) (result i32)
(drop
(call_ref $ret-i32
(ref.func $wasm::Type::getFeatures\28\29\20const)
)
)
(drop
(call_ref $ret-i64
(ref.func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)
)
)
(drop
(call_ref $ret-f32
(ref.func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)
)
)
(i32.const 0)
)

;; MOD2: (type $0 (func (result f32)))

;; MOD2: (type $1 (func (result i32)))

;; MOD2: (type $2 (func (result i64)))

;; MOD2: (import "" "table_4" (table $timport$0 1 funcref))

;; MOD2: (import "" "std::operator<<\\28std::__2::basic_ostream<char\\2c\\20std::__2::char_traits<char>>&\\2c\\20wasm::Module&\\29" (func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)))

;; MOD2: (import "" "trampoline_wasm::Type::getFeatures\\28\\29\\20const" (func $trampoline_wasm::Type::getFeatures\28\29\20const (result i32)))

;; MOD2: (elem $0 (i32.const 0) $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)

;; MOD2: (func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)
;; MOD2-NEXT: (drop
;; MOD2-NEXT: (call_ref $1
;; MOD2-NEXT: (ref.func $trampoline_wasm::Type::getFeatures\28\29\20const)
;; MOD2-NEXT: )
;; MOD2-NEXT: )
;; MOD2-NEXT: (drop
;; MOD2-NEXT: (call_ref $2
;; MOD2-NEXT: (ref.func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)
;; MOD2-NEXT: )
;; MOD2-NEXT: )
;; MOD2-NEXT: (drop
;; MOD2-NEXT: (call_ref $0
;; MOD2-NEXT: (ref.func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)
;; MOD2-NEXT: )
;; MOD2-NEXT: )
;; MOD2-NEXT: (i64.const 0)
;; MOD2-NEXT: )
(func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (type $ret-i64) (result i64)
(drop
(call_ref $ret-i32
(ref.func $wasm::Type::getFeatures\28\29\20const)
)
)
(drop
(call_ref $ret-i64
(ref.func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)
)
)
(drop
(call_ref $ret-f32
(ref.func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)
)
)
(i64.const 0)
)

;; MOD3: (type $0 (func (result i64)))

;; MOD3: (type $1 (func (result i32)))

;; MOD3: (type $2 (func (result f32)))

;; MOD3: (import "" "table_5" (table $timport$0 1 funcref))

;; MOD3: (import "" "wasm::Literal::Literal\\28std::__2::array<wasm::Literal\\2c\\204ul>\\20const&\\29" (func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)))

;; MOD3: (import "" "trampoline_wasm::Type::getFeatures\\28\\29\\20const" (func $trampoline_wasm::Type::getFeatures\28\29\20const (result i32)))

;; MOD3: (elem $0 (i32.const 0) $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)

;; MOD3: (func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)
;; MOD3-NEXT: (drop
;; MOD3-NEXT: (call_ref $1
;; MOD3-NEXT: (ref.func $trampoline_wasm::Type::getFeatures\28\29\20const)
;; MOD3-NEXT: )
;; MOD3-NEXT: )
;; MOD3-NEXT: (drop
;; MOD3-NEXT: (call_ref $0
;; MOD3-NEXT: (ref.func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)
;; MOD3-NEXT: )
;; MOD3-NEXT: )
;; MOD3-NEXT: (drop
;; MOD3-NEXT: (call_ref $2
;; MOD3-NEXT: (ref.func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)
;; MOD3-NEXT: )
;; MOD3-NEXT: )
;; MOD3-NEXT: (f32.const 0)
;; MOD3-NEXT: )
(func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (type $ret-f32) (result f32)
(drop
(call_ref $ret-i32
(ref.func $wasm::Type::getFeatures\28\29\20const)
)
)
(drop
(call_ref $ret-i64
(ref.func $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)
)
)
(drop
(call_ref $ret-f32
(ref.func $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)
)
)
(f32.const 0)
)
)
;; PRIMARY: (import "placeholder" "0" (func $placeholder_0 (result i32)))

;; PRIMARY: (import "placeholder" "0" (func $placeholder_0_4 (result i64)))

;; PRIMARY: (import "placeholder" "0" (func $placeholder_0_5 (result f32)))

;; PRIMARY: (table $0 1 funcref)

;; PRIMARY: (table $1 1 funcref)

;; PRIMARY: (table $2 1 funcref)

;; PRIMARY: (elem $0 (table $0) (i32.const 0) func $placeholder_0)

;; PRIMARY: (elem $1 (table $1) (i32.const 0) func $placeholder_0_4)

;; PRIMARY: (elem $2 (table $2) (i32.const 0) func $placeholder_0_5)

;; PRIMARY: (export "std::operator<<\\28std::__2::basic_ostream<char\\2c\\20std::__2::char_traits<char>>&\\2c\\20wasm::Module&\\29" (func $trampoline_std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29))

;; PRIMARY: (export "wasm::Literal::Literal\\28std::__2::array<wasm::Literal\\2c\\204ul>\\20const&\\29" (func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29))

;; PRIMARY: (export "table" (table $0))

;; PRIMARY: (export "trampoline_wasm::Type::getFeatures\\28\\29\\20const" (func $trampoline_wasm::Type::getFeatures\28\29\20const))

;; PRIMARY: (export "table_4" (table $1))

;; PRIMARY: (export "table_5" (table $2))

;; PRIMARY: (func $trampoline_wasm::Type::getFeatures\28\29\20const (result i32)
;; PRIMARY-NEXT: (call_indirect (type $ret-i32)
;; PRIMARY-NEXT: (i32.const 0)
;; PRIMARY-NEXT: )
;; PRIMARY-NEXT: )

;; PRIMARY: (func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)
;; PRIMARY-NEXT: (call_indirect $1 (type $ret-i64)
;; PRIMARY-NEXT: (i32.const 0)
;; PRIMARY-NEXT: )
;; PRIMARY-NEXT: )

;; PRIMARY: (func $trampoline_std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)
;; PRIMARY-NEXT: (call_indirect $2 (type $ret-f32)
;; PRIMARY-NEXT: (i32.const 0)
;; PRIMARY-NEXT: )
;; PRIMARY-NEXT: )
8 changes: 8 additions & 0 deletions test/lit/wasm-split/multi-split-escape-names.wast.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
1
wasm::Type::getFeatures() const

2
wasm::Literal::Literal(std::__2::array<wasm::Literal, 4ul> const&)

3
std::operator<<(std::__2::basic_ostream<char, std::__2::char_traits<char>>&, wasm::Module&)
Loading