---

yaml
---
r: 347471
b: refs/heads/master
c: a75e8fb
h: refs/heads/master
i:
  347469: c6b8fb8
  347467: 63fb66c
  347463: c50c2b9
  347455: f8ffa08

Author: compnerd

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4694ca0d77701bf6abf6f9066870d95a3830d562
+refs/heads/master: a75e8fbd212c316a337aff9b91dfcc25db89d5df
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/benchmark/utils/build_script_helper.py

@@ -318,30 +318,6 @@ function(_add_variant_c_compile_flags)
     endforeach()
   endif()
 
-  set(ICU_UC_INCLUDE_DIR ${SWIFT_${CFLAGS_SDK}_${CFLAGS_ARCH}_ICU_UC_INCLUDE})
-  if(NOT "${ICU_UC_INCLUDE_DIR}" STREQUAL "" AND
-     NOT "${ICU_UC_INCLUDE_DIR}" STREQUAL "/usr/include" AND
-     NOT "${ICU_UC_INCLUDE_DIR}" STREQUAL "/usr/${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_TRIPLE}/include" AND
-     NOT "${ICU_UC_INCLUDE_DIR}" STREQUAL "/usr/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_TRIPLE}/include")
-   if(SWIFT_COMPILER_IS_MSVC_LIKE)
-     list(APPEND result -I;${ICU_UC_INCLUDE_DIR})
-   else()
-     list(APPEND result -isystem;${ICU_UC_INCLUDE_DIR})
-   endif()
-  endif()
-
-  set(ICU_I18N_INCLUDE_DIR ${SWIFT_${CFLAGS_SDK}_${CFLAGS_ARCH}_ICU_I18N_INCLUDE})
-  if(NOT "${ICU_I18N_INCLUDE_DIR}" STREQUAL "" AND
-     NOT "${ICU_I18N_INCLUDE_DIR}" STREQUAL "/usr/include" AND
-     NOT "${ICU_I18N_INCLUDE_DIR}" STREQUAL "/usr/${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_TRIPLE}/include" AND
-     NOT "${ICU_I18N_INCLUDE_DIR}" STREQUAL "/usr/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_TRIPLE}/include")
-   if(SWIFT_COMPILER_IS_MSVC_LIKE)
-     list(APPEND result -I;${ICU_I18N_INCLUDE_DIR})
-   else()
-     list(APPEND result -isystem;${ICU_I18N_INCLUDE_DIR})
-   endif()
-  endif()
-
   set("${CFLAGS_RESULT_VAR_NAME}" "${result}" PARENT_SCOPE)
 endfunction()
 
@@ -984,6 +960,21 @@ function(_add_swift_library_single target name)
   endif()
   _set_target_prefix_and_suffix("${target}" "${libkind}" "${SWIFTLIB_SINGLE_SDK}")
 
+  if(SWIFTLIB_SINGLE_TARGET_LIBRARY)
+    if(NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_UC_INCLUDE}" STREQUAL "" AND
+       NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_UC_INCLUDE}" STREQUAL "/usr/include" AND
+       NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_UC_INCLUDE}" STREQUAL "/usr/${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_ARCH_${SWIFTLIB_SINGLE_ARCHITECTURE}_TRIPLE}/include" AND
+       NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_UC_INCLUDE}" STREQUAL "/usr/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_TRIPLE}/include")
+     target_include_directories("${target}" SYSTEM PRIVATE "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_UC_INCLUDE}")
+    endif()
+    if(NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_I18N_INCLUDE}" STREQUAL "" AND
+       NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_I18N_INCLUDE}" STREQUAL "/usr/include" AND
+       NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_I18N_INCLUDE}" STREQUAL "/usr/${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_ARCH_${SWIFTLIB_SINGLE_ARCHITECTURE}_TRIPLE}/include" AND
+       NOT "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_I18N_INCLUDE}" STREQUAL "/usr/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_TRIPLE}/include")
+     target_include_directories("${target}" SYSTEM PRIVATE "${SWIFT_${SWIFTLIB_SINGLE_SDK}_${SWIFTLIB_SINGLE_ARCHITECTURE}_ICU_I18N_INCLUDE}")
+    endif()
+  endif()
+
   if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "WINDOWS")
     swift_windows_include_for_arch(${SWIFTLIB_SINGLE_ARCHITECTURE} SWIFTLIB_INCLUDE)
     target_include_directories("${target}" SYSTEM PRIVATE ${SWIFTLIB_INCLUDE})
@@ -1027,11 +1018,6 @@ function(_add_swift_library_single target name)
     set_target_properties("${target}" PROPERTIES
       LIBRARY_OUTPUT_DIRECTORY ${SWIFTLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}
       ARCHIVE_OUTPUT_DIRECTORY ${SWIFTLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR})
-    if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND SWIFTLIB_SINGLE_IS_STDLIB_CORE
-        AND libkind STREQUAL SHARED)
-      add_custom_command(TARGET ${target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${target}> ${SWIFTLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR})
-    endif()
 
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER ${config} config_upper)
@@ -1376,8 +1362,15 @@ endfunction()
 #   add_swift_host_library(name
 #     [SHARED]
 #     [STATIC]
+#     [DEPENDS dep1 ...]
+#     [INTERFACE_LINK_LIBRARIES dep1 ...]
+#     [SWIFT_MODULE_DEPENDS dep1 ...]
 #     [LLVM_COMPONENT_DEPENDS comp1 ...]
 #     [FILE_DEPENDS target1 ...]
+#     [C_COMPILE_FLAGS flag1...]
+#     [LINK_FLAGS flag1...]
+#     [INSTALL]
+#     INSTALL_IN_COMPONENT comp
 #     source1 [source2 source3 ...])
 #
 # name
@@ -1389,12 +1382,24 @@ endfunction()
 # STATIC
 #   Build a static library.
 #
+# DEPENDS
+#   Targets that this library depends on.
+#
 # LLVM_COMPONENT_DEPENDS
 #   LLVM components this library depends on.
 #
 # FILE_DEPENDS
 #   Additional files this library depends on.
 #
+# C_COMPILE_FLAGS
+#   Extra compiler flags (C, C++, ObjC).
+#
+# LINK_FLAGS
+#   Extra linker flags.
+#
+# INSTALL_IN_COMPONENT comp
+#   The Swift installation component that this library belongs to.
+#
 # source1 ...
 #   Sources to add into this library.
 function(add_swift_host_library name)
@@ -1408,6 +1413,7 @@ function(add_swift_host_library name)
         DEPENDS
         FILE_DEPENDS
         INTERFACE_LINK_LIBRARIES
+        LINK_FLAGS
         LINK_LIBRARIES
         LLVM_COMPONENT_DEPENDS)
 
@@ -1418,15 +1424,6 @@ function(add_swift_host_library name)
                         ${ARGN})
   set(ASHL_SOURCES ${ASHL_UNPARSED_ARGUMENTS})
 
-  if(ASHL_C_COMPILE_FLAGS)
-    message(SEND_ERROR "library ${name} is using C_COMPILE_FLAGS parameter which is deprecated.  Please use target_compile_definitions, target_compile_options, or target_include_directories instead")
-  endif()
-  if(ASHL_DEPENDS)
-    message(SEND_ERROR "library ${name} is using DEPENDS parameter which is deprecated.  Please use add_dependencies instead")
-  endif()
-  if(ASHL_INTERFACE_LINK_LIBRARIES)
-    message(SEND_ERROR "library ${name} is using INTERFACE_LINK_LIBRARIES parameter which is deprecated.  Please use target_link_libraries instead.")
-  endif()
   if(ASHL_LINK_LIBRARIES)
     message(SEND_ERROR "library ${name} is using LINK_LIBRARIES parameter which is deprecated.  Please use target_link_libraries instead")
   endif()
@@ -1446,8 +1443,12 @@ function(add_swift_host_library name)
     ${ASHL_FORCE_BUILD_OPTIMIZED_keyword}
     SDK ${SWIFT_HOST_VARIANT_SDK}
     ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
+    DEPENDS ${ASHL_DEPENDS}
     LLVM_COMPONENT_DEPENDS ${ASHL_LLVM_COMPONENT_DEPENDS}
     FILE_DEPENDS ${ASHL_FILE_DEPENDS}
+    C_COMPILE_FLAGS ${ASHL_C_COMPILE_FLAGS}
+    LINK_FLAGS ${ASHL_LINK_FLAGS}
+    INTERFACE_LINK_LIBRARIES ${ASHL_INTERFACE_LINK_LIBRARIES}
     INSTALL_IN_COMPONENT "dev"
     )
 

trunk/cmake/modules/AddSwift.cmake

@@ -3,7 +3,7 @@
 Visual Studio 2017 or newer is needed to build swift on Windows.
 
 ## 1. Install dependencies
-- Install the latest version of [Visual Studio](https://www.visualstudio.com/downloads/)
+1. Latest version of [Visual Studio](https://www.visualstudio.com/downloads/)
 - Make sure to include "Programming Languages|Visual C++" and "Windows and Web
   Development|Universal Windows App Development|Windows SDK" in your
   installation.
@@ -205,10 +205,15 @@ cmake --build S:\b\lldb
 
 ## 10. Running tests on Windows
 
-Running the testsuite on Windows has additional external dependencies.
+Running the testsuite on Windows has additional external dependencies.  You must have a subset of the GNUWin32 programs installed and available in your path.  The following packages are currently required:
+
+  1. coreutils
+  2. diffutils
+  3. grep
+  4. sed
 
 ```cmd
-path S:\thirdparty\icu4c-63_1-Win64-MSVC2017\bin64;S:\b\swift\bin;S:\b\swift\libdispatch-prefix\bin;%PATH%;%ProgramFiles%\Git\usr\bin
+path S:\thirdparty\icu4c-63_1-Win64-MSVC2017\bin64;S:\b\swift\bin;S:\b\swift\libdispatch-prefix\bin;%PATH%;%ProgramFiles(x86)%\GnuWin32\bin
 ninja -C S:\b\swift check-swift
 ```
 

trunk/docs/WindowsBuild.md

@@ -23,79 +23,47 @@
 
 namespace swift {
 
-class BoundGenericType;
-class ComponentIdentTypeRepr;
-class NominalType;
+class AbstractStorageDecl;
+class ExtensionDecl;
 class SourceFile;
-class TypeAliasType;
+class ValueDecl;
 
 class AccessScopeChecker {
   const SourceFile *File;
   bool TreatUsableFromInlineAsPublic;
 
+protected:
+  ASTContext &Context;
   Optional<AccessScope> Scope = AccessScope::getPublic();
 
   AccessScopeChecker(const DeclContext *useDC,
                      bool treatUsableFromInlineAsPublic);
-  bool visitDecl(const ValueDecl *VD);
+  bool visitDecl(ValueDecl *VD);
+};
+
+class TypeReprAccessScopeChecker : private ASTWalker, AccessScopeChecker {
+  TypeReprAccessScopeChecker(const DeclContext *useDC,
+                             bool treatUsableFromInlineAsPublic);
+
+  bool walkToTypeReprPre(TypeRepr *TR) override;
+  bool walkToTypeReprPost(TypeRepr *TR) override;
 
 public:
   static Optional<AccessScope>
   getAccessScope(TypeRepr *TR, const DeclContext *useDC,
                  bool treatUsableFromInlineAsPublic = false);
-  static Optional<AccessScope>
-  getAccessScope(Type T, const DeclContext *useDC,
-                 bool treatUsableFromInlineAsPublic = false);
 };
 
-/// Walks a Type to find all NominalTypes, BoundGenericTypes, and
-/// TypeAliasTypes.
-class TypeDeclFinder : public TypeWalker {
-  Action walkToTypePre(Type T) override;
-
-public:
-  virtual Action visitNominalType(const NominalType *ty) {
-    return Action::Continue;
-  }
-  virtual Action visitBoundGenericType(const BoundGenericType *ty) {
-    return Action::Continue;
-  }
-  virtual Action visitTypeAliasType(const TypeAliasType *ty) {
-    return Action::Continue;
-  }
-};
+class TypeAccessScopeChecker : private TypeWalker, AccessScopeChecker {
+  TypeAccessScopeChecker(const DeclContext *useDC,
+                         bool treatUsableFromInlineAsPublic);
 
-/// A TypeDeclFinder for use cases where all types should be treated
-/// equivalently and where generic arguments can be walked to separately from
-/// the generic type.
-class SimpleTypeDeclFinder : public TypeDeclFinder {
-  /// The function to call when a ComponentIdentTypeRepr is seen.
-  llvm::function_ref<Action(const TypeDecl *)> Callback;
-
-  Action visitNominalType(const NominalType *ty) override;
-  Action visitBoundGenericType(const BoundGenericType *ty) override;
-  Action visitTypeAliasType(const TypeAliasType *ty) override;
+  Action walkToTypePre(Type T);
 
 public:
-  explicit SimpleTypeDeclFinder(
-      llvm::function_ref<Action(const TypeDecl *)> callback)
-    : Callback(callback) {}
-};
-
-/// Walks a TypeRepr to find all ComponentIdentTypeReprs with bound TypeDecls.
-///
-/// Subclasses can either override #visitTypeDecl if they only care about
-/// types on their own, or #visitComponentIdentTypeRepr if they want to keep
-/// the TypeRepr around.
-class TypeReprIdentFinder : public ASTWalker {
-  /// The function to call when a ComponentIdentTypeRepr is seen.
-  llvm::function_ref<bool(const ComponentIdentTypeRepr *)> Callback;
-
-  bool walkToTypeReprPost(TypeRepr *TR) override;
-public:
-  explicit TypeReprIdentFinder(
-      llvm::function_ref<bool(const ComponentIdentTypeRepr *)> callback)
-    : Callback(callback) {}
+  static Optional<AccessScope>
+  getAccessScope(Type T, const DeclContext *useDC,
+                 bool treatUsableFromInlineAsPublic = false);
 };
 
 }

trunk/include/swift/AST/AccessScopeChecker.h

@@ -36,7 +36,6 @@
 #include "swift/Basic/ArrayRefView.h"
 #include "swift/Basic/Compiler.h"
 #include "swift/Basic/InlineBitfield.h"
-#include "swift/Basic/NullablePtr.h"
 #include "swift/Basic/OptionalEnum.h"
 #include "swift/Basic/Range.h"
 #include "llvm/ADT/DenseMap.h"
@@ -4748,32 +4747,8 @@ class VarDecl : public AbstractStorageDecl {
   /// return this. Otherwise, this VarDecl must belong to a CaseStmt's
   /// CaseLabelItem. In that case, return the first case label item of the first
   /// case stmt in a sequence of case stmts that fallthrough into each other.
-  ///
-  /// NOTE: During type checking, we emit an error if we have a single case
-  /// label item with a pattern that has multiple var decls of the same
-  /// name. This means that during type checking and before type checking, we
-  /// may have a _malformed_ switch stmt var decl linked list since var decls in
-  /// the same case label item that have the same name will point at the same
-  /// canonical var decl, namely the first var decl with the name in the
-  /// canonical case label item's var decl list. This is ok, since we are going
-  /// to emit the error, but it requires us to be more careful/cautious before
-  /// type checking has been complete when relying on canonical var decls
-  /// matching up.
   VarDecl *getCanonicalVarDecl() const;
 
-  /// If this is a case stmt var decl, return the var decl that corresponds to
-  /// this var decl in the first case label item of the case stmt. Returns
-  /// nullptr if this isn't a VarDecl that is part of a case stmt.
-  NullablePtr<VarDecl> getCorrespondingFirstCaseLabelItemVarDecl() const;
-
-  /// If this is a case stmt var decl, return the case body var decl that this
-  /// var decl maps to.
-  NullablePtr<VarDecl> getCorrespondingCaseBodyVariable() const;
-
-  /// Return true if this var decl is an implicit var decl belonging to a case
-  /// stmt's body.
-  bool isCaseBodyVariable() const;
-
   /// True if the global stored property requires lazy initialization.
   bool isLazilyInitializedGlobal() const;