Merge pull request #39770 from bnbarham/main-to-next-conflicts

[NFC] Formatting cleanup to help with next conflicts

Author: etcwilde

include/swift/AST/Ownership.h

@@ -24,9 +24,9 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
-#include <stdint.h>
 #include <assert.h>
-#include <climits>
+#include <limits.h>
+#include <stdint.h>
 
 namespace swift {
 

include/swift/Basic/Platform.h

@@ -15,8 +15,8 @@
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Config.h"
-#include "llvm/ADT/StringRef.h"
 #include "clang/Basic/DarwinSDKInfo.h"
+#include "llvm/ADT/StringRef.h"
 
 namespace llvm {
   class Triple;

lib/Basic/Platform.cpp

@@ -465,14 +465,12 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
   return None;
 }
 
-
 static const llvm::VersionTuple minimumMacCatalystDeploymentTarget() {
   return llvm::VersionTuple(13, 1);
 }
 
-llvm::VersionTuple
-swift::getTargetSDKVersion(clang::DarwinSDKInfo &SDKInfo,
-                           const llvm::Triple &triple) {
+llvm::VersionTuple swift::getTargetSDKVersion(clang::DarwinSDKInfo &SDKInfo,
+                                              const llvm::Triple &triple) {
   // Retrieve the SDK version.
   auto SDKVersion = SDKInfo.getVersion();
 
@@ -481,9 +479,10 @@ swift::getTargetSDKVersion(clang::DarwinSDKInfo &SDKInfo,
   // down to the linker.
   if (tripleIsMacCatalystEnvironment(triple)) {
     if (const auto *MacOStoMacCatalystMapping = SDKInfo.getVersionMapping(
-                clang::DarwinSDKInfo::OSEnvPair::macOStoMacCatalystPair())) {
-      return MacOStoMacCatalystMapping->map(
-            SDKVersion, minimumMacCatalystDeploymentTarget(), None).getValueOr(llvm::VersionTuple(0, 0, 0));
+            clang::DarwinSDKInfo::OSEnvPair::macOStoMacCatalystPair())) {
+      return MacOStoMacCatalystMapping
+          ->map(SDKVersion, minimumMacCatalystDeploymentTarget(), None)
+          .getValueOr(llvm::VersionTuple(0, 0, 0));
     }
     return llvm::VersionTuple(0, 0, 0);
   }

lib/Driver/DarwinToolChains.cpp

@@ -22,10 +22,10 @@
 #include "swift/Basic/TaskQueue.h"
 #include "swift/Config.h"
 #include "swift/Driver/Compilation.h"
-#include "clang/Basic/DarwinSDKInfo.h"
 #include "swift/Driver/Driver.h"
 #include "swift/Driver/Job.h"
 #include "swift/Option/Options.h"
+#include "clang/Basic/DarwinSDKInfo.h"
 #include "clang/Basic/Version.h"
 #include "clang/Driver/Util.h"
 #include "llvm/ADT/StringSwitch.h"

lib/DriverTool/swift_symbolgraph_extract_main.cpp

@@ -235,7 +235,7 @@ int swift_symbolgraph_extract_main(ArrayRef<const char *> Args,
   // don't need to print these errors.
   CI.removeDiagnosticConsumer(&DiagPrinter);
 
-  SmallVector<ModuleDecl *, 32> Overlays;
+  SmallVector<ModuleDecl *, 8> Overlays;
   M->findDeclaredCrossImportOverlaysTransitive(Overlays);
   for (const auto *OM : Overlays) {
     auto CIM = CI.getASTContext().getModuleByName(OM->getNameStr());

lib/IRGen/GenDecl.cpp

@@ -697,7 +697,7 @@ void IRGenModule::emitRuntimeRegistration() {
       llvm::ConstantInt::get(Int32Ty, 0),
     };
     auto begin = llvm::ConstantExpr::getGetElementPtr(
-      protocols->getType()->getPointerElementType(), protocols, beginIndices);
+        protocols->getType()->getPointerElementType(), protocols, beginIndices);
     llvm::Constant *endIndices[] = {
       llvm::ConstantInt::get(Int32Ty, 0),
       llvm::ConstantInt::get(Int32Ty, SwiftProtocols.size()),
@@ -725,7 +725,7 @@ void IRGenModule::emitRuntimeRegistration() {
     auto end = llvm::ConstantExpr::getGetElementPtr(
         conformances->getType()->getPointerElementType(),
         conformances, endIndices);
-    
+
     RegIGF.Builder.CreateCall(getRegisterProtocolConformancesFn(), {begin, end});
   }
 

lib/SILOptimizer/Transforms/SILMem2Reg.cpp

@@ -927,7 +927,7 @@ void StackAllocationPromoter::propagateLiveness(
   // If liveness has not been propagated, go over the incoming operands and mark
   // any operand values that are proactivePhis as live
   livePhis.insert(proactivePhi);
-  SmallVector<SILValue, 16> incomingPhiVals;
+  SmallVector<SILValue, 4> incomingPhiVals;
   proactivePhi->getIncomingPhiValues(incomingPhiVals);
   for (auto &inVal : incomingPhiVals) {
     auto *inPhi = dyn_cast<SILPhiArgument>(inVal);