Skip to content

[MemoryPacking] Avoid duplicate split segment names #9361

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
tlively merged 1 commit into from
Nov 9, 2026
Merged

[MemoryPacking] Avoid duplicate split segment names #9361

Show file tree
Hide file tree
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
12 changes: 7 additions & 5 deletions src/passes/MemoryPacking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ struct MemoryPacking : public Pass {
const std::unique_ptr<DataSegment>& segment,
const Referrers& referrers,
std::vector<Range>& ranges);
void createSplitSegments(Builder& builder,
void createSplitSegments(Module* module,
const DataSegment* segment,
std::vector<Range>& ranges,
std::vector<std::unique_ptr<DataSegment>>& packed,
Expand Down Expand Up @@ -160,7 +160,6 @@ void MemoryPacking::run(Module* module) {
std::vector<std::unique_ptr<DataSegment>> packed;

Replacements replacements;
Builder builder(*module);
for (size_t index = 0; index < segments.size(); ++index) {
auto& segment = segments[index];
auto& currReferrers = referrers[segment->name];
Expand All @@ -178,7 +177,7 @@ void MemoryPacking::run(Module* module) {
size_t segmentsRemaining = segments.size() - index;
size_t currSegmentsStart = packed.size();
createSplitSegments(
builder, segment.get(), ranges, packed, segmentsRemaining);
module, segment.get(), ranges, packed, segmentsRemaining);
std::vector<Name> currSegmentNames;
for (size_t i = currSegmentsStart; i < packed.size(); ++i) {
currSegmentNames.push_back(packed[i]->name);
Expand Down Expand Up @@ -716,11 +715,12 @@ Expression* addStartAndOffset(T start, T offset, Builder& builder) {
}

void MemoryPacking::createSplitSegments(
Builder& builder,
Module* module,
const DataSegment* segment,
std::vector<Range>& ranges,
std::vector<std::unique_ptr<DataSegment>>& packed,
size_t segmentsRemaining) {
Builder builder(*module);
size_t segmentCount = 0;
bool hasExplicitName = false;
for (size_t i = 0; i < ranges.size(); ++i) {
Expand Down Expand Up @@ -763,7 +763,9 @@ void MemoryPacking::createSplitSegments(
name = segment->name;
hasExplicitName = segment->hasExplicitName;
} else {
name = segment->name.toString() + "." + std::to_string(segmentCount);
name = Names::getValidDataSegmentName(*module,
segment->name.toString() + "." +
std::to_string(segmentCount));
}
segmentCount++;
}
Expand Down
13 changes: 13 additions & 0 deletions test/lit/passes/memory-packing_all-features.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2557,3 +2557,16 @@
)
)
)
(module
;; Avoid colliding with existing segment names when splitting a segment.
;; CHECK: (memory $0 1 1)
(memory $0 1 1)
;; CHECK: (data $0 (i32.const 0) "a")
(data $0 (i32.const 0) "a\00\00\00\00\00\00\00\00\00b\00\00\00\00\00\00\00\00\00c")
;; CHECK: (data $0.1_2 (i32.const 10) "b")

;; CHECK: (data $0.2 (i32.const 20) "c")

;; CHECK: (data $0.1 (i32.const 30) "d")
(data $0.1 (i32.const 30) "d")
)
Loading