diff options
author | Steven Wu <stevenwu@apple.com> | 2018-07-09 16:52:05 +0000 |
---|---|---|
committer | Steven Wu <stevenwu@apple.com> | 2018-07-09 16:52:05 +0000 |
commit | e1f7c5f8c72f77f5c25aa501a974e36b00f949a7 (patch) | |
tree | bc853a25e830767ddae62c1d5139a30773a69a5b /llvm/lib/Bitcode/Reader | |
parent | 75c348a0974a6906bee27160dcc07c727129c6a7 (diff) | |
download | bcm5719-llvm-e1f7c5f8c72f77f5c25aa501a974e36b00f949a7.tar.gz bcm5719-llvm-e1f7c5f8c72f77f5c25aa501a974e36b00f949a7.zip |
[BitcodeReader] Infer the correct runtime preemption for GlobalValue
Summary:
To allow bitcode built by old compiler to pass the current verifer,
BitcodeReader needs to auto infer the correct runtime preemption from
linkage and visibility for GlobalValues.
Since llvm-6.0 bitcode already contains the new field but can be
incorrect in some cases, the attribute needs to be recomputed all the
time in BitcodeReader. This will make all the GVs has dso_local marked
correctly if read from bitcode, and it should still allow the verifier
to catch mistakes in optimization passes.
This should fix PR38009.
Reviewers: sfertile, vsk
Reviewed By: vsk
Subscribers: dexonsmith, llvm-commits
Differential Revision: https://reviews.llvm.org/D49039
llvm-svn: 336560
Diffstat (limited to 'llvm/lib/Bitcode/Reader')
-rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index b0e04075516..c45b441238b 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -2831,6 +2831,13 @@ Error BitcodeReader::parseComdatRecord(ArrayRef<uint64_t> Record) { return Error::success(); } +static void inferDSOLocal(GlobalValue *GV) { + // infer dso_local from linkage and visibility if it is not encoded. + if (GV->hasLocalLinkage() || + (!GV->hasDefaultVisibility() && !GV->hasExternalWeakLinkage())) + GV->setDSOLocal(true); +} + Error BitcodeReader::parseGlobalVarRecord(ArrayRef<uint64_t> Record) { // v1: [pointer type, isconst, initid, linkage, alignment, section, // visibility, threadlocal, unnamed_addr, externally_initialized, @@ -2923,6 +2930,7 @@ Error BitcodeReader::parseGlobalVarRecord(ArrayRef<uint64_t> Record) { if (Record.size() > 13) { NewGV->setDSOLocal(getDecodedDSOLocal(Record[13])); } + inferDSOLocal(NewGV); return Error::success(); } @@ -3007,6 +3015,7 @@ Error BitcodeReader::parseFunctionRecord(ArrayRef<uint64_t> Record) { if (Record.size() > 15) { Func->setDSOLocal(getDecodedDSOLocal(Record[15])); } + inferDSOLocal(Func); ValueList.push_back(Func); @@ -3083,6 +3092,8 @@ Error BitcodeReader::parseGlobalIndirectSymbolRecord( } if (OpNum != Record.size()) NewGA->setDSOLocal(getDecodedDSOLocal(Record[OpNum++])); + inferDSOLocal(NewGA); + ValueList.push_back(NewGA); IndirectSymbolInits.push_back(std::make_pair(NewGA, Val)); return Error::success(); |