Merge pull request #2023 from apple/revert-2007-whitespaces

Revert "Putting white spaces in between if/while clauses and braces."

Author: gottesmm

docs/toc.js

@@ -4,7 +4,7 @@
 
 
 // Listen to the load event for the document.
-if (window.addEventListener) {
+if (window.addEventListener){
   window.addEventListener('load', onload_handler, false);
 } else if (window.attachEvent) {
   window.attachEvent('onload', onload_handler);

include/swift/AST/AvailabilitySpec.h

@@ -92,7 +92,7 @@ class VersionConstraintAvailabilitySpec : public AvailabilitySpec {
 
   void *
   operator new(size_t Bytes, ASTContext &C,
-               unsigned Alignment = alignof(VersionConstraintAvailabilitySpec)) {
+               unsigned Alignment = alignof(VersionConstraintAvailabilitySpec)){
     return AvailabilitySpec::operator new(Bytes, C, Alignment);
   }
 };

lib/SILOptimizer/LoopTransforms/ArrayBoundsCheckOpts.cpp

@@ -1115,7 +1115,7 @@ static bool hoistBoundsChecks(SILLoop *Loop, DominanceInfo *DT, SILLoopInfo *LI,
   // Find canonical induction variables.
   InductionAnalysis IndVars(DT, IVs, Preheader, Header, ExitingBlk, ExitBlk);
   bool IVarsFound = IndVars.analyse();
-  if (!IVarsFound) {
+  if (!IVarsFound){
     DEBUG(llvm::dbgs() << "No induction variables found\n");
   }
 

lib/SILOptimizer/Mandatory/DIMemoryUseCollector.cpp

@@ -311,7 +311,7 @@ bool DIMemoryUse::
 onlyTouchesTrivialElements(const DIMemoryObjectInfo &MI) const {
   auto &Module = Inst->getModule();
 
-  for (unsigned i = FirstElement, e = i+NumElements; i != e; ++i) {
+  for (unsigned i = FirstElement, e = i+NumElements; i != e; ++i){
     // Skip 'super.init' bit
     if (i == MI.getNumMemoryElements())
       return false;

lib/SILOptimizer/Mandatory/DataflowDiagnostics.cpp

@@ -64,7 +64,7 @@ static void diagnoseMissingReturn(const UnreachableInst *UI,
 
 static void diagnoseUnreachable(const SILInstruction *I,
                                 ASTContext &Context) {
-  if (auto *UI = dyn_cast<UnreachableInst>(I)) {
+  if (auto *UI = dyn_cast<UnreachableInst>(I)){
     SILLocation L = UI->getLoc();
 
     // Invalid location means that the instruction has been generated by SIL

lib/SILOptimizer/Mandatory/DiagnoseUnreachable.cpp

@@ -530,7 +530,7 @@ static bool simplifyBlocksWithCallsToNoReturn(SILBasicBlock &BB,
 
   // Record the diagnostic info.
   if (!DiagnosedUnreachableCode &&
-      NoReturnCall->getLoc().is<RegularLocation>() && State) {
+      NoReturnCall->getLoc().is<RegularLocation>() && State){
     for (auto SI = BB.succ_begin(), SE = BB.succ_end(); SI != SE; ++SI) {
       SILBasicBlock *UnreachableBlock = *SI;
       if (!State->PossiblyUnreachableBlocks.count(UnreachableBlock)) {

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -748,7 +748,7 @@ getConformanceAndConcreteType(FullApplySite AI,
     Conformances = IER->getConformances();
     ConcreteType = IER->getFormalConcreteType();
     NewSelf = IER->getOperand();
-  } else if (auto IEM = dyn_cast<InitExistentialMetatypeInst>(InitExistential)) {
+  } else if (auto IEM = dyn_cast<InitExistentialMetatypeInst>(InitExistential)){
     Conformances = IEM->getConformances();
     NewSelf = IEM->getOperand();
     ConcreteType = NewSelf->getType().getSwiftRValueType();

lib/SILOptimizer/Transforms/AllocBoxToStack.cpp

@@ -371,7 +371,7 @@ static SILInstruction* findUnexpectedBoxUse(SILValue Box,
 
 /// canPromoteAllocBox - Can we promote this alloc_box to an alloc_stack?
 static bool canPromoteAllocBox(AllocBoxInst *ABI,
-                             llvm::SmallVectorImpl<Operand *> &PromotedOperands) {
+                             llvm::SmallVectorImpl<Operand *> &PromotedOperands){
   // Scan all of the uses of the address of the box to see if any
   // disqualifies the box from being promoted to the stack.
   if (auto *User = findUnexpectedBoxUse(ABI,

lib/Sema/CSApply.cpp

@@ -2324,7 +2324,7 @@ namespace {
       case OverloadChoiceKind::DeclViaBridge: {
         // Look through an implicitly unwrapped optional.
         auto baseTy = base->getType()->getRValueType();
-        if (auto objTy = cs.lookThroughImplicitlyUnwrappedOptionalType(baseTy)) {
+        if (auto objTy = cs.lookThroughImplicitlyUnwrappedOptionalType(baseTy)){
           base = coerceImplicitlyUnwrappedOptionalToValue(base, objTy,
                                          cs.getConstraintLocator(base));
 
@@ -2370,7 +2370,7 @@ namespace {
 
       case OverloadChoiceKind::TupleIndex: {
         auto baseTy = base->getType()->getRValueType();
-        if (auto objTy = cs.lookThroughImplicitlyUnwrappedOptionalType(baseTy)) {
+        if (auto objTy = cs.lookThroughImplicitlyUnwrappedOptionalType(baseTy)){
           base = coerceImplicitlyUnwrappedOptionalToValue(base, objTy,
                                          cs.getConstraintLocator(base));
         }
@@ -4658,7 +4658,7 @@ maybeDiagnoseUnsupportedFunctionConversion(TypeChecker &tc, Expr *expr,
     // capture context. Look through ignored bases too.
     // TODO: Look through static method applications to the type.
     auto semanticExpr = expr->getSemanticsProvidingExpr();
-    while (auto ignoredBase = dyn_cast<DotSyntaxBaseIgnoredExpr>(semanticExpr)) {
+    while (auto ignoredBase = dyn_cast<DotSyntaxBaseIgnoredExpr>(semanticExpr)){
       semanticExpr = ignoredBase->getRHS()->getSemanticsProvidingExpr();
     }
 

lib/Sema/CSGen.cpp

@@ -1614,7 +1614,7 @@ namespace {
     Type visitUnresolvedDotExpr(UnresolvedDotExpr *expr) {
       // Open a member constraint for constructor delegations on the
       // subexpr type.
-      if (CS.TC.getSelfForInitDelegationInConstructor(CS.DC, expr)) {
+      if (CS.TC.getSelfForInitDelegationInConstructor(CS.DC, expr)){
         auto baseTy = expr->getBase()->getType()
                         ->getLValueOrInOutObjectType();
 

lib/Sema/MiscDiagnostics.cpp

@@ -507,7 +507,7 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,
         return;
 
       if (auto *parentExpr = Parent.getAsExpr()) {
-        if (auto *ignoredBase = dyn_cast<DotSyntaxBaseIgnoredExpr>(parentExpr)) {
+        if (auto *ignoredBase = dyn_cast<DotSyntaxBaseIgnoredExpr>(parentExpr)){
           if (!ignoredBase->isImplicit())
             return;
         }
@@ -2091,7 +2091,7 @@ class ObjCSelectorWalker : public ASTWalker {
       if (auto ctorRefCall =
             dyn_cast<ConstructorRefCallExpr>(argCall->getFn())) {
         if (auto argCtor =
-              dyn_cast_or_null<ConstructorDecl>(ctorRefCall->getCalledValue())) {
+              dyn_cast_or_null<ConstructorDecl>(ctorRefCall->getCalledValue())){
           auto argArgumentNames = argCtor->getFullName().getArgumentNames();
           if (argArgumentNames.size() == 3 &&
               argArgumentNames[0] == TC.Context.Id_builtinStringLiteral)

lib/Sema/PlaygroundTransform.cpp

@@ -762,7 +762,7 @@ class Instrumenter {
     if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(*RE)) {
       VarDecl *VD = cast<VarDecl>(DRE->getDecl());
 
-      if (isa<ConstructorDecl>(TypeCheckDC) && VD->getNameStr().equals("self")) {
+      if (isa<ConstructorDecl>(TypeCheckDC) && VD->getNameStr().equals("self")){
         // Don't log "self" in a constructor
         return nullptr;
       }

lib/Sema/TypeCheckConstraints.cpp

@@ -2708,7 +2708,7 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
   }
 
   // If we can bridge through an Objective-C class, do so.
-  if (Type objCClass = getDynamicBridgedThroughObjCClass(dc, fromType, toType)) {
+  if (Type objCClass = getDynamicBridgedThroughObjCClass(dc, fromType, toType)){
     if (isSubtypeOf(objCClass, fromType, dc))
       return CheckedCastKind::BridgeFromObjectiveC;
   }