merge branch 'main' into function-in-constructor

Author: scentini

.mailmap

@@ -9,11 +9,11 @@ Ankit Aggarwal <[email protected]> <[email protected]>
 Argyrios Kyrtzidis <[email protected]> <[email protected]>
 Arsen Gasparyan <[email protected]> <[email protected]>
 Ashley Garland <[email protected]> <[email protected]>
+Becca Royal-Gordon <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
 Ben Cohen <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
 Ben Langmuir <[email protected]> <[email protected]>
-Brent Royal-Gordon <[email protected]> <[email protected]>
 Brian Croom <[email protected]> <[email protected]>
 Brian Gesiak <[email protected]> <[email protected]>
 Bryan Chan <[email protected]> <[email protected]>

CHANGELOG.md

@@ -147,7 +147,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.3")
+set(SWIFT_VERSION "5.4")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")
@@ -481,10 +481,12 @@ if(SWIFT_PATH_TO_CMARK_BUILD)
 endif()
 message(STATUS "")
 
-if("${SWIFT_NATIVE_LLVM_TOOLS_PATH}" STREQUAL "")
-  set(SWIFT_CROSS_COMPILING FALSE)
+# Check if a prebuilt clang path was passed in, as this variable will be
+# assigned if not, in SwiftSharedCMakeConfig.
+if("${SWIFT_NATIVE_CLANG_TOOLS_PATH}" STREQUAL "")
+  set(SWIFT_PREBUILT_CLANG FALSE)
 else()
-  set(SWIFT_CROSS_COMPILING TRUE)
+  set(SWIFT_PREBUILT_CLANG TRUE)
 endif()
 
 include(SwiftSharedCMakeConfig)
@@ -605,8 +607,12 @@ if(SWIFT_HOST_VARIANT_ARCH)
 else()
   if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
     set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64")
-    set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64")
+    if(SWIFT_HOST_VARIANT_SDK_default STREQUAL OSX)
+      set(SWIFT_HOST_VARIANT_ARCH_default "arm64")
+    else()
+      set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
+    endif()
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
     set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64le")
@@ -649,9 +655,10 @@ endif()
 #
 
 if(XCODE)
-  # FIXME: Cannot cross-compile the standard library using Xcode.  Xcode
-  # insists on passing -mmacosx-version-min to the compiler, and we need
-  # to pass -mios-version-min.  Clang sees both options and complains.
+  # FIXME: It used to be the case that Xcode would force
+  # -m${platform}-version-min flags that would conflict with those computed
+  # by build-script. version-min flags are deprecated in favor of -target since
+  # clang-11, so we might be able to undo this.
   set(SWIFT_SDKS "OSX")
 endif()
 
@@ -772,7 +779,7 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
   #
   # Primary variant is always OSX; even on iOS hosts.
   set(SWIFT_PRIMARY_VARIANT_SDK_default "OSX")
-  set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
+  set(SWIFT_PRIMARY_VARIANT_ARCH_default "${CMAKE_HOST_SYSTEM_PROCESSOR}")
 
 endif()
 

CMakeLists.txt

@@ -5,7 +5,7 @@
 
 | | **Architecture** | **main** | **Package** |
 |---|:---:|:---:|:---:|
-| **macOS**        | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-osx/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-osx)|[![Build Status](https://ci.swift.org/job/oss-swift-package-osx/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-osx)|
+| **macOS**        | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-macos)|[![Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-macos)|
 | **Ubuntu 16.04** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04)|
 | **Ubuntu 18.04** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-18_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-18_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-18_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-18_04)|
 | **Ubuntu 20.04** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04)|
@@ -67,7 +67,7 @@ diligently to make the Swift community welcoming to everyone.
 To give clarity of what is expected of our members, Swift has adopted the
 code of conduct defined by the Contributor Covenant. This document is used
 across many open source communities, and we think it articulates our values
-well. For more, see the [Code of Conduct](https://swift.org/community/#code-of-conduct).
+well. For more, see the [Code of Conduct](https://swift.org/code-of-conduct/).
 
 ## Getting Started
 

README.md

@@ -179,6 +179,7 @@ set(SWIFT_BENCH_MODULES
     single-source/StringMatch
     single-source/StringRemoveDupes
     single-source/StringReplaceSubrange
+    single-source/StringSwitch
     single-source/StringTests
     single-source/StringWalk
     single-source/Substring

benchmark/CMakeLists.txt

@@ -74,6 +74,7 @@ The following build options are available:
 The following build targets are available:
 
 * `swift-benchmark-macosx-x86_64`
+* `swift-benchmark-macosx-arm64`
 * `swift-benchmark-iphoneos-arm64e`
 * `swift-benchmark-iphoneos-arm64`
 * `swift-benchmark-iphoneos-armv7`
@@ -84,7 +85,7 @@ Build steps (with example options):
 
 1. `$ mkdir build; cd build`
 2. `$ cmake [path to swift src]/benchmark -G Ninja -DSWIFT_EXEC=[path to built swiftc]`
-3. `$ ninja swift-benchmark-macosx-x86_64`
+3. `$ ninja swift-benchmark-macosx-$(uname -m)`
 
 Benchmark binaries are placed in `bin`.
 
@@ -98,7 +99,7 @@ relative to the benchmark binary at the time it was executed
 For example, to benchmark against a locally built `swiftc`, including
 any standard library changes in that build, you might configure using:
 
-    cmake <src>/benchmark -G Ninja -DSWIFT_EXEC=<build>/swift-macosx-x86_64/bin/swiftc
+    cmake <src>/benchmark -G Ninja -DSWIFT_EXEC=<build>/swift-macosx-$(uname -m)/bin/swiftc
     ninja swift-benchmark-iphoneos-arm64
 
 To build against the installed Xcode, simply omit SWIFT_EXEC:
@@ -139,7 +140,7 @@ The benchmark suite can be built with swiftpm/llbuild without needing any help
 from build-script by invoking swift build in the benchmark directory:
 
 ```
-swift-source/swift/benchmark$ swift build -configuration release
+swift-source/swift/benchmark$ swift build --configuration release
 swift-source/swift/benchmark$ .build/release/SwiftBench
 #,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs)
 1,Ackermann,1,169,169,169,0,169
@@ -319,12 +320,12 @@ swift-source$ ./swift/utils/build-script -R -B
 ````
 you can rebuild just the benchmarks:
 ````
-swift-source$ export SWIFT_BUILD_DIR=`pwd`/build/Ninja-ReleaseAssert/swift-macosx-x86_64
-swift-source$ ninja -C ${SWIFT_BUILD_DIR} swift-benchmark-macosx-x86_64
+swift-source$ export SWIFT_BUILD_DIR=`pwd`/build/Ninja-ReleaseAssert/swift-macosx-$(uname -m)
+swift-source$ ninja -C ${SWIFT_BUILD_DIR} swift-benchmark-macosx-$(uname -m)
 ````
 
 When modifying the testing infrastructure, you should verify that your changes
 pass all the tests:
 ````
-swift-source$ ./llvm/utils/lit/lit.py -sv ${SWIFT_BUILD_DIR}/test-macosx-x86_64/benchmark
+swift-source$ ./llvm/utils/lit/lit.py -sv ${SWIFT_BUILD_DIR}/test-macosx-$(uname -m)/benchmark
 ````

benchmark/README.md

@@ -0,0 +1,234 @@
+//===--- StringSwitch.swift -------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+
+public let StringSwitch = [
+  BenchmarkInfo(
+    name: "StringSwitch",
+    runFunction: run_StringSwitch,
+    tags: [.validation, .api])
+]
+
+@inline(never)
+func getIndex(_ s: String) -> Int {
+  switch s {
+  case "Swift": return 0
+  case "is": return 1
+  case "a": return 2
+  case "general-purpose": return 3
+  case "programming language": return 4
+  case "built": return 5
+  case "using": return 6
+  case "modern": return 7
+  case "approach": return 8
+  case "to": return 9
+  case "safety,": return 10
+  case "performance,": return 11
+  case "and": return 12
+  case "software": return 13
+  case "design": return 14
+  case "patterns.": return 15
+  case "": return 16
+  case "The": return 17
+  case "goal": return 18
+  case "of": return 19
+  case "the": return 20
+  case "project": return 21
+  case "create": return 22
+  case "best": return 23
+  case "available": return 24
+  case "for": return 25
+  case "uses": return 26
+  case "ranging": return 27
+  case "from": return 28
+  case "systems": return 29
+  case "mobile": return 30
+  case "desktop": return 31
+  case "apps,": return 32
+  case "scaling": return 33
+  case "up": return 34
+  case "cloud": return 35
+  case "services.": return 36
+  case "Most": return 37
+  case "importantly,": return 38
+  case "designed": return 39
+  case "make": return 40
+  case "writing": return 41
+  case "maintaining": return 42
+  case "correct": return 43
+  case "programs": return 44
+  case "easier": return 45
+  case "developer.": return 46
+  case "To": return 47
+  case "achieve": return 48
+  case "this": return 49
+  case "goal,": return 50
+  case "we": return 51
+  case "believe": return 52
+  case "that": return 53
+  case "most": return 54
+  case "obvious": return 55
+  case "way": return 56
+  case "write": return 57
+  case "code": return 58
+  case "must": return 59
+  case "also": return 60
+  case "be:": return 61
+  case "Safe.": return 62
+  case "should": return 63
+  case "behave": return 64
+  case "in": return 65
+  case "safe": return 66
+  case "manner.": return 67
+  case "Undefined": return 68
+  case "behavior": return 69
+  case "enemy": return 70
+  case "developer": return 71
+  case "mistakes": return 72
+  case "be": return 73
+  case "caught": return 74
+  case "before": return 75
+  case "production.": return 76
+  case "Opting": return 77
+  case "safety": return 78
+  case "sometimes": return 79
+  case "means": return 80
+  case "will": return 81
+  case "feel": return 82
+  case "strict,": return 83
+  case "but": return 84
+  case "clarity": return 85
+  case "saves": return 86
+  case "time": return 87
+  case "long": return 88
+  case "run.": return 89
+  case "Fast.": return 90
+  case "intended": return 91
+  case "as": return 92
+  case "replacement": return 93
+  case "C-based": return 94
+  case "languages": return 95
+  case "(C, C++, Objective-C).": return 96
+  case "As": return 97
+  case "such,": return 98
+  case "comparable": return 99
+  case "those": return 100
+  case "performance": return 101
+  case "tasks.": return 102
+  case "Performance": return 103
+  case "predictable": return 104
+  case "consistent,": return 105
+  case "not": return 106
+  case "just": return 107
+  case "fast": return 108
+  case "short": return 109
+  case "bursts": return 110
+  case "require": return 111
+  case "clean-up": return 112
+  case "later.": return 113
+  case "There": return 114
+  case "are": return 115
+  case "lots": return 116
+  case "with": return 117
+  case "novel": return 118
+  case "features": return 119
+  case "x": return 120
+  case "being": return 121
+  case "rare.": return 122
+  case "Expressive.": return 123
+  case "benefits": return 124
+  case "decades": return 125
+  case "advancement": return 126
+  case "computer": return 127
+  case "science": return 128
+  case "offer": return 129
+  case "syntax": return 130
+  case "joy": return 131
+  case "use,": return 132
+  case "developers": return 133
+  case "expect.": return 134
+  case "But": return 135
+  case "never": return 136
+  case "done.": return 137
+  case "We": return 138
+  case "monitor": return 139
+  case "advancements": return 140
+  case "embrace": return 141
+  case "what": return 142
+  case "works,": return 143
+  case "continually": return 144
+  case "evolving": return 145
+  case "even": return 146
+  case "better.": return 147
+  case "Tools": return 148
+  case "critical": return 149
+  case "part": return 150
+  case "ecosystem.": return 151
+  case "strive": return 152
+  case "integrate": return 153
+  case "well": return 154
+  case "within": return 155
+  case "developerss": return 156
+  case "toolset,": return 157
+  case "build": return 158
+  case "quickly,": return 159
+  case "present": return 160
+  case "excellent": return 161
+  case "diagnostics,": return 162
+  case "enable": return 163
+  case "interactive": return 164
+  case "development": return 165
+  case "experiences.": return 166
+  case "can": return 167
+  case "so": return 168
+  case "much": return 169
+  case "more": return 170
+  case "powerful,": return 171
+  case "like": return 172
+  case "Swift-based": return 173
+  case "playgrounds": return 174
+  case "do": return 175
+  case "Xcode,": return 176
+  case "or": return 177
+  case "web-based": return 178
+  case "REPL": return 179
+  case "when": return 180
+  case "working": return 181
+  case "Linux": return 182
+  case "server-side": return 183
+  case "code.": return 184
+  default: return -1
+  }
+}
+
+@inline(never)
+func test(_ s: String) {
+  blackHole(getIndex(s))
+}
+
+@inline(never)
+public func run_StringSwitch(N: Int) {
+  let first = "Swift"
+  let short = "To"
+  let long = "(C, C++, Objective-C)."
+  let last = "code."
+  let none = "non existent string"
+  for _ in 1...100*N {
+    test(first)
+    test(short)
+    test(long)
+    test(last)
+    test(none)
+  }
+}
+

benchmark/single-source/StringSwitch.swift

@@ -1,3 +1,8 @@
+#ifndef BENCHMARK_CREATE_OBJECTS_H
+#define BENCHMARK_CREATE_OBJECTS_H
+
 struct CxxLoadableIntWrapper {
   int value;
 };
+
+#endif // BENCHMARK_CREATE_OBJECTS_H