Merge pull request #34642 from kavon/shadowing-concurrency-lib

Author: swift-ci

lib/AST/NameLookup.cpp

@@ -510,6 +510,21 @@ static void recordShadowedDeclsAfterTypeMatch(
         }
       }
 
+      // Next, prefer any other module over the _Concurrency module.
+      if (auto concurModule = ctx.getLoadedModule(ctx.Id_Concurrency)) {
+        if ((firstModule == concurModule) != (secondModule == concurModule)) {
+          // If second module is _Concurrency, then it is shadowed by first.
+          if (secondModule == concurModule) {
+            shadowed.insert(secondDecl);
+            continue;
+          }
+
+          // Otherwise, the first declaration is shadowed by the second.
+          shadowed.insert(firstDecl);
+          break;
+        }
+      }
+
       // The Foundation overlay introduced Data.withUnsafeBytes, which is
       // treated as being ambiguous with SwiftNIO's Data.withUnsafeBytes
       // extension. Apply a special-case name shadowing rule to use the

test/Concurrency/Inputs/ShadowsConcur.swift

@@ -0,0 +1,5 @@
+
+public struct Task {
+  public var someProperty : String = "123"
+  public init() { }
+}

test/Concurrency/concurrency_module_shadowing.swift

@@ -0,0 +1,13 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -emit-module-path %t/ShadowsConcur.swiftmodule -module-name ShadowsConcur %S/Inputs/ShadowsConcur.swift
+// RUN: %target-typecheck-verify-swift -I %t -enable-experimental-concurrency
+// REQUIRES: concurrency
+
+
+import ShadowsConcur
+
+func f(_ t : Task) -> Bool {
+  return t.someProperty == "123"
+}
+
+func g(_: _Concurrency.Task) {}