Merge pull request #5938 from gottesmm/small_nfc_gardening

Author: swift-ci

include/swift/SIL/SILBasicBlock.h

@@ -124,7 +124,7 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   }
 
   const TermInst *getTerminator() const {
-    return const_cast<SILBasicBlock*>(this)->getTerminator();
+    return const_cast<SILBasicBlock *>(this)->getTerminator();
   }
 
   /// \brief Splits a basic block into two at the specified instruction.
@@ -135,7 +135,9 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   SILBasicBlock *split(iterator I);
 
   /// \brief Move the basic block to after the specified basic block in the IR.
-  /// The basic blocks must reside in the same function.
+  ///
+  /// Assumes that the basic blocks must reside in the same function. In asserts
+  /// builds, an assert verifies that this is true.
   void moveAfter(SILBasicBlock *After);
 
   //===--------------------------------------------------------------------===//
@@ -216,9 +218,7 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   }
 
   const SILBasicBlock *getSingleSuccessor() const {
-    if (succ_empty() || std::next(succ_begin()) != succ_end())
-      return nullptr;
-    return *succ_begin();
+    return const_cast<SILBasicBlock *>(this)->getSingleSuccessor();
   }
 
   /// \brief Returns true if \p BB is a successor of this block.
@@ -273,7 +273,7 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   }
 
   const SILBasicBlock *getSinglePredecessor() const {
-    return const_cast<SILBasicBlock*>(this)->getSinglePredecessor();
+    return const_cast<SILBasicBlock *>(this)->getSinglePredecessor();
   }
 
   /// Pretty-print the SILBasicBlock.
@@ -319,8 +319,8 @@ namespace llvm {
 //===----------------------------------------------------------------------===//
 
 template <>
-struct ilist_traits<::swift::SILBasicBlock> :
-public ilist_default_traits<::swift::SILBasicBlock> {
+struct ilist_traits<::swift::SILBasicBlock>
+  : ilist_default_traits<::swift::SILBasicBlock> {
   using SelfTy = ilist_traits<::swift::SILBasicBlock>;
   using SILBasicBlock = ::swift::SILBasicBlock;
   using SILFunction = ::swift::SILFunction;
@@ -333,19 +333,17 @@ public ilist_default_traits<::swift::SILBasicBlock> {
   SILFunction *Parent;
 
 public:
-
   SILBasicBlock *createSentinel() const {
-    return static_cast<SILBasicBlock*>(&Sentinel);
+    return static_cast<SILBasicBlock *>(&Sentinel);
   }
   void destroySentinel(SILBasicBlock *) const {}
 
   SILBasicBlock *provideInitialHead() const { return createSentinel(); }
-  SILBasicBlock *ensureHead(SILBasicBlock*) const { return createSentinel(); }
-  static void noteHead(SILBasicBlock*, SILBasicBlock*) {}
+  SILBasicBlock *ensureHead(SILBasicBlock *) const { return createSentinel(); }
+  static void noteHead(SILBasicBlock *, SILBasicBlock *) {}
   static void deleteNode(SILBasicBlock *BB) { BB->~SILBasicBlock(); }
 
-  void addNodeToList(SILBasicBlock *BB) {
-  }
+  void addNodeToList(SILBasicBlock *BB) {}
 
   void transferNodesFromList(ilist_traits<SILBasicBlock> &SrcTraits,
                              ilist_iterator<SILBasicBlock> First,

include/swift/SIL/SILDebugScope.h

@@ -9,10 +9,12 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//
-// This file defines a container for scope information used to
-// generate debug info.
-//
+///
+/// \file
+///
+/// This file defines a container for scope information used to
+/// generate debug info.
+///
 //===----------------------------------------------------------------------===//
 
 #ifndef SWIFT_SIL_DEBUGSCOPE_H

lib/SILOptimizer/Utils/CheckedCastBrJumpThreading.cpp

@@ -1,3 +1,15 @@
+//===--- CheckedCastBrJumpThreading.cpp -----------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
 #define DEBUG_TYPE "sil-simplify-cfg"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"