---

yaml
---
r: 322431
b: refs/heads/tensorflow-next
c: aae6eba
h: refs/heads/master
i:
  322429: bb15419
  322427: 42386ce
  322423: b581a6e
  322415: 432eee1
  322399: 7cea465
  322367: 49b23e7
  322303: 20b4ec2

Author: swift-ci

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: 09c4baf1e4e5b6123597964fd0feb5c30079bf23
+refs/heads/tensorflow-next: aae6ebad4d07e0595f163b3eceef5b39c024af6e

branches/tensorflow-next/lib/SILOptimizer/Transforms/PerformanceInliner.cpp

@@ -363,7 +363,7 @@ bool SILPerformanceInliner::isProfitableToInline(
         auto Subs = FAI.getSubstitutionMap();
 
         // Bail if it is not a generic call or inlining of generics is forbidden.
-        if (!EnableSILInliningOfGenerics || Subs.empty())
+        if (!EnableSILInliningOfGenerics || !Subs.hasAnySubstitutableParams())
           continue;
 
         if (!isa<FunctionRefInst>(def) && !isa<ClassMethodInst>(def) &&

branches/tensorflow-next/lib/SILOptimizer/Utils/Generics.cpp

@@ -390,6 +390,8 @@ static bool shouldNotSpecialize(SILFunction *Callee, SILFunction *Caller,
 bool ReabstractionInfo::prepareAndCheck(ApplySite Apply, SILFunction *Callee,
                                         SubstitutionMap ParamSubs,
                                         OptRemark::Emitter *ORE) {
+  assert(ParamSubs.hasAnySubstitutableParams());
+
   if (shouldNotSpecialize(Callee, Apply ? Apply.getFunction() : nullptr))
     return false;