[llvm] [Archive][COFF] Split hybrid COFF files when adding them to an archive (PR #205160)
Jacek Caban via llvm-commits
llvm-commits at lists.llvm.org
Thu Jul 2 07:10:59 PDT 2026
================
@@ -905,26 +943,28 @@ computeMemberData(raw_ostream &StringTable, raw_ostream &SymNames,
offsetToAlignment(D.Data.size() + MemberPadding, Align(2));
D.Padding = StringRef(PaddingData, MemberPadding + TailPadding);
+ StringRef MemberName = D.HybridName.size() ? D.HybridName : M->MemberName;
+
sys::TimePoint<std::chrono::seconds> ModTime;
if (UniqueTimestamps)
// Increment timestamp for each file of a given name.
- ModTime = sys::toTimePoint(FilenameCount[M->MemberName]++);
+ ModTime = sys::toTimePoint(FilenameCount[MemberName]++);
else
ModTime = M->ModTime;
- uint64_t Size = Buf.getBufferSize() + MemberPadding;
+ Size += MemberPadding;
if (Size > object::Archive::MaxMemberSize) {
std::string StringMsg =
- "File " + M->MemberName.str() + " exceeds size limit";
+ "File " + MemberName.str() + " exceeds size limit";
return make_error<object::GenericBinaryError>(
std::move(StringMsg), object::object_error::parse_failed);
}
// In the big archive file format, we need to calculate and include the next
// member offset and previous member offset in the file member header.
if (isAIXBigArchive(Kind)) {
- uint64_t OffsetToMemData = Pos + sizeof(object::BigArMemHdrType) +
- alignTo(M->MemberName.size(), 2);
+ uint64_t OffsetToMemData =
+ Pos + sizeof(object::BigArMemHdrType) + alignTo(MemberName.size(), 2);
----------------
cjacek wrote:
It's not purely clang-format, it changes `M->MemberName` to `MemberName` (which triggers clang-format).
https://github.com/llvm/llvm-project/pull/205160
More information about the llvm-commits
mailing list