Merge remote-tracking branch 'apple/main' into katei/merge-main-2021-11-12

Author: kateinoigakukun

README.md

@@ -38,6 +38,7 @@ to track the status of our builds, please refer to our [GitHub Actions page](htt
 |**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/ppc64le_ubuntu_16_04.json)** | PPC64LE |[![Build Status](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le)|
 |**[Ubuntu 18.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/aarch64_ubuntu_18.04_docker.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-ubuntu-18.04-aarch64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-ubuntu-18.04-aarch64)|
 |**[Ubuntu 20.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/aarch64_ubuntu_20.04_docker.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-ubuntu-20.04-aarch64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-ubuntu-20.04-aarch64)|
+|**[Ubuntu 20.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/wasm32_ubuntu_20.04.json)** | wasm32 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-20.04-webassembly/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-20.04-webassembly)|
 |**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | ARMv7 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android)|
 |**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64)|
 |**[Windows 2019 (VS 2017)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/x86_64_windows_2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64)|

cmake/modules/AddSwift.cmake

@@ -468,8 +468,7 @@ function(add_swift_host_library name)
         SHARED
         STATIC
         OBJECT
-        PURE_SWIFT
-        HAS_LIBSWIFT)
+        PURE_SWIFT)
   set(single_parameter_options)
   set(multiple_parameter_options
         LLVM_LINK_COMPONENTS)
@@ -522,12 +521,6 @@ function(add_swift_host_library name)
 
   add_library(${name} ${libkind} ${ASHL_SOURCES})
 
-  if (ASHL_HAS_LIBSWIFT AND LIBSWIFT_BUILD_MODE)
-    # Workaround for a linker crash related to autolinking: rdar://77839981
-    set_property(TARGET ${name} APPEND_STRING PROPERTY
-                 LINK_FLAGS " -lobjc ")
-  endif()
-
   # Respect LLVM_COMMON_DEPENDS if it is set.
   #
   # LLVM_COMMON_DEPENDS if a global variable set in ./lib that provides targets
@@ -676,8 +669,8 @@ endfunction()
 function(add_libswift_module module)
   cmake_parse_arguments(ALSM
                         ""
-                        "DEPENDS"
                         ""
+                        "DEPENDS"
                         ${ARGN})
   set(sources ${ALSM_UNPARSED_ARGUMENTS})
   list(TRANSFORM sources PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/")
@@ -726,8 +719,8 @@ endfunction()
 function(add_libswift name)
   cmake_parse_arguments(ALS
                         ""
-                        "BOOTSTRAPPING;SWIFT_EXEC;DEPENDS"
-                        ""
+                        "BOOTSTRAPPING;SWIFT_EXEC"
+                        "DEPENDS"
                         ${ARGN})
 
   set(libswift_compile_options
@@ -795,7 +788,7 @@ function(add_libswift name)
               "-emit-module-path" "${build_dir}/${module}.swiftmodule"
               "-parse-as-library" ${sources}
               "-wmo" ${libswift_compile_options}
-              "-I" "${CMAKE_SOURCE_DIR}/include/swift"
+              "-I" "${SWIFT_SOURCE_DIR}/include/swift"
               "-I" "${build_dir}"
       COMMENT "Building libswift module ${module}")
 

cmake/modules/SwiftComponents.cmake

@@ -65,9 +65,10 @@
 # * toolchain-tools -- a subset of tools that we will install to the OSS toolchain.
 # * testsuite-tools -- extra tools required to run the Swift testsuite.
 # * toolchain-dev-tools -- install development tools useful in a shared toolchain
+# * llvm-toolchain-dev-tools -- install LLVM development tools useful in a shared toolchain
 # * dev -- headers and libraries required to use Swift compiler as a library.
 set(_SWIFT_DEFINED_COMPONENTS
-  "autolink-driver;back-deployment;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
+  "autolink-driver;back-deployment;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-tools;toolchain-dev-tools;llvm-toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
 
 # The default install components include all of the defined components, except
 # for the following exceptions.
@@ -78,7 +79,7 @@ list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "dev")
 list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-resource-dir-symlink")
 list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-builtin-headers-in-clang-resource-dir")
 # This conflicts with LLVM itself when doing unified builds.
-list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "toolchain-dev-tools")
+list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "llvm-toolchain-dev-tools")
 # The sourcekit install variants are currently mutually exclusive.
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-inproc")

docs/RequirementMachine/Makefile

@@ -0,0 +1,10 @@
+RequirementMachine.pdf:
+	pdflatex RequirementMachine
+	bibtex RequirementMachine
+	pdflatex RequirementMachine
+	pdflatex RequirementMachine
+
+clean:
+	rm *.aux *.bbl *.blg *.idx *.ilg *.ind *.log *.out *.pdf *.toc
+
+.PHONY: clean

docs/RequirementMachine/RequirementMachine.bib

@@ -0,0 +1,75 @@
+@misc{se0142,
+    author    = "David Hart and Jacob Bandes-Storch and Doug Gregor",
+    title     = "{SE-0142}: Permit where clauses to constrain associated types",
+    url       = "https://github.com/apple/swift-evolution/blob/main/proposals/0142-associated-types-constraints.md",
+    year      = {2017}
+}
+@misc{se0157,
+    author    = "Doug Gregor and Erica Sadun and Austin Zheng",
+    title     = "{SE-0157}: Support recursive constraints on associated types",
+    url       = "https://github.com/apple/swift-evolution/blob/main/proposals/0157-recursive-protocol-constraints.md",
+    year      = {2017}
+}
+@misc(gensig,
+    author    = "Doug Gregor",
+    title     = "Generic Signatures",
+    url       = "https://github.com/apple/swift/blob/main/docs/ABI/GenericSignature.md",
+    year      = {2018}
+)
+@article{undecidablegroup,
+author = {Donald J. Collins},
+title = {{A simple presentation of a group with unsolvable word problem}},
+volume = {30},
+journal = {Illinois Journal of Mathematics},
+number = {2},
+publisher = {Duke University Press},
+pages = {230 -- 234},
+year = {1986},
+doi = {10.1215/ijm/1256044631},
+URL = {https://doi.org/10.1215/ijm/1256044631}
+}
+@book{andallthat, place={Cambridge}, title={Term Rewriting and All That}, DOI={10.1017/CBO9781139172752}, publisher={Cambridge University Press}, author={Baader, Franz and Nipkow, Tobias}, year={1998}}
+@Inbook{Knuth1983,
+author="Knuth, D. E.
+and Bendix, P. B.",
+editor="Siekmann, J{\"o}rg H.
+and Wrightson, Graham",
+title="Simple Word Problems in Universal Algebras",
+bookTitle="Automation of Reasoning: 2: Classical Papers on Computational Logic 1967--1970",
+year="1983",
+publisher="Springer Berlin Heidelberg",
+address="Berlin, Heidelberg",
+pages="342--376",
+isbn="978-3-642-81955-1",
+doi="10.1007/978-3-642-81955-1_23",
+url="https://doi.org/10.1007/978-3-642-81955-1_23"
+}
+@article{SQUIER1994271,
+title = {A finiteness condition for rewriting systems},
+journal = {Theoretical Computer Science},
+volume = {131},
+number = {2},
+pages = {271-294},
+year = {1994},
+issn = {0304-3975},
+doi = {https://doi.org/10.1016/0304-3975(94)90175-9},
+url = {https://www.sciencedirect.com/science/article/pii/0304397594901759},
+author = {Craig C. Squier and Friedrich Otto and Yuji Kobayashi}
+}
+@inproceedings{guiraud:hal-00818253,
+  TITLE = {{A Homotopical Completion Procedure with Applications to Coherence of Monoids}},
+  AUTHOR = {Guiraud, Yves and Malbos, Philippe and Mimram, Samuel},
+  URL = {https://hal.inria.fr/hal-00818253},
+  BOOKTITLE = {{RTA - 24th International Conference on Rewriting Techniques and Applications - 2013}},
+  ADDRESS = {Eindhoven, Netherlands},
+  EDITOR = {Van Raamsdonk, Femke},
+  PUBLISHER = {{Schloss Dagstuhl--Leibniz-Zentrum fuer Informatik}},
+  SERIES = {Leibniz International Proceedings in Informatics (LIPIcs)},
+  VOLUME = {21},
+  PAGES = {223-238},
+  YEAR = {2013},
+  MONTH = Jun,
+  DOI = {10.4230/LIPIcs.RTA.2013.223},
+  HAL_ID = {hal-00818253},
+  HAL_VERSION = {v1},
+}