Update patch to account for earlier codebase

Update the patch to account for a couple of master changes that aren't in 4.2:
- `getAsNominalTypeOrNominalTypeExtensionContext` was renamed to `getSelfNominalTypeDecl`
- Superclass constrained protocols aren't implemented

Author: hamishknight

lib/Sema/CSRanking.cpp

@@ -1002,8 +1002,8 @@ SolutionCompareResult ConstraintSystem::compareSolutions(
         choice1.getKind() != OverloadChoiceKind::DeclViaDynamic &&
         choice2.getKind() != OverloadChoiceKind::DeclViaDynamic &&
         isa<VarDecl>(decl1) && isa<VarDecl>(decl2)) {
-      auto *nominal1 = dc1->getSelfNominalTypeDecl();
-      auto *nominal2 = dc2->getSelfNominalTypeDecl();
+      auto *nominal1 = dc1->getAsNominalTypeOrNominalTypeExtensionContext();
+      auto *nominal2 = dc2->getAsNominalTypeOrNominalTypeExtensionContext();
       if (nominal1 && nominal2 && nominal1 != nominal2) {
         isVarAndNotProtocol1 = !isa<ProtocolDecl>(nominal1);
         isVarAndNotProtocol2 = !isa<ProtocolDecl>(nominal2);

test/Constraints/sr7425.swift

@@ -12,11 +12,6 @@ extension Y {
   var bar: Int { return foo }
 }
 
-protocol Z : Y {
-  var foo: Int { get }
-  var bar: Int { get }
-}
-
 class GenericClass<T> {
   var foo: T
   init(_ foo: T) { self.foo = foo }
@@ -37,16 +32,6 @@ func testExistentialPropertyProtocolClass(_ t: X & Y) {
   _ = t.bar
 }
 
-func testGenericPropertySubclassConstrainedProtocol<T : Z>(_ t: T) {
-  _ = t.foo
-  _ = t.bar
-}
-
-func testExistentialPropertySubclassConstrainedProtocol(_ t: Z) {
-  _ = t.foo
-  _ = t.bar
-}
-
 func testExistentialPropertyProtocolGenericClass(_ t: GenericClass<Int> & X) {
   _ = t.foo
   _ = t.bar