[PATCH] D118275: Addressing feedbacks.

[Hongtao Yu via Phabricator via llvm-commits]

hoy created this revision.
Herald added subscribers: modimo, wenlei, hiraditya.
hoy requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D118275

Files:
  llvm/lib/Object/IRSymtab.cpp


Index: llvm/lib/Object/IRSymtab.cpp
===================================================================
--- llvm/lib/Object/IRSymtab.cpp
+++ llvm/lib/Object/IRSymtab.cpp
@@ -43,7 +43,7 @@
 using namespace irsymtab;
 
 cl::opt<bool>
-    DisableBitcodeUpgrade("disable-bitcode-version-upgrade", cl::init(false),
+    DisableBitcodeVersionUpgrade("disable-bitcode-version-upgrade", cl::init(false),
                           cl::Hidden,
                           cl::desc("Disable automatic bitcode upgrade for version mismatch"));
 
@@ -408,7 +408,7 @@
     return make_error<StringError>("Bitcode file does not contain any modules",
                                    inconvertibleErrorCode());
 
-  if (!DisableBitcodeUpgrade) {
+  if (!DisableBitcodeVersionUpgrade) {
     if (BFC.StrtabForSymtab.empty() ||
         BFC.Symtab.size() < sizeof(storage::Header))
       return upgrade(BFC.Mods);
@@ -433,9 +433,8 @@
   // the number of modules in the bitcode file. If they differ, it may mean that
   // the bitcode file was created by binary concatenation, so we need to create
   // a new symbol table from scratch.
-  if (!DisableBitcodeUpgrade)
-    if (FC.TheReader.getNumModules() != BFC.Mods.size())
-      return upgrade(std::move(BFC.Mods));
+  if (FC.TheReader.getNumModules() != BFC.Mods.size())
+    return upgrade(std::move(BFC.Mods));
 
   return std::move(FC);
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118275.403347.patch
Type: text/x-patch
Size: 1383 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220126/23c79f65/attachment.bin>