Merge pull request #4556 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

lib/ClangImporter/ClangImporter.cpp

@@ -913,7 +913,7 @@ importer::addCommonInvocationArguments(
 /// On Linux, some platform libraries (glibc, libstdc++) are not modularized.
 /// We inject modulemaps for those libraries into their include directories
 /// to allow using them from Swift.
-static SmallVector<std::pair<std::string, std::string>>
+static SmallVector<std::pair<std::string, std::string>, 16>
 getClangInvocationFileMapping(ASTContext &ctx) {
   using Path = SmallString<128>;
 
@@ -970,7 +970,7 @@ getClangInvocationFileMapping(ASTContext &ctx) {
     cxxStdlibDirs.push_back(Path(iter->path()));
   }
 
-  SmallVector<std::pair<std::string, std::string>> result;
+  SmallVector<std::pair<std::string, std::string>, 16> result;
   // Inject a modulemap into the VFS for each of the libstdc++ versions.
   for (const Path &cxxStdlibDir : cxxStdlibDirs) {
     // Only inject the module map if the module does not already exist at

stdlib/public/core/UnicodeScalarProperties.swift

@@ -1263,8 +1263,8 @@ extension Unicode.Scalar.Properties {
   /// The name of a scalar is immutable and never changed in future versions of
   /// the Unicode Standard. The `nameAlias` property is provided to issue
   /// corrections if a name was issued erroneously. For example, the `name` of
-  /// U+FE18 is "PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRACKET"
-  /// (note that "BRACKET" is misspelled). The `nameAlias` property then
+  /// U+FE18 is "PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET"
+  /// (note that "BRAKCET" is misspelled). The `nameAlias` property then
   /// contains the corrected name.
   ///
   /// If a scalar has no alias, this property is `nil`.

utils/build-windows.bat

@@ -64,6 +64,9 @@ set CUSTOM_CLANG_MODULE_CACHE=%build_root%\tmp\org.llvm.clang.9999
 md %build_root%\tmp\org.swift.package-manager
 set SWIFTPM_MODULECACHE_OVERRIDE=%build_root%\tmp\org.swift.package-manager
 
+set RunTest=1
+if "%1"=="-notest" set RunTest=0
+
 call :clone_repositories %exitOnError%
 call :download_icu %exitOnError%
 :: TODO: Disabled until we need LLBuild/SwiftPM in this build script.
@@ -83,8 +86,11 @@ path %PATH%;C:\Program Files\Git\usr\bin
 call :build_libdispatch %exitOnError%
 
 path %source_root%\icu-%icu_version%\bin64;%install_directory%\bin;%build_root%\swift\bin;%build_root%\swift\libdispatch-prefix\bin;%PATH%
-call :test_swift %exitOnError%
-call :test_libdispatch %exitOnError%
+
+if %RunTest%==1 (
+  call :test_swift %exitOnError%
+  call :test_libdispatch %exitOnError%
+)
 
 goto :end
 endlocal