Merge branch 'master' of https://github.com/apple/swift into SR-11295-warning-unecessary-casts

Author: LucianoPAlmeida

docs/WindowsBuild.md

@@ -22,11 +22,8 @@ Visual Studio 2017 or newer is needed to build swift on Windows.
 1. Clone `apple/swift-lldb` into a folder named `lldb`
 1. Clone `apple/swift-llbuild` into a folder named `llbuild`
 1. Clone `apple/swift-package-manager` info a folder named `swift-package-manager`
-1. Clone `curl` into a folder named `curl`
-1. Clone `libxml2` into a folder named `libxml2`
 
-- Currently, other repositories in the Swift project have not been tested and
-  may not be supported.
+- Currently, other repositories in the Swift project have not been tested and may not be supported.
 
 This guide assumes your sources live at the root of `S:`. If your sources live elsewhere, you can create a substitution for this:
 
@@ -47,8 +44,6 @@ git clone https://github.com/apple/swift-corelibs-xctest
 git clone https://github.com/apple/swift-lldb lldb
 git clone https://github.com/apple/swift-llbuild llbuild
 git clone -c core.autocrlf=input https://github.com/apple/swift-package-manager
-git clone https://github.com/curl/curl.git
-git clone https://gitlab.gnome.org/GNOME/libxml2.git
 ```
 
 ## 3. Acquire ICU, SQLite3, curl, libxml2
@@ -183,7 +178,7 @@ cmake -G Ninja^
   -DClang_DIR="S:/b/llvm/lib/cmake/clang"^
   -DSwift_DIR="S:/b/swift/lib/cmake/swift"^
   -DCMAKE_BUILD_TYPE=RelWithDebInfo^
-  -DLLDB_ALLOW_STATIC_BINDINGS=YES^
+  -DLLDB_USE_STATIC_BINDINGS=YES^
   -DLLVM_ENABLE_ASSERTIONS=ON^
   -DPYTHON_HOME="%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64"^
   S:\lldb

lib/AST/Type.cpp

@@ -3572,8 +3572,6 @@ TypeBase::getContextSubstitutions(const DeclContext *dc,
   if (auto *ownerClass = dyn_cast<ClassDecl>(ownerNominal))
     baseTy = baseTy->getSuperclassForDecl(ownerClass);
 
-  assert(ownerNominal == baseTy->getAnyNominal());
-
   // Gather all of the substitutions for all levels of generic arguments.
   auto genericSig = dc->getGenericSignatureOfContext();
   if (!genericSig)
@@ -3583,6 +3581,9 @@ TypeBase::getContextSubstitutions(const DeclContext *dc,
   unsigned n = params.size();
 
   while (baseTy && n > 0) {
+    if (baseTy->is<ErrorType>())
+      break;
+
     // For a bound generic type, gather the generic parameter -> generic
     // argument substitutions.
     if (auto boundGeneric = baseTy->getAs<BoundGenericType>()) {

lib/Sema/TypeCheckDeclOverride.cpp

@@ -77,15 +77,16 @@ Type swift::getMemberTypeForComparison(ASTContext &ctx, ValueDecl *member,
   SubscriptDecl *subscript = dyn_cast_or_null<SubscriptDecl>(abstractStorage);
 
   auto memberType = member->getInterfaceType();
+  if (memberType->is<ErrorType>())
+    return memberType;
+
   if (derivedDecl) {
     auto *dc = derivedDecl->getDeclContext();
     auto owningType = dc->getDeclaredInterfaceType();
     assert(owningType);
 
     memberType = owningType->adjustSuperclassMemberDeclType(member, derivedDecl,
                                                             memberType);
-    if (memberType->hasError())
-      return memberType;
   }
 
   if (method) {

test/SILGen/default_arguments.swift

@@ -383,3 +383,9 @@ func stupidGames(x: Int = 3) -> Int {
   return x
 }
 stupidGames(x:)()
+
+func genericMagic<T : ExpressibleByStringLiteral>(x: T = #file) -> T {
+  return x
+}
+
+let _: String = genericMagic()

test/decl/circularity.swift

@@ -55,3 +55,32 @@ extension SIMD3 {
 extension SIMD3 where SIMD3.Scalar == Float {
     static let pickMe = SIMD3(.pickMe)
 }
+
+// Test case with circular overrides
+protocol P {
+    associatedtype A
+    // expected-note@-1 {{protocol requires nested type 'A'; do you want to add it?}}
+    func run(a: A)
+}
+
+class C1 {
+    func run(a: Int) {}
+}
+
+class C2: C1, P {
+    override func run(a: A) {}
+    // expected-error@-1 {{circular reference}}
+    // expected-note@-2 2{{through reference here}}
+}
+
+// Another crash to the above
+open class G1<A> {
+    open func run(a: A) {}
+}
+
+class C3: G1<A>, P {
+    // expected-error@-1 {{type 'C3' does not conform to protocol 'P'}}
+    // expected-error@-2 {{use of undeclared type 'A'}}
+    override func run(a: A) {}
+    // expected-error@-1 {{method does not override any method from its superclass}}
+}

utils/build-script

@@ -132,6 +132,40 @@ class BuildScriptInvocation(object):
                 "--legacy-impl is incompatible with building packages needing "
                 "a toolchain (%s)" % ", ".join(targets_needing_toolchain))
 
+    @staticmethod
+    def default_stdlib_deployment_targets(args):
+        """
+        Return targets for the Swift stdlib, based on the build machine.
+        If the build machine is not one of the recognized ones, return None.
+        """
+
+        host_target = StdlibDeploymentTarget.host_target()
+        if host_target is None:
+            return None
+
+        # OS X build machines configure all Darwin platforms by default.
+        # Put iOS native targets last so that we test them last
+        # (it takes a long time).
+        if host_target == StdlibDeploymentTarget.OSX.x86_64:
+            targets = [host_target]
+            if args.build_ios and args.build_ios_simulator:
+                targets.extend(StdlibDeploymentTarget.iOSSimulator.targets)
+            if args.build_ios and args.build_ios_device:
+                targets.extend(StdlibDeploymentTarget.iOS.targets)
+            if args.build_tvos and args.build_tvos_simulator:
+                targets.extend(StdlibDeploymentTarget.AppleTVSimulator.targets)
+            if args.build_tvos and args.build_tvos_device:
+                targets.extend(StdlibDeploymentTarget.AppleTV.targets)
+            if args.build_watchos and args.build_watchos_simulator:
+                targets.extend(StdlibDeploymentTarget.AppleWatchSimulator.targets)
+            if args.build_watchos and args.build_watchos_device:
+                targets.extend(StdlibDeploymentTarget.AppleWatch.targets)
+            return targets
+        else:
+            # All other machines only configure their host stdlib by default.
+            return [host_target]
+
+
     @staticmethod
     def apply_default_arguments(toolchain, args):
         # Infer if ninja is required
@@ -144,7 +178,7 @@ class BuildScriptInvocation(object):
         # Set the default stdlib-deployment-targets, if none were provided.
         if args.stdlib_deployment_targets is None:
             stdlib_targets = \
-                StdlibDeploymentTarget.default_stdlib_deployment_targets()
+                BuildScriptInvocation.default_stdlib_deployment_targets(args)
             args.stdlib_deployment_targets = [
                 target.name for target in stdlib_targets]
 

utils/build-script-impl

@@ -2454,7 +2454,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DLLDB_PATH_TO_SWIFT_SOURCE:PATH="${SWIFT_SOURCE_DIR}"
                     -DLLDB_IS_BUILDBOT_BUILD:BOOL="${LLDB_IS_BUILDBOT_BUILD}"
                     -DLLDB_BUILD_DATE:STRING="\"${LLDB_BUILD_DATE}\""
-                    -DLLDB_ALLOW_STATIC_BINDINGS:BOOL=1
                     -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY})
                     -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}"
                 )

utils/build-windows.bat

@@ -65,7 +65,7 @@ call :build_swift %exitOnError%
 
 call :build_lldb %exitOnError%
 
-path %source_root%\icu-%icu_version%\bin64;%install_directory%\bin;%build_root%\swift\libdispatch-prefix\bin;%PATH%;%ProgramFiles%\Git\usr\bin
+path %source_root%\icu-%icu_version%\bin64;%install_directory%\bin;%build_root%\swift\bin;%build_root%\swift\libdispatch-prefix\bin;%PATH%;%ProgramFiles%\Git\usr\bin
 call :test_swift %exitOnError%
 
 goto :end
@@ -279,7 +279,7 @@ cmake "%source_root%\lldb"^
     -DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
     -DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
     -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
-    -DLLDB_ALLOW_STATIC_BINDINGS:BOOL=YES^
+    -DLLDB_USE_STATIC_BINDINGS:BOOL=YES^
     -DPYTHON_HOME:PATH=%PYTHON_HOME%^
     -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
     -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^

utils/swift_build_support/swift_build_support/targets.py

@@ -228,32 +228,6 @@ def host_target():
         raise NotImplementedError('System "%s" with architecture "%s" is not '
                                   'supported' % (system, machine))
 
-    @staticmethod
-    def default_stdlib_deployment_targets():
-        """
-        Return targets for the Swift stdlib, based on the build machine.
-        If the build machine is not one of the recognized ones, return None.
-        """
-
-        host_target = StdlibDeploymentTarget.host_target()
-        if host_target is None:
-            return None
-
-        # OS X build machines configure all Darwin platforms by default.
-        # Put iOS native targets last so that we test them last
-        # (it takes a long time).
-        if host_target == StdlibDeploymentTarget.OSX.x86_64:
-            return [host_target] + \
-                StdlibDeploymentTarget.iOSSimulator.targets + \
-                StdlibDeploymentTarget.AppleTVSimulator.targets + \
-                StdlibDeploymentTarget.AppleWatchSimulator.targets + \
-                StdlibDeploymentTarget.iOS.targets + \
-                StdlibDeploymentTarget.AppleTV.targets + \
-                StdlibDeploymentTarget.AppleWatch.targets
-        else:
-            # All other machines only configure their host stdlib by default.
-            return [host_target]
-
     @classmethod
     def get_target_for_name(cls, name):
         return cls._targets_by_name.get(name)