Merge pull request #5500 from swiftwasm/katei/minimize-driver-diff

Revert changes left behind when reverting SwiftLTO

Author: kateinoigakukun

lib/Driver/Driver.cpp

@@ -2064,7 +2064,6 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
         }
       case file_types::TY_AutolinkFile:
       case file_types::TY_Object:
-      case file_types::TY_LLVM_BC:
       case file_types::TY_TBD:
         // Object inputs are only okay if linking.
         if (OI.shouldLink()) {
@@ -2078,6 +2077,7 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
       case file_types::TY_Dependencies:
       case file_types::TY_Assembly:
       case file_types::TY_LLVM_IR:
+      case file_types::TY_LLVM_BC:
       case file_types::TY_SerializedDiagnostics:
       case file_types::TY_ClangHeader:
       case file_types::TY_ClangModuleFile:

lib/IRGen/GenMeta.cpp

@@ -6516,7 +6516,7 @@ GenericArgumentMetadata irgen::addGenericRequirements(
           unsigned tag = unsigned(descriptorRef.isIndirect());
           if (protocol->isObjC())
             tag |= 0x02;
-
+          
           B.addTaggedRelativeOffset(IGM.RelativeAddressTy,
                                     descriptorRef.getValue(),
                                     tag);

lib/IRGen/IRGenFunction.cpp

@@ -327,7 +327,6 @@ IRGenFunction::emitLoadOfRelativePointer(Address addr, bool isFar,
   if (!isFar) {
     value = Builder.CreateSExt(value, IGM.IntPtrTy);
   }
-
   auto *addrInt = Builder.CreatePtrToInt(addr.getAddress(), IGM.IntPtrTy);
   auto *uncastPointerInt = Builder.CreateAdd(addrInt, value);
   auto *uncastPointer = Builder.CreateIntToPtr(uncastPointerInt, IGM.Int8PtrTy);

lib/IRGen/MetadataRequest.cpp

@@ -3080,15 +3080,13 @@ emitMetadataAccessByMangledName(IRGenFunction &IGF, CanType type,
                                                        IGM.Int32Ty);
     stringAddrOffset = subIGF.Builder.CreateSExtOrBitCast(stringAddrOffset,
                                                           IGM.SizeTy);
-
-    llvm::Value *stringAddr;
     auto stringAddrBase = subIGF.Builder.CreatePtrToInt(cache, IGM.SizeTy);
     if (IGM.getModule()->getDataLayout().isBigEndian()) {
       stringAddrBase = subIGF.Builder.CreateAdd(stringAddrBase,
                                       llvm::ConstantInt::get(IGM.SizeTy, 4));
     }
-    stringAddr = subIGF.Builder.CreateAdd(stringAddrBase,
-                                              stringAddrOffset);
+    auto stringAddr = subIGF.Builder.CreateAdd(stringAddrBase,
+                                               stringAddrOffset);
     stringAddr = subIGF.Builder.CreateIntToPtr(stringAddr, IGM.Int8PtrTy);
 
     llvm::CallInst *call;