---

yaml
---
r: 335583
b: refs/heads/rxwei-patch-1
c: 2ebd24b
h: refs/heads/master
i:
  335581: c8bfa17
  335579: 7bbbf30
  335575: 18d484e
  335567: 02f96a0
  335551: da831c1

Author: aschwaighofer

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: d2631c2cec78b0445771725824a924155911fc5d
+refs/heads/rxwei-patch-1: 2ebd24bb9fe270e75277a7948fdf4fdc0c8d6a60
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/cmake/modules/AddSwift.cmake

@@ -721,6 +721,7 @@ function(_add_swift_library_single target name)
         FILE_DEPENDS
         FRAMEWORK_DEPENDS
         FRAMEWORK_DEPENDS_WEAK
+        GYB_SOURCES
         INCORPORATE_OBJECT_LIBRARIES
         INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
         INTERFACE_LINK_LIBRARIES
@@ -810,10 +811,14 @@ function(_add_swift_library_single target name)
         "Either SHARED, STATIC, or OBJECT_LIBRARY must be specified")
   endif()
 
-  handle_gyb_sources(
-      gyb_dependency_targets
-      SWIFTLIB_SINGLE_SOURCES
-      "${SWIFTLIB_SINGLE_ARCHITECTURE}")
+  if(SWIFTLIB_SINGLE_GYB_SOURCES)
+    handle_gyb_sources(
+        gyb_dependency_targets
+        SWIFTLIB_SINGLE_GYB_SOURCES
+        "${SWIFTLIB_SINGLE_ARCHITECTURE}")
+    set(SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_SOURCES}
+      ${SWIFTLIB_SINGLE_GYB_SOURCES})
+  endif()
 
   # Remove the "swift" prefix from the name to determine the module name.
   if(SWIFTLIB_IS_STDLIB_CORE)
@@ -1620,6 +1625,7 @@ function(add_swift_target_library name)
         FRAMEWORK_DEPENDS_IOS_TVOS
         FRAMEWORK_DEPENDS_OSX
         FRAMEWORK_DEPENDS_WEAK
+        GYB_SOURCES
         INCORPORATE_OBJECT_LIBRARIES
         INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
         INTERFACE_LINK_LIBRARIES
@@ -1914,6 +1920,7 @@ function(add_swift_target_library name)
         DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
         DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_DEPLOYMENT_VERSION_TVOS}"
         DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS}"
+        GYB_SOURCES ${SWIFTLIB_GYB_SOURCES}
       )
 
       if(NOT SWIFTLIB_OBJECT_LIBRARY)

branches/rxwei-patch-1/cmake/modules/SwiftHandleGybSources.cmake

@@ -131,35 +131,31 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/UIDs.py")
 
   foreach (src ${${sources_var_name}})
-    string(REGEX REPLACE "[.]gyb$" "" src_sans_gyb "${src}")
-    if(src STREQUAL src_sans_gyb)
-      list(APPEND de_gybbed_sources "${src}")
+    # On Windows (using Visual Studio), the generated project files assume that the
+    # generated GYB files will be in the source, not binary directory.
+    # We can work around this by modifying the root directory when generating VS projects.
+    if ("${CMAKE_GENERATOR_PLATFORM}" MATCHES "Visual Studio")
+      set(dir_root ${CMAKE_CURRENT_SOURCE_DIR})
     else()
+      set(dir_root ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
 
-      # On Windows (using Visual Studio), the generated project files assume that the
-      # generated GYB files will be in the source, not binary directory.
-      # We can work around this by modifying the root directory when generating VS projects.
-      if ("${CMAKE_GENERATOR_PLATFORM}" MATCHES "Visual Studio")
-        set(dir_root ${CMAKE_CURRENT_SOURCE_DIR})
-      else()
-        set(dir_root ${CMAKE_CURRENT_BINARY_DIR})
-      endif()
-      
-      if (arch)
-        set(dir "${dir_root}/${ptr_size}")
-      else()
-        set(dir "${dir_root}")
-      endif()
-      set(output_file_name "${dir}/${src_sans_gyb}")
-      list(APPEND de_gybbed_sources "${output_file_name}")
-      handle_gyb_source_single(dependency_target
-          SOURCE "${src}"
-          OUTPUT "${output_file_name}"
-          FLAGS ${extra_gyb_flags}
-          DEPENDS "${gyb_extra_sources}"
-          COMMENT "with ptr size = ${ptr_size}")
-      list(APPEND dependency_targets "${dependency_target}")
+    if (arch)
+      set(dir "${dir_root}/${ptr_size}")
+    else()
+      set(dir "${dir_root}")
     endif()
+    # get_filename_component(src_sans_gyb ${src} NAME_WLE)
+    string(REGEX REPLACE "\.gyb$" "" src_sans_gyb ${src})
+    set(output_file_name "${dir}/${src_sans_gyb}")
+    list(APPEND de_gybbed_sources "${output_file_name}")
+    handle_gyb_source_single(dependency_target
+        SOURCE "${src}"
+        OUTPUT "${output_file_name}"
+        FLAGS ${extra_gyb_flags}
+        DEPENDS "${gyb_extra_sources}"
+        COMMENT "with ptr size = ${ptr_size}")
+    list(APPEND dependency_targets "${dependency_target}")
   endforeach()
   set("${dependency_out_var_name}" "${dependency_targets}" PARENT_SCOPE)
   set("${sources_var_name}" "${de_gybbed_sources}" PARENT_SCOPE)

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -213,6 +213,15 @@ struct OverloadSignature {
   /// Whether this is a function.
   unsigned IsFunction : 1;
 
+  /// Whether this is a enum element.
+  unsigned IsEnumElement : 1;
+
+  /// Whether this is a nominal type.
+  unsigned IsNominal : 1;
+
+  /// Whether this is a type alias.
+  unsigned IsTypeAlias : 1;
+
   /// Whether this signature is part of a protocol extension.
   unsigned InProtocolExtension : 1;
 

branches/rxwei-patch-1/include/swift/Parse/CodeCompletionCallbacks.h

@@ -123,7 +123,7 @@ class CodeCompletionCallbacks {
   virtual void completeDotExpr(Expr *E, SourceLoc DotLoc) {};
 
   /// Complete the beginning of a statement or expression.
-  virtual void completeStmtOrExpr() {};
+  virtual void completeStmtOrExpr(CodeCompletionExpr *E) {};
 
   /// Complete the beginning of expr-postfix -- no tokens provided
   /// by user.

branches/rxwei-patch-1/include/swift/SILOptimizer/Analysis/AccessedStorageAnalysis.h

@@ -122,8 +122,8 @@ template <> struct DenseMapInfo<swift::StorageAccessInfo> {
 }
 
 namespace swift {
-/// The per-function result of AccessedStorageAnalysis.
-///
+using AccessedStorageSet = llvm::SmallDenseSet<StorageAccessInfo, 8>;
+
 /// Records each unique AccessedStorage in a set of StorageAccessInfo
 /// objects. Hashing and equality only sees the AccesedStorage data. The
 /// additional StorageAccessInfo bits are recorded as results of this analysis.
@@ -133,28 +133,32 @@ namespace swift {
 /// results, either because the call graph is unknown or the access sets are too
 /// large. It does not imply that all accesses have Unidentified
 /// AccessedStorage, which is never allowed for class or global access.
-class FunctionAccessedStorage {
-  using AccessedStorageSet = llvm::SmallDenseSet<StorageAccessInfo, 8>;
-
+class AccessedStorageResult {
   AccessedStorageSet storageAccessSet;
   Optional<SILAccessKind> unidentifiedAccess;
 
 public:
-  FunctionAccessedStorage() {}
+  AccessedStorageResult() {}
 
   // ---------------------------------------------------------------------------
   // Accessing the results.
 
+  const AccessedStorageSet &getStorageSet() const { return storageAccessSet; }
+
+  bool isEmpty() const {
+    return storageAccessSet.empty() && !unidentifiedAccess;
+  }
+
   bool hasUnidentifiedAccess() const { return unidentifiedAccess != None; }
 
   /// Return true if the analysis has determined all accesses of otherStorage
   /// have the [no_nested_conflict] flag set.
   ///
-  /// Only call this if there is no unidentifiedAccess in the function and the
+  /// Only call this if there is no unidentifiedAccess in the region and the
   /// given storage is uniquely identified.
   bool hasNoNestedConflict(const AccessedStorage &otherStorage) const;
 
-  /// Does any of the accesses represented by this FunctionAccessedStorage
+  /// Does any of the accesses represented by this AccessedStorageResult
   /// object conflict with the given access kind and storage.
   bool mayConflictWith(SILAccessKind otherAccessKind,
                        const AccessedStorage &otherStorage) const;
@@ -181,6 +185,97 @@ class FunctionAccessedStorage {
     unidentifiedAccess = SILAccessKind::Modify;
   }
 
+  void setUnidentifiedAccess(SILAccessKind kind) { unidentifiedAccess = kind; }
+
+  /// Merge effects directly from \p RHS.
+  bool mergeFrom(const AccessedStorageResult &other);
+
+  /// Merge the effects represented in calleeAccess into this
+  /// FunctionAccessedStorage object. calleeAccess must correspond to at least
+  /// one callee at the apply site `fullApply`. Merging drops any local effects,
+  /// and translates parameter effects into effects on the caller-side
+  /// arguments.
+  ///
+  /// The full caller-side effects at a call site can be obtained with
+  /// AccessedStorageAnalysis::getCallSiteEffects().
+  bool mergeFromApply(const AccessedStorageResult &calleeAccess,
+                      FullApplySite fullApply);
+
+  /// Record any access scopes entered by the given single SIL instruction. 'I'
+  /// must not be a FullApply; use mergeFromApply instead.
+  void analyzeInstruction(SILInstruction *I);
+
+  void print(raw_ostream &os) const;
+  void dump() const;
+
+protected:
+  std::pair<AccessedStorageSet::iterator, bool>
+  insertStorageAccess(StorageAccessInfo storageAccess) {
+    storageAccess.setStorageIndex(storageAccessSet.size());
+    return storageAccessSet.insert(storageAccess);
+  }
+
+  bool updateUnidentifiedAccess(SILAccessKind accessKind);
+
+  bool mergeAccesses(const AccessedStorageResult &other,
+                     std::function<StorageAccessInfo(const StorageAccessInfo &)>
+                         transformStorage);
+
+  template <typename B> void visitBeginAccess(B *beginAccess);
+};
+} // namespace swift
+
+namespace swift {
+/// The per-function result of AccessedStorageAnalysis.
+class FunctionAccessedStorage {
+  AccessedStorageResult accessResult;
+
+public:
+  FunctionAccessedStorage() {}
+
+  // ---------------------------------------------------------------------------
+  // Accessing the results.
+
+  const AccessedStorageResult &getResult() const { return accessResult; }
+
+  bool hasUnidentifiedAccess() const {
+    return accessResult.hasUnidentifiedAccess();
+  }
+
+  /// Return true if the analysis has determined all accesses of otherStorage
+  /// have the [no_nested_conflict] flag set.
+  ///
+  /// Only call this if there is no unidentifiedAccess in the function and the
+  /// given storage is uniquely identified.
+  bool hasNoNestedConflict(const AccessedStorage &otherStorage) const {
+    return accessResult.hasNoNestedConflict(otherStorage);
+  }
+
+  /// Does any of the accesses represented by this FunctionAccessedStorage
+  /// object conflict with the given access kind and storage.
+  bool mayConflictWith(SILAccessKind otherAccessKind,
+                       const AccessedStorage &otherStorage) const {
+    return accessResult.mayConflictWith(otherAccessKind, otherStorage);
+  }
+
+  /// Raw access to the result for a given AccessedStorage location.
+  StorageAccessInfo
+  getStorageAccessInfo(const AccessedStorage &otherStorage) const {
+    return accessResult.getStorageAccessInfo(otherStorage);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Constructing the results.
+
+  void clear() { accessResult.clear(); }
+
+  /// Return true if these effects are fully conservative.
+  bool hasWorstEffects() { return accessResult.hasWorstEffects(); }
+
+  /// Sets the most conservative effects, if we don't know anything about the
+  /// function.
+  void setWorstEffects() { accessResult.setWorstEffects(); }
+
   /// Summarize the given function's effects using this FunctionAccessedStorage
   /// object.
   //
@@ -201,12 +296,14 @@ class FunctionAccessedStorage {
   ///
   /// TODO: Summarize ArraySemanticsCall accesses.
   bool summarizeCall(FullApplySite fullApply) {
-    assert(storageAccessSet.empty() && "expected uninitialized results.");
+    assert(accessResult.isEmpty() && "expected uninitialized results.");
     return false;
   }
 
   /// Merge effects directly from \p RHS.
-  bool mergeFrom(const FunctionAccessedStorage &RHS);
+  bool mergeFrom(const FunctionAccessedStorage &RHS) {
+    return accessResult.mergeFrom(RHS.accessResult);
+  }
 
   /// Merge the effects represented in calleeAccess into this
   /// FunctionAccessedStorage object. calleeAccess must correspond to at least
@@ -217,31 +314,19 @@ class FunctionAccessedStorage {
   /// The full caller-side effects at a call site can be obtained with
   /// AccessedStorageAnalysis::getCallSiteEffects().
   bool mergeFromApply(const FunctionAccessedStorage &calleeAccess,
-                      FullApplySite fullApply);
+                      FullApplySite fullApply) {
+    return accessResult.mergeFromApply(calleeAccess.accessResult, fullApply);
+  }
 
   /// Analyze the side-effects of a single SIL instruction \p I.
   /// Visited callees are added to \p BottomUpOrder until \p RecursionDepth
   /// reaches MaxRecursionDepth.
-  void analyzeInstruction(SILInstruction *I);
-
-  void print(raw_ostream &os) const;
-  void dump() const;
-
-protected:
-  std::pair<AccessedStorageSet::iterator, bool>
-  insertStorageAccess(StorageAccessInfo storageAccess) {
-    storageAccess.setStorageIndex(storageAccessSet.size());
-    return storageAccessSet.insert(storageAccess);
+  void analyzeInstruction(SILInstruction *I) {
+    accessResult.analyzeInstruction(I);
   }
 
-  bool updateUnidentifiedAccess(SILAccessKind accessKind);
-
-  bool mergeAccesses(
-      const FunctionAccessedStorage &other,
-      std::function<StorageAccessInfo(const StorageAccessInfo &)>
-          transformStorage);
-
-  template <typename B> void visitBeginAccess(B *beginAccess);
+  void print(raw_ostream &os) const { accessResult.print(os); }
+  void dump() const { accessResult.dump(); }
 };
 
 /// Summarizes the dynamic accesses performed within a function and its

branches/rxwei-patch-1/lib/AST/Decl.cpp

@@ -2090,6 +2090,32 @@ bool swift::conflicting(ASTContext &ctx,
   if (!conflicting(sig1, sig2, skipProtocolExtensionCheck))
     return false;
 
+  // Functions and enum elements do not conflict with each other if their types
+  // are different.
+  if (((sig1.IsFunction && sig2.IsEnumElement) ||
+       (sig1.IsEnumElement && sig2.IsFunction)) &&
+      sig1Type != sig2Type) {
+    return false;
+  }
+
+  // Nominal types and enum elements always conflict with each other.
+  if ((sig1.IsNominal && sig2.IsEnumElement) ||
+      (sig1.IsEnumElement && sig2.IsNominal)) {
+    return true;
+  }
+
+  // Typealiases and enum elements always conflict with each other.
+  if ((sig1.IsTypeAlias && sig2.IsEnumElement) ||
+      (sig1.IsEnumElement && sig2.IsTypeAlias)) {
+    return true;
+  }
+
+  // Enum elements always conflict with each other. At this point, they
+  // have the same base name but different types.
+  if (sig1.IsEnumElement && sig2.IsEnumElement) {
+    return true;
+  }
+
   // Functions always conflict with non-functions with the same signature.
   // In practice, this only applies for zero argument functions.
   if (sig1.IsFunction != sig2.IsFunction)
@@ -2248,6 +2274,9 @@ OverloadSignature ValueDecl::getOverloadSignature() const {
   signature.IsInstanceMember = isInstanceMember();
   signature.IsVariable = isa<VarDecl>(this);
   signature.IsFunction = isa<AbstractFunctionDecl>(this);
+  signature.IsEnumElement = isa<EnumElementDecl>(this);
+  signature.IsNominal = isa<NominalTypeDecl>(this);
+  signature.IsTypeAlias = isa<TypeAliasDecl>(this);
 
   // Unary operators also include prefix/postfix.
   if (auto func = dyn_cast<FuncDecl>(this)) {
@@ -2293,6 +2322,13 @@ CanType ValueDecl::getOverloadSignatureType() const {
                                ->getCanonicalType();
   }
 
+  if (isa<EnumElementDecl>(this)) {
+    auto mappedType = mapSignatureFunctionType(
+        getASTContext(), getInterfaceType(), /*topLevelFunction=*/false,
+        /*isMethod=*/false, /*isInitializer=*/false, /*curryLevels=*/0);
+    return mappedType->getCanonicalType();
+  }
+
   // Note: If you add more cases to this function, you should update the
   // implementation of the swift::conflicting overload that deals with
   // overload types, in order to account for cases where the overload types