---

yaml
---
r: 278267
b: refs/heads/swift-5.1-old-llvm-branch
c: 3615b0e
h: refs/heads/master
i:
  278265: 66ec988
  278263: 876d293

Author: technicated

[refs]

@@ -1241,7 +1241,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-01-24-a: b6f62823aa5010b2ae53f15f72a57
 refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e0
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
-refs/heads/swift-5.1-old-llvm-branch: bad2230ccdf2bbe49e2048305e8914b565598413
+refs/heads/swift-5.1-old-llvm-branch: 3615b0ee4bff1a1092432ff36376da29ce08a3d7
 refs/heads/swift-5.1-branch: 8060872acb4105d9655e020fe047e1ebcd77d0fb
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e

branches/swift-5.1-old-llvm-branch/lib/SILGen/SILGen.h

@@ -359,9 +359,6 @@ class LLVM_LIBRARY_VISIBILITY SILGenModule : public ASTVisitor<SILGenModule> {
                               CanType baseTy,
                               bool forPropertyDescriptor);
 
-  KeyPathPatternComponent
-  emitKeyPathComponentForTupleElement(unsigned tupleIndex, CanType baseTy);
-    
   /// Known functions for bridging.
   SILDeclRef getStringToNSStringFn();
   SILDeclRef getNSStringToStringFn();

branches/swift-5.1-old-llvm-branch/lib/SILGen/SILGenExpr.cpp

@@ -3574,18 +3574,6 @@ SILGenModule::emitKeyPathComponentForDecl(SILLocation loc,
   llvm_unreachable("unknown kind of storage");
 }
 
-KeyPathPatternComponent
-SILGenModule::emitKeyPathComponentForTupleElement(unsigned tupleIndex,
-                                                  CanType baseTy) {
-  assert(baseTy->is<TupleType>() && "baseTy is expected to be a TupleType");
-
-  auto elementTy = baseTy->getAs<TupleType>()
-    ->getElementType(tupleIndex)
-    ->getCanonicalType();
-
-  return KeyPathPatternComponent::forTupleElement(tupleIndex, elementTy);
-}
-
 RValue RValueEmitter::visitKeyPathExpr(KeyPathExpr *E, SGFContext C) {
   if (E->isObjC()) {
     return visit(E->getObjCStringLiteralExpr(), C);
@@ -3657,10 +3645,15 @@ RValue RValueEmitter::visitKeyPathExpr(KeyPathExpr *E, SGFContext C) {
     }
 
     case KeyPathExpr::Component::Kind::TupleElement: {
+      assert(baseTy->is<TupleType>() && "baseTy is expected to be a TupleType");
+
       auto tupleIndex = component.getTupleIndex();
+      auto elementTy = baseTy->getAs<TupleType>()
+        ->getElementType(tupleIndex)
+        ->getCanonicalType();
+
       loweredComponents.push_back(
-        SGF.SGM.emitKeyPathComponentForTupleElement(tupleIndex,
-                                                    baseTy));
+        KeyPathPatternComponent::forTupleElement(tupleIndex, elementTy));
 
       baseTy = loweredComponents.back().getComponentType();