Addressing feedbacks.

llvm/lib/Object/IRSymtab.cpp

 #include <string>
 #include <utility>
 #include <vector>
 
 using namespace llvm;
 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"));
 
 static const char *PreservedSymbols[] = {
 #define HANDLE_LIBCALL(code, name) name,
 #include "llvm/IR/RuntimeLibcalls.def"
 #undef HANDLE_LIBCALL
     // There are global variables, so put it here instead of in
static Expected<FileContents> upgrade(ArrayRef<BitcodeModule> BMs) {
   return std::move(FC);
 }
 
 Expected<FileContents> irsymtab::readBitcode(const BitcodeFileContents &BFC) {
   if (BFC.Mods.empty())
     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);
 
     // We cannot use the regular reader to read the version and producer,
     // because it will expect the header to be in the current format. The only
     // thing we can rely on is that the version and producer will be present as
     // the first struct elements.
     auto *Hdr = reinterpret_cast<const storage::Header *>(BFC.Symtab.data());
     unsigned Version = Hdr->Version;
     StringRef Producer = Hdr->Producer.get(BFC.StrtabForSymtab);
     if (Version != storage::Header::kCurrentVersion ||
         Producer != kExpectedProducerName)
       return upgrade(BFC.Mods);
   }
 
   FileContents FC;
   FC.TheReader = {{BFC.Symtab.data(), BFC.Symtab.size()},
                   {BFC.StrtabForSymtab.data(), BFC.StrtabForSymtab.size()}};
 
   // Finally, make sure that the number of modules in the symbol table matches
   // 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));
 
   return std::move(FC);
 }