diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-10-06 18:06:59 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-10-06 18:06:59 +0000 |
| commit | 46a59fdab6d22fd701c875df31af9bc26eec24ef (patch) | |
| tree | 3c69de5d5bf893386191d2e6a0f27ee87238a74a /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
| parent | 96b04b68ed15e596d220449634933815ea09c35c (diff) | |
| download | bcm5719-llvm-46a59fdab6d22fd701c875df31af9bc26eec24ef.tar.gz bcm5719-llvm-46a59fdab6d22fd701c875df31af9bc26eec24ef.zip | |
Bitcode: add an auto-upgrade for LTO section name
The bitcode reader looks specifically for `__DATA, __objc_catlist` as a
section name. However, SVN r304661 removed the spaces (the two names
are functionally equivalent but do not compare equally
lexicographically). This causes compatibility issues. Add an
auto-upgrade path for removing the spaces as well as use the new name in
the LTO plugin.
llvm-svn: 315086
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 560a71bbf76..68b36eef5eb 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -265,7 +265,7 @@ static Expected<bool> hasObjCCategoryInModule(BitstreamCursor &Stream) { if (convertToString(Record, 0, S)) return error("Invalid record"); // Check for the i386 and other (x86_64, ARM) conventions - if (S.find("__DATA, __objc_catlist") != std::string::npos || + if (S.find("__DATA,__objc_catlist") != std::string::npos || S.find("__OBJC,__category") != std::string::npos) return true; break; |
