---

yaml
---
r: 245247
b: refs/heads/marcrasi-static-assert
c: 97e9dde
h: refs/heads/master
i:
  245245: 74718f9
  245243: 0b672ea
  245239: 456319f
  245231: 81e04c6
  245215: d09bc70
  245183: 72a1b9b
  245119: 9152d1e
  244991: de59e08
  244735: f43bb5c

Author: Raj Barik

[refs]

@@ -1071,7 +1071,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-20-a: 37a08a7edae5cf9ebde7866dbc974
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-21-a: a47bb052988de099ac2562a50cd1ee60a411e182
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-22-a: 141f61f3c887a81aa5d7a66e843f5e5e9a31ca02
 refs/heads/anotherdayanothercommit: 983c399b25b26d80728c0bf11b12afac852768f6
-refs/heads/marcrasi-static-assert: d03a8cc9ce6fe236bf018be80d4371122ddf3bac
+refs/heads/marcrasi-static-assert: 97e9dde6d7d182480c5d9c378109f623706522d7
 refs/heads/revert-19500-updateValue-but-not-the-key: b4e27b110af0d7e3002b4f734a347f752d42b9a8
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-25-a: 2ed7952ddd7ef765b60efd13e169ea900ebb5e80
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-26-a: b7cbce34ef0921069091a65e5918640bb382a419

branches/marcrasi-static-assert/CMakeLists.txt

@@ -639,52 +639,80 @@ endif()
 
 if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "LINUX")
 
+  set(CMAKE_EXECUTABLE_FORMAT "ELF")
   set(SWIFT_HOST_VARIANT "linux" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [linux].")
 
+  # Calculate the host triple
+  if("${SWIFT_HOST_TRIPLE}" STREQUAL "")
+    if("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "x86_64")
+      set(SWIFT_HOST_TRIPLE "x86_64-unknown-linux-gnu")
+    elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "i686")
+      set(SWIFT_HOST_TRIPLE "i686-unknown-linux-gnu")
+    elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "aarch64")
+      set(SWIFT_HOST_TRIPLE "aarch64-unknown-linux-gnu")
+    elseif("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "(powerpc64|powerpc64le)")
+      set(SWIFT_HOST_TRIPLE "${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu")
+    elseif("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "s390x")
+      set(SWIFT_HOST_TRIPLE "s390x-unknown-linux-gnu")
+    elseif("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "(armv6|armv7)")
+      set(SWIFT_HOST_TRIPLE "${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnueabihf")
+    else()
+      message(FATAL_ERROR "Unable to calculate triple for linux host on ${SWIFT_HOST_VARIANT_ARCH}")
+    endif()
+  endif()
+
   # Should we build the standard library for the host?
   is_sdk_requested(LINUX swift_build_linux)
   if(swift_build_linux)
-    configure_sdk_unix("Linux" "${SWIFT_HOST_VARIANT_ARCH}")
+    configure_sdk_unix(LINUX "Linux" "linux" "${SWIFT_HOST_VARIANT}" "${SWIFT_HOST_VARIANT_ARCH}" "${SWIFT_HOST_TRIPLE}" "/")
     set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
     set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
   endif()
 
 elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "FREEBSD")
 
+  set(CMAKE_EXECUTABLE_FORMAT "ELF")
   set(SWIFT_HOST_VARIANT "freebsd" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [freebsd].")
 
-  configure_sdk_unix("FreeBSD" "${SWIFT_HOST_VARIANT_ARCH}")
+  # FIXME: Using the host OS version won't produce correct results for
+  # cross-compilation.
+  string(REPLACE "[-].*" "" FREEBSD_SYSTEM_VERSION ${CMAKE_SYSTEM_VERSION})
+  message(STATUS "FreeBSD Version: ${FREEBSD_SYSTEM_VERSION}")
+  configure_sdk_unix(FREEBSD "FreeBSD" "freebsd" "freebsd" "x86_64"
+    "x86_64-unknown-freebsd${FREEBSD_SYSTEM_VERSION}" "/")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
-  set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
+  set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
 
 elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "CYGWIN")
 
+  # set(CMAKE_EXECUTABLE_FORMAT "ELF")
   set(SWIFT_HOST_VARIANT "cygwin" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [cygwin].")
 
-  configure_sdk_unix("Cygwin" "${SWIFT_HOST_VARIANT_ARCH}")
+  configure_sdk_unix(CYGWIN "Cygwin" "cygwin" "cygwin" "x86_64" "x86_64-unknown-windows-cygnus" "/")
   set(SWIFT_PRIMARY_VARIANT_SDK_default "${SWIFT_HOST_VARIANT_SDK}")
-  set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
+  set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
 
 elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "WINDOWS")
 
   set(SWIFT_HOST_VARIANT "windows" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [windows].")
 
-  configure_sdk_windows("Windows" "msvc" "${SWIFT_HOST_VARIANT_ARCH}")
+  configure_sdk_windows(WINDOWS "Windows" "msvc" "${SWIFT_HOST_VARIANT_ARCH}")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
 
 elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "HAIKU")
 
+  set(CMAKE_EXECUTABLE_FORMAT "ELF")
   set(SWIFT_HOST_VARIANT "haiku" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [haiku].")
 
-  configure_sdk_unix("Haiku" "${SWIFT_HOST_VARIANT_ARCH}")
+  configure_sdk_unix(HAIKU "Haiku" "haiku" "haiku" "x86_64" "x86_64-unknown-haiku" "/")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
-  set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
+  set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
 
 elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
 
@@ -735,10 +763,16 @@ if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
     message(FATAL_ERROR "A Darwin or Linux host is required to build the Swift runtime for Android")
   endif()
 
+  if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT swift_build_osx) OR
+     ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND NOT swift_build_linux))
+    set(SWIFT_PRIMARY_VARIANT_SDK_default "ANDROID")
+    set(SWIFT_PRIMARY_VARIANT_ARCH_default "armv7")
+  endif()
+
   if("${SWIFT_SDK_ANDROID_ARCHITECTURES}" STREQUAL "")
     set(SWIFT_SDK_ANDROID_ARCHITECTURES armv7;aarch64)
   endif()
-  configure_sdk_unix("Android" "${SWIFT_SDK_ANDROID_ARCHITECTURES}")
+  configure_sdk_unix(ANDROID "Android" "android" "android" "${SWIFT_SDK_ANDROID_ARCHITECTURES}" "" "")
 endif()
 
 # Should we cross-compile the standard library for Windows?
@@ -747,7 +781,7 @@ if(swift_build_windows AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
   if("${SWIFT_SDK_WINDOWS_ARCHITECTURES}" STREQUAL "")
     set(SWIFT_SDK_WINDOWS_ARCHITECTURES aarch64;armv7;i686;x86_64)
   endif()
-  configure_sdk_windows("Windows" "msvc" "${SWIFT_SDK_WINDOWS_ARCHITECTURES}")
+  configure_sdk_windows(WINDOWS "Windows" "msvc" "${SWIFT_SDK_WINDOWS_ARCHITECTURES}")
 endif()
 
 if("${SWIFT_SDKS}" STREQUAL "")

branches/marcrasi-static-assert/cmake/modules/AddSwift.cmake

@@ -298,9 +298,8 @@ function(_add_variant_c_compile_flags)
   endif()
 
   if("${CFLAGS_SDK}" STREQUAL "ANDROID")
-    swift_android_libcxx_include_paths(CFLAGS_CXX_INCLUDES)
     swift_android_include_for_arch("${CFLAGS_ARCH}" "${CFLAGS_ARCH}_INCLUDE")
-    foreach(path IN LISTS CFLAGS_CXX_INCLUDES ${CFLAGS_ARCH}_INCLUDE)
+    foreach(path IN LISTS ${CFLAGS_ARCH}_INCLUDE)
       list(APPEND result "\"${CMAKE_INCLUDE_FLAG_C}${path}\"")
     endforeach()
     list(APPEND result "-D__ANDROID_API__=${SWIFT_ANDROID_API_LEVEL}")

branches/marcrasi-static-assert/cmake/modules/SwiftAndroidSupport.cmake

@@ -1,13 +1,8 @@
-function(swift_android_libcxx_include_paths var)
-  set(${var}
-        "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/include"
-        "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++abi/include"
-      PARENT_SCOPE)
-endfunction()
-
 function(swift_android_include_for_arch arch var)
   set(paths)
   list(APPEND paths
+       "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/include"
+       "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++abi/include"
        "${SWIFT_ANDROID_NDK_PATH}/sources/android/support/include"
        "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include"
        "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}") 

branches/marcrasi-static-assert/cmake/modules/SwiftConfigureSDK.cmake

@@ -40,26 +40,21 @@ function(_report_sdk prefix)
       message(STATUS "  ${arch} Path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_PATH}")
     endforeach()
   endif()
-  if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
-    message(STATUS "  Version: ${SWIFT_SDK_${prefix}_VERSION}")
-    message(STATUS "  Build number: ${SWIFT_SDK_${prefix}_BUILD_NUMBER}")
-    message(STATUS "  Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
-  endif()
+  message(STATUS "  Version: ${SWIFT_SDK_${prefix}_VERSION}")
+  message(STATUS "  Build number: ${SWIFT_SDK_${prefix}_BUILD_NUMBER}")
+  message(STATUS "  Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
   message(STATUS "  Library subdir: ${SWIFT_SDK_${prefix}_LIB_SUBDIR}")
-  if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
-    message(STATUS "  Version min name: ${SWIFT_SDK_${prefix}_VERSION_MIN_NAME}")
-    message(STATUS "  Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
-  endif()
+  message(STATUS "  Version min name: ${SWIFT_SDK_${prefix}_VERSION_MIN_NAME}")
+  message(STATUS "  Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
   message(STATUS "  Architectures: ${SWIFT_SDK_${prefix}_ARCHITECTURES}")
-  if(NOT prefix IN_LIST SWIFT_APPLE_PLATFORMS)
-    if(SWIFT_BUILD_STDLIB)
-      foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
-        message(STATUS "  ICU i18n INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N_INCLUDE}")
-        message(STATUS "  ICU i18n LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N}")
-        message(STATUS "  ICU unicode INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC_INCLUDE}")
-        message(STATUS "  ICU unicode LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC}")
-      endforeach()
-    endif()
+  is_darwin_based_sdk(${prefix} IS_DARWIN_BASED_SDK)
+  if(NOT ${IS_DARWIN_BASED_SDK})
+    foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
+      message(STATUS "  ICU i18n INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N_INCLUDE}")
+      message(STATUS "  ICU i18n LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_I18N}")
+      message(STATUS "  ICU unicode INCLUDE (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC_INCLUDE}")
+      message(STATUS "  ICU unicode LIB (${arch}): ${SWIFT_${prefix}_${arch}_ICU_UC}")
+    endforeach()
   endif()
   message(STATUS "  Object Format: ${SWIFT_SDK_${prefix}_OBJECT_FORMAT}")
   foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
@@ -165,15 +160,18 @@ macro(configure_sdk_darwin
   _report_sdk("${prefix}")
 endmacro()
 
-macro(configure_sdk_unix name architectures)
+macro(configure_sdk_unix
+    prefix name lib_subdir triple_name architectures triple sdkpath)
   # Note: this has to be implemented as a macro because it sets global
   # variables.
 
-  string(TOUPPER ${name} prefix)
-  string(TOLOWER ${name} platform)
-
   set(SWIFT_SDK_${prefix}_NAME "${name}")
-  set(SWIFT_SDK_${prefix}_LIB_SUBDIR "${platform}")
+  set(SWIFT_SDK_${prefix}_VERSION "don't use")
+  set(SWIFT_SDK_${prefix}_BUILD_NUMBER "don't use")
+  set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "")
+  set(SWIFT_SDK_${prefix}_LIB_SUBDIR "${lib_subdir}")
+  set(SWIFT_SDK_${prefix}_VERSION_MIN_NAME "")
+  set(SWIFT_SDK_${prefix}_TRIPLE_NAME "${triple_name}")
   set(SWIFT_SDK_${prefix}_ARCHITECTURES "${architectures}")
   if("${prefix}" STREQUAL "CYGWIN")
     set(SWIFT_SDK_${prefix}_OBJECT_FORMAT "COFF")
@@ -211,44 +209,8 @@ macro(configure_sdk_unix name architectures)
       set(SWIFT_SDK_ANDROID_ARCH_${arch}_LINKER
           "${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH}/bin/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}-${SWIFT_ANDROID_LINKER_NAME}")
     else()
-      if(NOT SWIFT_SDK_${prefix}_ARCH_${arch}_PATH)
-        set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/")
-      endif()
-
-      if("${prefix}" STREQUAL "LINUX")
-        if(arch MATCHES "(armv6|armv7)")
-          set(SWIFT_SDK_LINUX_ARCH_${arch}_TRIPLE "${arch}-unknown-linux-gnueabihf")
-        elseif(arch MATCHES "(aarch64|i686|powerpc64|powerpc64le|s390x|x86_64)")
-          set(SWIFT_SDK_LINUX_ARCH_${arch}_TRIPLE "${arch}-unknown-linux-gnu")
-        else()
-          message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}")
-        endif()
-      elseif("${prefix}" STREQUAL "FREEBSD")
-        if(arch STREQUAL x86_64)
-          message(FATAL_ERROR "unsupported arch for FreeBSD: ${arch}")
-        endif()
-
-        if(CMAKE_HOST_SYSTEM_NAME NOT STREQUAL FreeBSD)
-          message(WARNING "CMAKE_SYSTEM_VERSION will not match target")
-        endif()
-
-        string(REPLACE "[-].*" "" freebsd_system_version ${CMAKE_SYSTEM_VERSION})
-        message(STATUS "FreeBSD Version: ${freebsd_system_version}")
-
-        set(SWIFT_SDK_FREEBSD_ARCH_x86_64_TRIPLE "x86_64-unknown-freebsd${freebsd_system_version}")
-      elseif("${prefix}" STREQUAL "CYGWIN")
-        if(NOT arch STREQUAL x86_64)
-          message(FATAL_ERROR "unsupported arch for cygwin: ${arch}")
-        endif()
-        set(SWIFT_SDK_CYGWIN_ARCH_x86_64_TRIPLE "x86_64-unknown-windows-cygnus")
-      elseif("${prefix}" STREQUAL "HAIKU")
-        if(NOT arch STREQUAL x86_64)
-          message(FATAL_ERROR "unsupported arch for Haiku: ${arch}")
-        endif()
-        set(SWIFT_SDK_HAIKU_ARCH_x86_64_TRIPLE "x86_64-unknown-haiku")
-      else()
-        message(FATAL_ERROR "unknown Unix OS: ${prefix}")
-      endif()
+      set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "${sdkpath}")
+      set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE "${triple}")
     endif()
   endforeach()
 
@@ -258,15 +220,17 @@ macro(configure_sdk_unix name architectures)
   _report_sdk("${prefix}")
 endmacro()
 
-macro(configure_sdk_windows name environment architectures)
+macro(configure_sdk_windows prefix sdk_name environment architectures)
   # Note: this has to be implemented as a macro because it sets global
   # variables.
 
-  string(TOUPPER ${name} prefix)
-  string(TOLOWER ${name} platform)
-
   set(SWIFT_SDK_${prefix}_NAME "${sdk_name}")
+  set(SWIFT_SDK_${prefix}_VERSION "NOTFOUND")
+  set(SWIFT_SDK_${prefix}_BUILD_NUMBER "NOTFOUND")
+  set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "")
   set(SWIFT_SDK_${prefix}_LIB_SUBDIR "windows")
+  set(SWIFT_SDK_${prefix}_VERSION_MIN_NAME "NOTFOUND")
+  set(SWIFT_SDK_${prefix}_TRIPLE_NAME "Win32")
   set(SWIFT_SDK_${prefix}_ARCHITECTURES "${architectures}")
   set(SWIFT_SDK_${prefix}_OBJECT_FORMAT "COFF")
 

branches/marcrasi-static-assert/cmake/modules/SwiftWindowsSupport.cmake

@@ -47,24 +47,14 @@ function(swift_windows_lib_for_arch arch var)
   swift_windows_arch_spelling(${arch} ARCH)
 
   set(paths)
-
-  # NOTE(compnerd) provide compatibility with VS2015 which had the libraries in
-  # a directory called "Lib" rather than VS2017 which normalizes the layout and
-  # places them in a directory named "lib".
-  if(IS_DIRECTORY "$ENV{VCToolsInstallDir}/Lib")
-    if(${ARCH} STREQUAL x86)
-      list(APPEND paths "$ENV{VCToolsInstallDir}/Lib/")
-    else()
-      list(APPEND paths "$ENV{VCToolsInstallDir}/Lib/${ARCH}")
-    endif()
+  if(${ARCH} STREQUAL x86)
+    list(APPEND paths "$ENV{VCToolsInstallDir}/Lib")
   else()
-    list(APPEND paths "$ENV{VCToolsInstallDir}/lib/${ARCH}")
+    list(APPEND paths "$ENV{VCToolsInstallDir}/Lib/${ARCH}")
   endif()
-
   list(APPEND paths
           "$ENV{UniversalCRTSdkDir}/Lib/$ENV{UCRTVersion}/ucrt/${ARCH}"
           "$ENV{UniversalCRTSdkDir}/Lib/$ENV{UCRTVersion}/um/${ARCH}")
-
   set(${var} ${paths} PARENT_SCOPE)
 endfunction()
 

branches/marcrasi-static-assert/docs/ARCOptimization.rst

@@ -373,7 +373,7 @@ Semantic Tags
 ARC takes advantage of certain semantic tags. This section documents these
 semantics and their meanings.
 
-programtermination_point
+arc.programtermination_point
 ----------------------------
 
 If this semantic tag is applied to a function, then we know that:
@@ -396,7 +396,7 @@ scope's lifetime may never end. This means that:
 
 1. While we can not ignore all such unreachable terminated blocks for ARC
 purposes for instance, if we sink a retain past a br into a non
-programtermination_point block, we must sink the retain into the block.
+arc.programtermination_point block, we must sink the retain into the block.
 
 2. If we are able to infer that an object's lifetime scope would never end due
 to the unreachable/no-return function, then we do not need to end the lifetime

branches/marcrasi-static-assert/include/swift/AST/AccessScopeChecker.h

@@ -55,15 +55,19 @@ class TypeReprAccessScopeChecker : private ASTWalker, AccessScopeChecker {
 };
 
 class TypeAccessScopeChecker : private TypeWalker, AccessScopeChecker {
+  bool CanonicalizeParentTypes;
+
   TypeAccessScopeChecker(const DeclContext *useDC,
-                         bool treatUsableFromInlineAsPublic);
+                         bool treatUsableFromInlineAsPublic,
+                         bool canonicalizeParentTypes);
 
   Action walkToTypePre(Type T);
 
 public:
   static Optional<AccessScope>
   getAccessScope(Type T, const DeclContext *useDC,
-                 bool treatUsableFromInlineAsPublic = false);
+                 bool treatUsableFromInlineAsPublic = false,
+                 bool canonicalizeParentTypes = false);
 };
 
 }

branches/marcrasi-static-assert/include/swift/AST/Decl.h

@@ -3233,7 +3233,10 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
                                                      ToStoredProperty>;
 
   /// Return a collection of the stored member variables of this type.
-  StoredPropertyRange getStoredProperties(bool skipInaccessible = false) const;
+  StoredPropertyRange getStoredProperties(bool skipInaccessible = false) const {
+    return StoredPropertyRange(getMembers(),
+                               ToStoredProperty(skipInaccessible));
+  }
 
 private:
   /// Predicate used to filter StoredPropertyRange.
@@ -6453,11 +6456,12 @@ class InfixOperatorDecl : public OperatorDecl {
 
   InfixOperatorDecl(DeclContext *DC, SourceLoc operatorLoc, Identifier name,
                     SourceLoc nameLoc, SourceLoc colonLoc,
-                    PrecedenceGroupDecl *precedenceGroup,
+                    Identifier firstIdentifier, SourceLoc firstIdentifierLoc,
                     NominalTypeDecl *designatedNominalType)
       : OperatorDecl(DeclKind::InfixOperator, DC, operatorLoc, name, nameLoc,
                      designatedNominalType),
-        ColonLoc(colonLoc), PrecedenceGroup(precedenceGroup) {}
+        ColonLoc(colonLoc), FirstIdentifierLoc(firstIdentifierLoc),
+        FirstIdentifier(firstIdentifier) {}
 
   SourceLoc getEndLoc() const {
     if (!SecondIdentifier.empty())

branches/marcrasi-static-assert/include/swift/AST/DiagnosticsModuleDiffer.def

@@ -58,9 +58,7 @@ ERROR(decl_reorder,none,"%0 in a non-resilient type changes position from %1 to
 
 ERROR(decl_added,none,"%0 is added to a non-resilient type", (StringRef))
 
-ERROR(var_has_fixed_order_change,none,"%0 is %select{now|no longer}1 a stored property", (StringRef, bool))
-
-ERROR(func_has_fixed_order_change,none,"%0 is %select{now|no longer}1 a non-final instance function", (StringRef, bool))
+ERROR(decl_has_fixed_order_change,none,"%0 is %select{now|no longer}1 a stored property", (StringRef, bool))
 
 ERROR(default_arg_removed,none,"%0 has removed default argument from %1", (StringRef, StringRef))