From 1d6fcfc9f493135de4e3c8f6722b88b1d482129c Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 18 Dec 2017 19:46:56 +0000 Subject: [PATCH] Fix more inconsistent line endings. NFC. llvm-svn: 321016 --- lib/LTO/LTOCodeGenerator.cpp | 18 ++++++++--------- lib/Target/ARC/ARCInstrFormats.td | 2 +- lib/Target/ARC/ARCInstrInfo.td | 14 ++++++------- lib/Transforms/Utils/SplitModule.cpp | 18 ++++++++--------- test/CodeGen/X86/evex-to-vex-compress.mir | 4 ++-- test/Other/lit-globbing.ll | 24 +++++++++++------------ tools/llvm-cxxdump/llvm-cxxdump.cpp | 14 ++++++------- tools/llvm-mcmarkup/llvm-mcmarkup.cpp | 12 ++++++------ tools/llvm-objdump/llvm-objdump.cpp | 14 ++++++------- tools/llvm-size/llvm-size.cpp | 14 ++++++------- 10 files changed, 67 insertions(+), 67 deletions(-) diff --git a/lib/LTO/LTOCodeGenerator.cpp b/lib/LTO/LTOCodeGenerator.cpp index ebc41295152..c7306df95d3 100644 --- a/lib/LTO/LTOCodeGenerator.cpp +++ b/lib/LTO/LTOCodeGenerator.cpp @@ -466,15 +466,15 @@ void LTOCodeGenerator::restoreLinkageForExternals() { if (I == ExternalSymbols.end()) return; - GV.setLinkage(I->second); - }; - - llvm::for_each(MergedModule->functions(), externalize); - llvm::for_each(MergedModule->globals(), externalize); - llvm::for_each(MergedModule->aliases(), externalize); -} - -void LTOCodeGenerator::verifyMergedModuleOnce() { + GV.setLinkage(I->second); + }; + + llvm::for_each(MergedModule->functions(), externalize); + llvm::for_each(MergedModule->globals(), externalize); + llvm::for_each(MergedModule->aliases(), externalize); +} + +void LTOCodeGenerator::verifyMergedModuleOnce() { // Only run on the first call. if (HasVerifiedInput) return; diff --git a/lib/Target/ARC/ARCInstrFormats.td b/lib/Target/ARC/ARCInstrFormats.td index bddef6b9500..50edddd4ea9 100644 --- a/lib/Target/ARC/ARCInstrFormats.td +++ b/lib/Target/ARC/ARCInstrFormats.td @@ -29,7 +29,7 @@ class immS : Operand, PatLeaf<(imm), let DecoderMethod = "DecodeSignedOperand<"#BSz#">"; } -// e.g. s3 field may encode the signed integers values -1 .. 6 +// e.g. s3 field may encode the signed integers values -1 .. 6 // using binary codes 111, 000, 001, 010, 011, 100, 101, and 110, respectively class immC : Operand, PatLeaf<(imm), "\n return isInt<"#BSz#">(N->getSExtValue());"> { diff --git a/lib/Target/ARC/ARCInstrInfo.td b/lib/Target/ARC/ARCInstrInfo.td index e4ad162edee..edd853fe150 100644 --- a/lib/Target/ARC/ARCInstrInfo.td +++ b/lib/Target/ARC/ARCInstrInfo.td @@ -534,13 +534,13 @@ let isBranch = 1 in { def BEQ_S : F16_BCC_s10<0b01, "beq_s">; def BNE_S : F16_BCC_s10<0b10, "bne_s">; - def BGT_S : F16_BCC_s7<0b000, "bgt_s">; - def BGE_S : F16_BCC_s7<0b001, "bge_s">; - def BLT_S : F16_BCC_s7<0b010, "blt_s">; - def BLE_S : F16_BCC_s7<0b011, "ble_s">; - def BHI_S : F16_BCC_s7<0b100, "bhi_s">; - def BHS_S : F16_BCC_s7<0b101, "bhs_s">; - def BLO_S : F16_BCC_s7<0b110, "blo_s">; + def BGT_S : F16_BCC_s7<0b000, "bgt_s">; + def BGE_S : F16_BCC_s7<0b001, "bge_s">; + def BLT_S : F16_BCC_s7<0b010, "blt_s">; + def BLE_S : F16_BCC_s7<0b011, "ble_s">; + def BHI_S : F16_BCC_s7<0b100, "bhi_s">; + def BHS_S : F16_BCC_s7<0b101, "bhs_s">; + def BLO_S : F16_BCC_s7<0b110, "blo_s">; def BLS_S : F16_BCC_s7<0b111, "bls_s">; } // let isBranch diff --git a/lib/Transforms/Utils/SplitModule.cpp b/lib/Transforms/Utils/SplitModule.cpp index 934a1bd73c2..968eb0208f4 100644 --- a/lib/Transforms/Utils/SplitModule.cpp +++ b/lib/Transforms/Utils/SplitModule.cpp @@ -141,15 +141,15 @@ static void findPartitions(Module *M, ClusterIDMapType &ClusterIDMap, } if (GV.hasLocalLinkage()) - addAllGlobalValueUsers(GVtoClusterMap, &GV, &GV); - }; - - llvm::for_each(M->functions(), recordGVSet); - llvm::for_each(M->globals(), recordGVSet); - llvm::for_each(M->aliases(), recordGVSet); - - // Assigned all GVs to merged clusters while balancing number of objects in - // each. + addAllGlobalValueUsers(GVtoClusterMap, &GV, &GV); + }; + + llvm::for_each(M->functions(), recordGVSet); + llvm::for_each(M->globals(), recordGVSet); + llvm::for_each(M->aliases(), recordGVSet); + + // Assigned all GVs to merged clusters while balancing number of objects in + // each. auto CompareClusters = [](const std::pair &a, const std::pair &b) { if (a.second || b.second) diff --git a/test/CodeGen/X86/evex-to-vex-compress.mir b/test/CodeGen/X86/evex-to-vex-compress.mir index dd7dd274b75..d436547b9d2 100755 --- a/test/CodeGen/X86/evex-to-vex-compress.mir +++ b/test/CodeGen/X86/evex-to-vex-compress.mir @@ -4628,6 +4628,6 @@ body: | VUCOMISSZrm %xmm16, %rdi, %noreg, %noreg, %noreg, %noreg, implicit-def %eflags ; CHECK: VUCOMISSZrr %xmm16, %xmm1, implicit-def %eflags VUCOMISSZrr %xmm16, %xmm1, implicit-def %eflags - - RET 0, %zmm0, %zmm1 + + RET 0, %zmm0, %zmm1 ... diff --git a/test/Other/lit-globbing.ll b/test/Other/lit-globbing.ll index 3b3a647af18..7e634ab5cb0 100644 --- a/test/Other/lit-globbing.ll +++ b/test/Other/lit-globbing.ll @@ -15,15 +15,15 @@ RUN: echo %t/'T'??.txt | FileCheck -check-prefix=QUESTION2 %s RUN: echo 'T*' 'T?.txt' 'T??.txt' | FileCheck -check-prefix=QUOTEDARGS %s -STAR-NOT: TB.txt -STAR: {{(TA.txt.*TAB.txt|TAB.txt.*TA.txt)}} - -QUESTION-NOT: TAB.txt -QUESTION: {{(TA.txt.*TB.txt|TB.txt.*TA.txt)}} - -QUESTION2-NOT: TA.txt -QUESTION2-NOT: TB.txt -QUESTION2: TAB.txt - -QUOTEDARGS-NOT: .txt -QUOTEDARGS: T* T?.txt T??.txt +STAR-NOT: TB.txt +STAR: {{(TA.txt.*TAB.txt|TAB.txt.*TA.txt)}} + +QUESTION-NOT: TAB.txt +QUESTION: {{(TA.txt.*TB.txt|TB.txt.*TA.txt)}} + +QUESTION2-NOT: TA.txt +QUESTION2-NOT: TB.txt +QUESTION2: TAB.txt + +QUOTEDARGS-NOT: .txt +QUOTEDARGS: T* T?.txt T??.txt diff --git a/tools/llvm-cxxdump/llvm-cxxdump.cpp b/tools/llvm-cxxdump/llvm-cxxdump.cpp index 69b1a8ef209..9b687e4fbe2 100644 --- a/tools/llvm-cxxdump/llvm-cxxdump.cpp +++ b/tools/llvm-cxxdump/llvm-cxxdump.cpp @@ -546,10 +546,10 @@ int main(int argc, const char *argv[]) { cl::ParseCommandLineOptions(argc, argv, "LLVM C++ ABI Data Dumper\n"); // Default to stdin if no filename is specified. - if (opts::InputFilenames.size() == 0) - opts::InputFilenames.push_back("-"); - - llvm::for_each(opts::InputFilenames, dumpInput); - - return EXIT_SUCCESS; -} + if (opts::InputFilenames.size() == 0) + opts::InputFilenames.push_back("-"); + + llvm::for_each(opts::InputFilenames, dumpInput); + + return EXIT_SUCCESS; +} diff --git a/tools/llvm-mcmarkup/llvm-mcmarkup.cpp b/tools/llvm-mcmarkup/llvm-mcmarkup.cpp index ad447d226de..711493ad830 100644 --- a/tools/llvm-mcmarkup/llvm-mcmarkup.cpp +++ b/tools/llvm-mcmarkup/llvm-mcmarkup.cpp @@ -215,9 +215,9 @@ int main(int argc, char **argv) { ToolName = argv[0]; // If no input files specified, read from stdin. - if (InputFilenames.size() == 0) - InputFilenames.push_back("-"); - - llvm::for_each(InputFilenames, parseMCMarkup); - return 0; -} + if (InputFilenames.size() == 0) + InputFilenames.push_back("-"); + + llvm::for_each(InputFilenames, parseMCMarkup); + return 0; +} diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index 02eaa89f088..79204c6e953 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -2194,10 +2194,10 @@ int main(int argc, char **argv) { && !PrintFaultMaps && DwarfDumpType == DIDT_Null) { cl::PrintHelpMessage(); - return 2; - } - - llvm::for_each(InputFilenames, DumpInput); - - return EXIT_SUCCESS; -} + return 2; + } + + llvm::for_each(InputFilenames, DumpInput); + + return EXIT_SUCCESS; +} diff --git a/tools/llvm-size/llvm-size.cpp b/tools/llvm-size/llvm-size.cpp index 7a8e744d2e6..cf35a5795e7 100644 --- a/tools/llvm-size/llvm-size.cpp +++ b/tools/llvm-size/llvm-size.cpp @@ -880,13 +880,13 @@ int main(int argc, char **argv) { } if (InputFilenames.size() == 0) - InputFilenames.push_back("a.out"); - - MoreThanOneFile = InputFilenames.size() > 1; - llvm::for_each(InputFilenames, printFileSectionSizes); - if (OutputFormat == berkeley && TotalSizes) - printBerkelyTotals(); - + InputFilenames.push_back("a.out"); + + MoreThanOneFile = InputFilenames.size() > 1; + llvm::for_each(InputFilenames, printFileSectionSizes); + if (OutputFormat == berkeley && TotalSizes) + printBerkelyTotals(); + if (HadError) return 1; }