Merge pull request #9177 from shajrawi/fix_verifier_large_types

Fix an issue that was uncovered by the linux fix: resolves verifier bug in 32-bit code

Author: Joe Shajrawi

lib/IRGen/LoadableByAddress.cpp

@@ -417,7 +417,11 @@ void LargeValueVisitor::visitApply(ApplySite applySite) {
     SILValue currOperand = operand.get();
     SILType silType = currOperand->getType();
     SILType newSilType = getNewSILType(genEnv, silType, pass.Mod);
-    if (silType != newSilType) {
+    if (silType != newSilType ||
+        std::find(pass.largeLoadableArgs.begin(), pass.largeLoadableArgs.end(),
+                  currOperand) != pass.largeLoadableArgs.end() ||
+        std::find(pass.funcSigArgs.begin(), pass.funcSigArgs.end(),
+                  currOperand) != pass.funcSigArgs.end()) {
       pass.applies.push_back(applySite.getInstruction());
       return;
     }

lib/SIL/SILVerifier.cpp

@@ -2244,9 +2244,11 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
 
   void checkClassMethodInst(ClassMethodInst *CMI) {
     auto overrideTy = TC.getConstantOverrideType(CMI->getMember());
-    requireSameType(CMI->getType(),
-                    SILType::getPrimitiveObjectType(overrideTy),
-        "result type of class_method must match abstracted type of method");
+    if (CMI->getModule().getStage() != SILStage::Lowered) {
+      requireSameType(
+          CMI->getType(), SILType::getPrimitiveObjectType(overrideTy),
+          "result type of class_method must match abstracted type of method");
+    }
     auto methodType = requireObjectType(SILFunctionType, CMI,
                                         "result of class_method");
     require(!methodType->getExtInfo().hasContext(),
@@ -2280,8 +2282,11 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
 
   void checkSuperMethodInst(SuperMethodInst *CMI) {
     auto overrideTy = TC.getConstantOverrideType(CMI->getMember());
-    requireSameType(CMI->getType(), SILType::getPrimitiveObjectType(overrideTy),
-                    "result type of super_method must match abstracted type of method");
+    if (CMI->getModule().getStage() != SILStage::Lowered) {
+      requireSameType(
+          CMI->getType(), SILType::getPrimitiveObjectType(overrideTy),
+          "result type of super_method must match abstracted type of method");
+    }
     auto methodType = requireObjectType(SILFunctionType, CMI,
                                         "result of super_method");
     require(!methodType->getExtInfo().hasContext(),
@@ -4226,12 +4231,14 @@ void SILVTable::verify(const SILModule &M) const {
       llvm::raw_svector_ostream os(baseName);
       entry.Method.print(os);
     }
-    
-    SILVerifier(*entry.Implementation)
-      .requireABICompatibleFunctionTypes(
-                    baseInfo.getSILType().castTo<SILFunctionType>(),
-                    entry.Implementation->getLoweredFunctionType(),
-                    "vtable entry for " + baseName + " must be ABI-compatible");
+
+    if (M.getStage() != SILStage::Lowered) {
+      SILVerifier(*entry.Implementation)
+          .requireABICompatibleFunctionTypes(
+              baseInfo.getSILType().castTo<SILFunctionType>(),
+              entry.Implementation->getLoweredFunctionType(),
+              "vtable entry for " + baseName + " must be ABI-compatible");
+    }
   }
 #endif
 }