Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/IDE/Formatting.cpp

@@ -575,7 +575,7 @@ class FormatWalker : public SourceEntityWalker {
       };
 
       if (auto AE = dyn_cast_or_null<ApplyExpr>(Node.dyn_cast<Expr *>())) {
-        // PrefixUnaryExpr shouldn't be syntacticly considered as a funtion call
+        // PrefixUnaryExpr shouldn't be syntactically considered as a function call
         // for sibling alignment.
         if (!isa<PrefixUnaryExpr>(AE)) {
           collect(AE->getArg());

tools/SourceKit/tools/swift-lang/CMakeLists.txt

@@ -5,6 +5,8 @@ if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB)
   set(DEPENDS_LIST "sourcekitd-test")
 
   # The build type of swiftlang should agree with stdlib
+  # This setting could avoid us adding additional search paths when building
+  # executables using SwiftLang.
   set(SWIFT_LANG_LIBRARY_BUILD_TYPES)
   if(SWIFT_BUILD_DYNAMIC_STDLIB)
     list(APPEND SWIFT_LANG_LIBRARY_BUILD_TYPES SHARED)