diff options
| author | Steven Wu <stevenwu@apple.com> | 2017-09-15 21:12:14 +0000 |
|---|---|---|
| committer | Steven Wu <stevenwu@apple.com> | 2017-09-15 21:12:14 +0000 |
| commit | ab211df5de42bf2b2f45fc73134c76f24835b47a (patch) | |
| tree | 75d534aebc5ccd8fa81a75508ec46e463f54d564 | |
| parent | 1efbe2eb05151bf30915eaa9a208bc0a3ab6009c (diff) | |
| download | bcm5719-llvm-ab211df5de42bf2b2f45fc73134c76f24835b47a.tar.gz bcm5719-llvm-ab211df5de42bf2b2f45fc73134c76f24835b47a.zip | |
[AutoUpgrade] Fix a compatibility issue with module flag
Summary:
After r304661, module flag to record objective-c image info section is
encoded without whitespaces after comma. The new name is equivalent to
the old one, except that when LTO a module built by old compiler and a
module built by a new compiler, it will fail with conflicting values.
Fix the issue by removing whitespaces in bitcode upgrade path.
rdar://problem/34416934
Reviewers: compnerd
Reviewed By: compnerd
Subscribers: mehdi_amini, hans, llvm-commits
Differential Revision: https://reviews.llvm.org/D37909
llvm-svn: 313398
| -rw-r--r-- | llvm/lib/IR/AutoUpgrade.cpp | 18 | ||||
| -rw-r--r-- | llvm/test/Bitcode/upgrade-module-flag.ll | 6 |
2 files changed, 22 insertions, 2 deletions
diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp index c143fbc6d07..cf0097fa10e 100644 --- a/llvm/lib/IR/AutoUpgrade.cpp +++ b/llvm/lib/IR/AutoUpgrade.cpp @@ -2363,6 +2363,24 @@ bool llvm::UpgradeModuleFlags(Module &M) { } } } + // Upgrade Objective-C Image Info Section. Removed the whitespce in the + // section name so that llvm-lto will not complain about mismatching + // module flags that is functionally the same. + if (ID->getString() == "Objective-C Image Info Section") { + if (auto *Value = dyn_cast_or_null<MDString>(Op->getOperand(2))) { + SmallVector<StringRef, 4> ValueComp; + Value->getString().split(ValueComp, " "); + if (ValueComp.size() != 1) { + std::string NewValue; + for (auto &S : ValueComp) + NewValue += S.str(); + Metadata *Ops[3] = {Op->getOperand(0), Op->getOperand(1), + MDString::get(M.getContext(), NewValue)}; + ModFlags->setOperand(I, MDNode::get(M.getContext(), Ops)); + Changed = true; + } + } + } } // "Objective-C Class Properties" is recently added for Objective-C. We diff --git a/llvm/test/Bitcode/upgrade-module-flag.ll b/llvm/test/Bitcode/upgrade-module-flag.ll index de6c9b2cf1b..539265beed9 100644 --- a/llvm/test/Bitcode/upgrade-module-flag.ll +++ b/llvm/test/Bitcode/upgrade-module-flag.ll @@ -1,13 +1,15 @@ ; RUN: llvm-as < %s | llvm-dis | FileCheck %s ; RUN: verify-uselistorder < %s -!llvm.module.flags = !{!0, !1, !2} +!llvm.module.flags = !{!0, !1, !2, !3} !0 = !{i32 1, !"PIC Level", i32 1} !1 = !{i32 1, !"PIE Level", i32 1} !2 = !{i32 1, !"Objective-C Image Info Version", i32 0} +!3 = !{i32 1, !"Objective-C Image Info Section", !"__DATA, __objc_imageinfo, regular, no_dead_strip"} ; CHECK: !0 = !{i32 7, !"PIC Level", i32 1} ; CHECK: !1 = !{i32 7, !"PIE Level", i32 1} ; CHECK: !2 = !{i32 1, !"Objective-C Image Info Version", i32 0} -; CHECK: !3 = !{i32 4, !"Objective-C Class Properties", i32 0} +; CHECK: !3 = !{i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"} +; CHECK: !4 = !{i32 4, !"Objective-C Class Properties", i32 0} |
