Merge pull request #9472 from practicalswift/gardening-20170510

Author: swift-ci

include/swift/ABI/HeapObject.h

@@ -1,4 +1,4 @@
-//===--- HeapObject.h - ABI constants for heap objects -----------*- C++ *-===//
+//===--- HeapObject.h - ABI constants for heap objects ----------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/ABI/KeyPath.h

@@ -1,4 +1,4 @@
-//===--- KeyPath.h - ABI constants for key path objects ----------*- C++ *-===//
+//===--- KeyPath.h - ABI constants for key path objects ---------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/IRGen/IRGenDebugInfo.cpp

@@ -329,19 +329,6 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     }
     return true;
   }
-
-  bool lineNumberIsSane(IRBuilder &Builder, unsigned Line) {
-    if (IGM.IRGen.Opts.Optimize)
-      return true;
-
-    // Assert monotonically increasing line numbers within the same basic block;
-    llvm::BasicBlock *CurBasicBlock = Builder.GetInsertBlock();
-    if (CurBasicBlock == LastBasicBlock) {
-      return Line >= LastDebugLoc.Line;
-    }
-    LastBasicBlock = CurBasicBlock;
-    return true;
-  }
 #endif
 
   llvm::DIFile *getOrCreateFile(StringRef Filename) {

lib/Migrator/TypeOfMigratorPass.cpp

@@ -1,4 +1,4 @@
-//===--- TypeOfMigratorPass.cpp ------------------------------------------===//
+//===--- TypeOfMigratorPass.cpp -------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/KeyPath.h

@@ -1,4 +1,4 @@
-//===--- KeyPath.h - ABI constants for key path objects ----------*- C++ *-===//
+//===--- KeyPath.h - ABI constants for key path objects ---------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSIndexPathShims.h

@@ -1,4 +1,4 @@
-//===--- NSIndexPathShims.h - Foundation declarations for IndexPath overlay -===//
+//===--- NSIndexPathShims.h - Found. decl. for IndexPath overl. -*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //