---

yaml
---
r: 348516
b: refs/heads/master
c: 7222d08
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e6fd1101e109b6139f5cfd4551856d8838c65adb
+refs/heads/master: 7222d08912b81f22e7944da412a648a7ea54ce6b
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/SILOptimizer/Mandatory/MandatoryCombine.cpp

@@ -74,6 +74,70 @@ class MandatoryCombiner final
   /// Base visitor that does not do anything.
   SILInstruction *visitSILInstruction(SILInstruction *) { return nullptr; }
 
+  /// \returns whether all the values are of trivial type in the provided
+  ///          function.
+  template <typename Values>
+  static bool areAllValuesTrivial(Values values, SILFunction &function) {
+    return llvm::all_of(values, [&](SILValue value) -> bool {
+      return value->getType().isTrivial(function);
+    });
+  }
+
+  SILInstruction *visitApplyInst(ApplyInst *instruction) {
+    // Apply this pass only to partial applies all of whose arguments are
+    // trivial.
+    auto calledValue = instruction->getCallee();
+    if (calledValue == nullptr) {
+      return nullptr;
+    }
+    auto fullApplyCallee = calledValue->getDefiningInstruction();
+    if (fullApplyCallee == nullptr) {
+      return nullptr;
+    }
+    auto partialApply = dyn_cast<PartialApplyInst>(fullApplyCallee);
+    if (partialApply == nullptr) {
+      return nullptr;
+    }
+    auto *function = partialApply->getCalleeFunction();
+    if (function == nullptr) {
+      return nullptr;
+    }
+    ApplySite fullApplySite(instruction);
+    auto fullApplyArguments = fullApplySite.getArguments();
+    if (!areAllValuesTrivial(fullApplyArguments, *function)) {
+      return nullptr;
+    }
+    auto partialApplyArguments = ApplySite(partialApply).getArguments();
+    if (!areAllValuesTrivial(partialApplyArguments, *function)) {
+      return nullptr;
+    }
+
+    auto callee = partialApply->getCallee();
+
+    ApplySite partialApplySite(partialApply);
+
+    SmallVector<SILValue, 8> argsVec;
+    llvm::copy(fullApplyArguments, std::back_inserter(argsVec));
+    llvm::copy(partialApplyArguments, std::back_inserter(argsVec));
+
+    SILBuilderWithScope builder(instruction, &createdInstructions);
+    ApplyInst *replacement = builder.createApply(
+        /*Loc=*/instruction->getDebugLocation().getLocation(), /*Fn=*/callee,
+        /*Subs=*/partialApply->getSubstitutionMap(),
+        /*Args*/ argsVec,
+        /*isNonThrowing=*/instruction->isNonThrowing(),
+        /*SpecializationInfo=*/partialApply->getSpecializationInfo());
+
+    worklist.replaceInstructionWithInstruction(instruction, replacement
+#ifndef NDEBUG
+                                               ,
+                                               /*instructionDescription=*/""
+#endif
+    );
+    tryDeleteDeadClosure(partialApply, instModCallbacks);
+    return nullptr;
+  }
+
   void addReachableCodeToWorklist(SILFunction &function) {
     SmallBlotSetVector<SILBasicBlock *, 32> blockWorklist;
     SmallBlotSetVector<SILBasicBlock *, 32> blocksVisited;

trunk/test/IRGen/indirect_argument.sil

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend %s -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s
+// RUN: %target-swift-frontend -Xllvm -sil-disable-pass=MandatoryCombine %s -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s
 import Swift
 import Builtin