Break Another Overload Resolution Cycle

lib/Sema/CSSimplify.cpp

@@ -4970,8 +4970,13 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
     if (auto *PBI = dyn_cast<PatternBindingInitializer>(DC)) {
       if (auto *VD = dyn_cast<VarDecl>(decl)) {
         if (PBI->getBinding() == VD->getParentPatternBinding()) {
-          result.addUnviable(candidate,
-                             MemberLookupResult::UR_InstanceMemberOnType);
+          // If this is a recursive reference to an instance variable,
+          // try to see if we can give a good diagnostic by adding it as
+          // an unviable candidate.
+          if (!VD->isStatic()) {
+            result.addUnviable(candidate,
+                               MemberLookupResult::UR_InstanceMemberOnType);
+          }
           return;
         }
       }

test/decl/circularity.swift

@@ -43,3 +43,15 @@ class Sub: Base {
         return foo(1) // expected-error {{variable used within its own initial value}}
     }()
 }
+
+extension Float {
+    static let pickMe: Float = 1
+}
+
+extension SIMD3 {
+  init(_ scalar: Scalar) { self.init(repeating: scalar) }
+}
+
+extension SIMD3 where SIMD3.Scalar == Float {
+    static let pickMe = SIMD3(.pickMe)
+}