Fix more merge damage

Author: asuhan

lib/AST/Attr.cpp

@@ -539,13 +539,15 @@ static void printDifferentiableAttrArguments(
   ArrayRef<Requirement> derivativeRequirements;
   if (auto derivativeGenSig = attr->getDerivativeGenericSignature())
     derivativeRequirements = derivativeGenSig->getRequirements();
-  auto requirementsToPrint =
-      makeFilterRange(derivativeRequirements, [&](Requirement req) {
-        if (auto originalGenSig = original->getGenericSignature())
-          if (originalGenSig->isRequirementSatisfied(req))
-            return false;
-        return true;
-      });
+  llvm::SmallVector<Requirement, 8> requirementsToPrint;
+  std::copy_if(derivativeRequirements.begin(), derivativeRequirements.end(),
+               std::back_inserter(requirementsToPrint),
+               [&](Requirement req) {
+                 if (auto originalGenSig = original->getGenericSignature())
+                   if (originalGenSig->isRequirementSatisfied(req))
+                     return false;
+                 return true;
+               });
   if (!requirementsToPrint.empty()) {
     if (!isLeadingClause)
       stream << ' ';

lib/SILOptimizer/Mandatory/Differentiation.cpp

@@ -45,7 +45,6 @@
 #include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Passes.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/Local.h"
 #include "swift/SILOptimizer/Utils/LoopUtils.h"
 #include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"
 #include "llvm/ADT/APSInt.h"

lib/SILOptimizer/Mandatory/Differentiation.h

@@ -26,7 +26,6 @@
 
 #include "swift/SIL/TypeSubstCloner.h"
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
-#include "swift/SILOptimizer/Utils/Local.h"
 
 namespace swift {
 

lib/SILOptimizer/Transforms/SILMem2Reg.cpp

@@ -973,17 +973,6 @@ void MemoryToRegisters::promoteAllocs(ArrayRef<AllocStackInst*> allocs) {
   }
 }
 
-/// Attempt to promote the specified array of stack allocations to SSA
-/// registers.  Promotion can fail if the allocation escapes.
-void swift::promoteAllocsToSSA(ArrayRef<AllocStackInst*> allocs,
-                               DominanceInfo *domInfo) {
-  if (allocs.empty()) return;
-
-  auto *fn = allocs.front()->getFunction();
-  assert(fn && "Shouldn't have alloc stacks in global var initializers");
-  MemoryToRegisters(*fn, domInfo).promoteAllocs(allocs);
-}
-
 
 namespace {
 class SILMem2Reg : public SILFunctionTransform {