Consistent (non) use of empty lines in include blocks

The profailing style in lld seem to be to not include such empty lines.
Clang-tidy/clang-format seem to handle this just fine.

Differential Revision: https://reviews.llvm.org/D43528

llvm-svn: 325629

diff --git a/lld/COFF/DLL.cpp b/lld/COFF/DLL.cpp
index 1958391..464abe8 100644 (file)
--- a/lld/COFF/DLL.cpp
+++ b/lld/COFF/DLL.cpp
@@ -18,8 +18,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Chunks.h"
 #include "DLL.h"
+#include "Chunks.h"
 #include "llvm/Object/COFF.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/Path.h"

diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
index 3a26e61..9a78987 100644 (file)
--- a/lld/COFF/Driver.cpp
+++ b/lld/COFF/Driver.cpp
@@ -38,7 +38,6 @@
 #include "llvm/ToolDrivers/llvm-lib/LibDriver.h"
 #include <algorithm>
 #include <memory>
-
 #include <future>
 
 using namespace llvm;

diff --git a/lld/COFF/MapFile.cpp b/lld/COFF/MapFile.cpp
index 717ed34..d475641 100644 (file)
--- a/lld/COFF/MapFile.cpp
+++ b/lld/COFF/MapFile.cpp
@@ -23,7 +23,6 @@
 #include "SymbolTable.h"
 #include "Symbols.h"
 #include "Writer.h"
-
 #include "lld/Common/ErrorHandler.h"
 #include "llvm/Support/Parallel.h"
 #include "llvm/Support/raw_ostream.h"

diff --git a/lld/ELF/AArch64ErrataFix.cpp b/lld/ELF/AArch64ErrataFix.cpp
index d16873e..50685c1 100644 (file)
--- a/lld/ELF/AArch64ErrataFix.cpp
+++ b/lld/ELF/AArch64ErrataFix.cpp
@@ -39,7 +39,6 @@
 #include "SyntheticSections.h"
 #include "Target.h"
 #include "lld/Common/Memory.h"
-
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>

diff --git a/lld/ELF/AArch64ErrataFix.h b/lld/ELF/AArch64ErrataFix.h
index 6c100f2..edd154d 100644 (file)
--- a/lld/ELF/AArch64ErrataFix.h
+++ b/lld/ELF/AArch64ErrataFix.h
@@ -11,7 +11,6 @@
 #define LLD_ELF_AARCH64ERRATAFIX_H
 
 #include "lld/Common/LLVM.h"
-
 #include <map>
 #include <vector>
 

diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index 9e32240..77d10de 100644 (file)
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -18,7 +18,6 @@
 #include "llvm/Support/CachePruning.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Endian.h"
-
 #include <vector>
 
 namespace lld {

diff --git a/lld/ELF/EhFrame.cpp b/lld/ELF/EhFrame.cpp
index 62abc39..7a9adc9 100644 (file)
--- a/lld/ELF/EhFrame.cpp
+++ b/lld/ELF/EhFrame.cpp
@@ -21,7 +21,6 @@
 #include "InputSection.h"
 #include "Relocations.h"
 #include "Strings.h"
-
 #include "lld/Common/ErrorHandler.h"
 #include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/Object/ELF.h"

diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index 5a1aeab..e218623 100644 (file)
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -12,7 +12,6 @@
 
 #include "Config.h"
 #include "lld/Common/ErrorHandler.h"
-
 #include "lld/Common/LLVM.h"
 #include "lld/Common/Reproduce.h"
 #include "llvm/ADT/CachedHashString.h"
@@ -23,7 +22,6 @@
 #include "llvm/Object/ELF.h"
 #include "llvm/Object/IRObjectFile.h"
 #include "llvm/Support/Threading.h"
-
 #include <map>
 
 namespace llvm {

diff --git a/lld/ELF/OutputSections.h b/lld/ELF/OutputSections.h
index 4d7c4a3..2e2f7d3 100644 (file)
--- a/lld/ELF/OutputSections.h
+++ b/lld/ELF/OutputSections.h
@@ -14,7 +14,6 @@
 #include "InputSection.h"
 #include "LinkerScript.h"
 #include "Relocations.h"
-
 #include "lld/Common/LLVM.h"
 #include "llvm/MC/StringTableBuilder.h"
 #include "llvm/Object/ELF.h"

diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index 882c172..66b9c88 100644 (file)
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -52,7 +52,6 @@
 #include "Target.h"
 #include "Thunks.h"
 #include "lld/Common/Memory.h"
-
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>

diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp
index 373d040..58ed899 100644 (file)
--- a/lld/ELF/Symbols.cpp
+++ b/lld/ELF/Symbols.cpp
@@ -14,7 +14,6 @@
 #include "SyntheticSections.h"
 #include "Target.h"
 #include "Writer.h"
-
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Strings.h"
 #include "llvm/ADT/STLExtras.h"

diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h
index ea28477..437d91d 100644 (file)
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -17,7 +17,6 @@
 
 #include "InputSection.h"
 #include "Strings.h"
-
 #include "lld/Common/LLVM.h"
 #include "llvm/Object/Archive.h"
 #include "llvm/Object/ELF.h"

diff --git a/lld/wasm/InputFiles.cpp b/lld/wasm/InputFiles.cpp
index 0624634..be806c5 100644 (file)
--- a/lld/wasm/InputFiles.cpp
+++ b/lld/wasm/InputFiles.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "InputFiles.h"
-
 #include "Config.h"
 #include "InputChunks.h"
 #include "SymbolTable.h"

diff --git a/lld/wasm/InputFiles.h b/lld/wasm/InputFiles.h
index b31b356..8d49d20 100644 (file)
--- a/lld/wasm/InputFiles.h
+++ b/lld/wasm/InputFiles.h
@@ -10,15 +10,13 @@
 #ifndef LLD_WASM_INPUT_FILES_H
 #define LLD_WASM_INPUT_FILES_H
 
+#include "Symbols.h"
 #include "lld/Common/LLVM.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/Object/Archive.h"
 #include "llvm/Object/Wasm.h"
 #include "llvm/Support/MemoryBuffer.h"
-
-#include "Symbols.h"
-
 #include <vector>
 
 using llvm::object::Archive;

diff --git a/lld/wasm/MarkLive.h b/lld/wasm/MarkLive.h
index 6fc0563..0b58f15 100644 (file)
--- a/lld/wasm/MarkLive.h
+++ b/lld/wasm/MarkLive.h
@@ -14,7 +14,8 @@ namespace lld {
 namespace wasm {
 
 void markLive();
-}
+
+} // namespace wasm
 } // namespace lld
 
 #endif // LLD_WASM_MARKLIVE_H

diff --git a/lld/wasm/OutputSections.cpp b/lld/wasm/OutputSections.cpp
index ed50a3c..35adc80 100644 (file)
--- a/lld/wasm/OutputSections.cpp
+++ b/lld/wasm/OutputSections.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "OutputSections.h"
-
 #include "InputChunks.h"
 #include "InputFiles.h"
 #include "OutputSegment.h"

diff --git a/lld/wasm/SymbolTable.cpp b/lld/wasm/SymbolTable.cpp
index c83e919..408b5ad 100644 (file)
--- a/lld/wasm/SymbolTable.cpp
+++ b/lld/wasm/SymbolTable.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "SymbolTable.h"
-
 #include "Config.h"
 #include "InputChunks.h"
 #include "WriterUtils.h"

diff --git a/lld/wasm/SymbolTable.h b/lld/wasm/SymbolTable.h
index cc0c776..523da4d 100644 (file)
--- a/lld/wasm/SymbolTable.h
+++ b/lld/wasm/SymbolTable.h
@@ -12,7 +12,6 @@
 
 #include "InputFiles.h"
 #include "Symbols.h"
-
 #include "llvm/ADT/CachedHashString.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/raw_ostream.h"

diff --git a/lld/wasm/Symbols.cpp b/lld/wasm/Symbols.cpp
index b0c9d18..237534e 100644 (file)
--- a/lld/wasm/Symbols.cpp
+++ b/lld/wasm/Symbols.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Symbols.h"
-
 #include "Config.h"
 #include "InputChunks.h"
 #include "InputFiles.h"

diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp
index b4e034a..a03fc12 100644 (file)
--- a/lld/wasm/Writer.cpp
+++ b/lld/wasm/Writer.cpp
@@ -8,8 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Writer.h"
-
-#include "llvm/ADT/DenseSet.h"
 #include "Config.h"
 #include "InputChunks.h"
 #include "OutputSections.h"
@@ -19,6 +17,7 @@
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Memory.h"
 #include "lld/Common/Threads.h"
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/Support/FileOutputBuffer.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/FormatVariadic.h"

diff --git a/lld/wasm/WriterUtils.cpp b/lld/wasm/WriterUtils.cpp
index a4537e4..c82a36a 100644 (file)
--- a/lld/wasm/WriterUtils.cpp
+++ b/lld/wasm/WriterUtils.cpp
@@ -8,9 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "WriterUtils.h"
-
 #include "lld/Common/ErrorHandler.h"
-
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/EndianStream.h"
 #include "llvm/Support/LEB128.h"