Update how createApplyWithConcreteType checks if it can update Apply

args

createApplyWithConcreteType used to update Apply unconditionally. There
may have been cases prior to supporting store instructions that
miscompiled because of this but, there are certainly cases after
supporting store instructions. Therefore, it is important that the apply is updated only when the substitution can accept the new args.

Author: zoecarver

lib/SILOptimizer/FunctionSignatureTransforms/ExistentialSpecializer.cpp

@@ -336,9 +336,6 @@ void ExistentialSpecializer::specializeExistentialArgsInAppliesWithinFunction(
         /// Update statistics on the number of functions specialized.
         ++NumFunctionsWithExistentialArgsSpecialized;
 
-        llvm::errs() << "Adding function to pass manger in existential\n";
-        llvm::errs() << ET.getExistentialSpecializedFunction()->getName() << "\n";
-        
         /// Make sure the PM knows about the new specialized inner function.
         addFunctionToPassManagerWorklist(ET.getExistentialSpecializedFunction(),
                                          Callee);

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -407,24 +407,9 @@ void SILPassManager::runPassOnFunction(unsigned TransIdx, SILFunction *F) {
   Mod->registerDeleteNotificationHandler(SFT);
   if (breakBeforeRunning(F->getName(), SFT))
     LLVM_BUILTIN_DEBUGTRAP;
-
-  
-  llvm::errs() << "FUNC NAME: ";
-  F->printName(llvm::errs());
-  llvm::errs() << "\nDEMA NAME: " << Demangle::demangleSymbolAsString(F->getName()) << "\n";
-  llvm::errs() << "PASS NAME: " << SFT->getID() << "\n";
-
   SFT->run();
   assert(analysesUnlocked() && "Expected all analyses to be unlocked!");
   Mod->removeDeleteNotificationHandler(SFT);
-  
-  llvm::errs() << "Finished running pass\n\t\t****\n";
-  if (F->getName().contains("ss6UInt32VSjsSj9magnitude9MagnitudeQzvgTW") ||
-      F->getName().contains("ss2geoiySbx_q_q0_q1_q2_q3_t_x_q_q0_q1_q2_q3_ttSLRzSLR_SLR0_SLR1_SLR2_SLR3_r4_lF")) {
-    llvm::errs() << "Dumping module to file...";
-    F->getModule().dump("/Users/zoe/Developer/swift-source/build/buildbot_incremental/swift-macosx-x86_64/module_dump.txt");
-    llvm::errs() << "done.\n";
-  }
 
   auto Delta = (std::chrono::system_clock::now() - StartTime).count();
   if (SILPrintPassTime) {

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -893,17 +893,12 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
     // Ensure that we have a concrete value to propagate.
     assert(CEI.ConcreteValue);
 
-    // If the parameter is expecting a pointer, then we need to create a
-    // alloc_stack to store the temporary value.
-    if (Apply.getArgument(ArgIdx)->getType().isAddress()) {
-      auto argSub =
-          ConcreteArgumentCopy::generate(CEI, Apply, ArgIdx, BuilderCtx);
-      if (argSub) {
-        concreteArgCopies.push_back(*argSub);
-        NewArgs.push_back(argSub->tempArg);
-      }
+    auto argSub =
+        ConcreteArgumentCopy::generate(CEI, Apply, ArgIdx, BuilderCtx);
+    if (argSub) {
+      concreteArgCopies.push_back(*argSub);
+      NewArgs.push_back(argSub->tempArg);
     } else {
-      // Otherwise, we can just use the value itself.
       NewArgs.push_back(CEI.ConcreteValue);
     }
 
@@ -928,7 +923,17 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
         });
   }
 
-  if (NewArgs.size() != Apply.getNumArguments()) {
+  bool canUpdateArgs = [&]() {
+    auto substTy = Apply.getCallee()->getType().substGenericArgs(Apply.getModule(), NewCallSubs, Apply.getFunction()->getTypeExpansionContext()).getAs<SILFunctionType>();
+    SILFunctionConventions conv(substTy, SILModuleConventions(Apply.getModule()));
+    bool canUpdate = true;
+    for (unsigned index = 0; index < conv.getNumSILArguments(); ++index) {
+      canUpdate &= conv.getSILArgumentType(index) == NewArgs[index]->getType();
+    }
+    return canUpdate;
+  }();
+
+  if (!canUpdateArgs) {
     // Remove any new instructions created while attempting to optimize this
     // apply. Since the apply was never rewritten, if they aren't removed here,
     // they will be removed later as dead when visited by SILCombine, causing

lib/SILOptimizer/Transforms/AllocBoxToStack.cpp

@@ -793,8 +793,6 @@ specializePartialApply(SILOptFunctionBuilder &FuncBuilder,
                                ClonedName);
     Cloner.populateCloned();
     ClonedFn = Cloner.getCloned();
-    llvm::errs() << "Adding function to pass manger in alloc box\n";
-    llvm::errs() << ClonedFn->getName() << "\n";
     pass.T->addFunctionToPassManagerWorklist(ClonedFn, F);
   }
 

lib/SILOptimizer/Transforms/Devirtualizer.cpp

@@ -102,11 +102,8 @@ bool Devirtualizer::devirtualizeAppliesInFunction(SILFunction &F,
     // We may not have optimized these functions yet, and it could
     // be beneficial to rerun some earlier passes on the current
     // function now that we've made these direct references visible.
-    if (CalleeFn->isDefinition() && CalleeFn->shouldOptimize()) {
-      llvm::errs() << "Adding function to pass manger in devirt\n";
-      llvm::errs() << CalleeFn->getName() << "\n";
+    if (CalleeFn->isDefinition() && CalleeFn->shouldOptimize())
       addFunctionToPassManagerWorklist(CalleeFn, nullptr);
-    }
   }
 
   return Changed;

lib/SILOptimizer/Transforms/GenericSpecializer.cpp

@@ -129,8 +129,6 @@ bool GenericSpecializer::specializeAppliesInFunction(SILFunction &F) {
       // (as opposed to returning a previous specialization), we need to notify
       // the pass manager so that the new functions get optimized.
       for (SILFunction *NewF : reverse(NewFunctions)) {
-        llvm::errs() << "Adding function to pass manger in generic spec\n";
-        llvm::errs() << NewF->getName() << "\n";
         addFunctionToPassManagerWorklist(NewF, Callee);
       }
     }