github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2024-12-29 10:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix --output-groups leftover files issue (#5574)

Browse Source
This commit is contained in:
Todd Strader 2024-10-31 14:38:53 -04:00 committed by GitHub
parent 0f2a8c6c22
commit 9fae951d9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/V3EmitMk.cpp
View File

@ -346,12 +346,14 @@ private:
}
}
if (bucket.m_concatenatedFilenames.size() == 1) {
const bool lastBucketAndLeftovers
= (i + 1 == list.m_bucketsNum) && (fileIt != list.m_files.end());
if (bucket.m_concatenatedFilenames.size() > 1 || lastBucketAndLeftovers) {
m_outputFiles.push_back(std::move(bucket));
} else if (bucket.m_concatenatedFilenames.size() == 1) {
// Unwrap the bucket if it contains only one file.
m_outputFiles.push_back(
{std::move(bucket.m_concatenatedFilenames.front()), {}});
} else if (bucket.m_concatenatedFilenames.size() > 1) {
m_outputFiles.push_back(std::move(bucket));
}
// Most likely no bucket will be empty in normal situations. If it happen the
// bucket will just be dropped.
@ -359,6 +361,8 @@ private:
for (; fileIt != list.m_files.end(); ++fileIt) {
// The Work List is out of buckets, but some files were left.
// Add them to the last bucket.
UASSERT(m_outputFiles.back().isConcatenatingFile(),
"Cannot add leftover files to a single file");
m_outputFiles.back().m_concatenatedFilenames.push_back(fileIt->m_filename);
}
}