diff options
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 10 | ||||
-rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h | 6 | ||||
-rw-r--r-- | llvm/lib/MC/MCParser/AsmParser.cpp | 8 | ||||
-rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 24 | ||||
-rw-r--r-- | llvm/lib/Support/Unix/Threading.inc | 8 | ||||
-rw-r--r-- | llvm/lib/Support/Windows/Path.inc | 2 | ||||
-rw-r--r-- | llvm/lib/TableGen/Record.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/Target/AArch64/AArch64MacroFusion.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/Target/ARM/ARMTargetMachine.cpp | 8 | ||||
-rw-r--r-- | llvm/lib/Target/PowerPC/PPCCTRLoops.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp | 50 | ||||
-rw-r--r-- | llvm/lib/Transforms/Scalar/SROA.cpp | 2 |
13 files changed, 65 insertions, 65 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index d724c9325e1..8b2b044a397 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -534,11 +534,11 @@ sortGlobalExprs(SmallVectorImpl<DwarfCompileUnit::GlobalExpr> &GVEs) { std::sort(GVEs.begin(), GVEs.end(), [](DwarfCompileUnit::GlobalExpr A, DwarfCompileUnit::GlobalExpr B) { if (A.Expr != B.Expr && A.Expr && B.Expr) { - auto FragmentA = A.Expr->getFragmentInfo(); - auto FragmentB = B.Expr->getFragmentInfo(); - if (FragmentA && FragmentB) - return FragmentA->OffsetInBits < FragmentB->OffsetInBits; - } + auto FragmentA = A.Expr->getFragmentInfo(); + auto FragmentB = B.Expr->getFragmentInfo(); + if (FragmentA && FragmentB) + return FragmentA->OffsetInBits < FragmentB->OffsetInBits; + } return false; }); GVEs.erase(std::unique(GVEs.begin(), GVEs.end(), diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp index e1ea40d137c..f8ffc438f73 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp @@ -146,7 +146,7 @@ bool DwarfExpression::addMachineReg(const TargetRegisterInfo &TRI, DwarfRegs.push_back( {Reg, std::min<unsigned>(Size, MaxSize - Offset), "sub-register"}); if (Offset >= MaxSize) - break; + break; // Mark it as emitted. Coverage.set(Offset, Offset + Size); diff --git a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h index 346a40405ff..a24f92b82fb 100644 --- a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h +++ b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h @@ -225,9 +225,9 @@ public: bool removeModule(Module *M) override { for (auto I = LocalModules.begin(), E = LocalModules.end(); I != E; ++I) { if (I->get() == M) { - ShouldDelete[M] = false; - LocalModules.erase(I); - return true; + ShouldDelete[M] = false; + LocalModules.erase(I); + return true; } } return false; diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 1df525d0650..03858d34376 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -1327,10 +1327,10 @@ bool AsmParser::isAltmacroString(SMLoc &StrLoc, SMLoc &EndLoc) { assert((StrLoc.getPointer() != NULL) && "Argument to the function cannot be a NULL value"); const char *CharPtr = StrLoc.getPointer(); - while ((*CharPtr != '>') && (*CharPtr != '\n') && - (*CharPtr != '\r') && (*CharPtr != '\0')){ - if(*CharPtr == '!') - CharPtr++; + while ((*CharPtr != '>') && (*CharPtr != '\n') && (*CharPtr != '\r') && + (*CharPtr != '\0')) { + if (*CharPtr == '!') + CharPtr++; CharPtr++; } if (*CharPtr == '>') { diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 902b5ca316f..a32533b003b 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -500,7 +500,7 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj, "past the end of the file"); if (Error Err = checkOverlappingElement(Elements, Dysymtab.modtaboff, Dysymtab.nmodtab * sizeof_modtab, - "module table")) + "module table")) return Err; if (Dysymtab.extrefsymoff > FileSize) return malformedError("extrefsymoff field of LC_DYSYMTAB command " + @@ -516,8 +516,8 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj, "past the end of the file"); if (Error Err = checkOverlappingElement(Elements, Dysymtab.extrefsymoff, Dysymtab.nextrefsyms * - sizeof(MachO::dylib_reference), - "reference table")) + sizeof(MachO::dylib_reference), + "reference table")) return Err; if (Dysymtab.indirectsymoff > FileSize) return malformedError("indirectsymoff field of LC_DYSYMTAB command " + @@ -550,8 +550,8 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj, "the file"); if (Error Err = checkOverlappingElement(Elements, Dysymtab.extreloff, Dysymtab.nextrel * - sizeof(MachO::relocation_info), - "external relocation table")) + sizeof(MachO::relocation_info), + "external relocation table")) return Err; if (Dysymtab.locreloff > FileSize) return malformedError("locreloff field of LC_DYSYMTAB command " + @@ -567,8 +567,8 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj, "the file"); if (Error Err = checkOverlappingElement(Elements, Dysymtab.locreloff, Dysymtab.nlocrel * - sizeof(MachO::relocation_info), - "local relocation table")) + sizeof(MachO::relocation_info), + "local relocation table")) return Err; *DysymtabLoadCmd = Load.Ptr; return Error::success(); @@ -3088,7 +3088,7 @@ void MachORebaseEntry::moveNext() { Twine(error) + " for opcode at: 0x" + Twine::utohexstr(OpcodeStart - Opcodes.begin())); moveToEnd(); - return; + return; } DEBUG_WITH_TYPE( "mach-o-rebase", @@ -3129,7 +3129,7 @@ void MachORebaseEntry::moveNext() { Twine(error) + " for opcode at: 0x" + Twine::utohexstr(OpcodeStart - Opcodes.begin())); moveToEnd(); - return; + return; } DEBUG_WITH_TYPE( "mach-o-rebase", @@ -3167,7 +3167,7 @@ void MachORebaseEntry::moveNext() { Twine(error) + " for opcode at: 0x" + Twine::utohexstr(OpcodeStart - Opcodes.begin())); moveToEnd(); - return; + return; } DEBUG_WITH_TYPE( "mach-o-rebase", @@ -3220,7 +3220,7 @@ void MachORebaseEntry::moveNext() { Twine(error) + " for opcode at: 0x" + Twine::utohexstr(OpcodeStart - Opcodes.begin())); moveToEnd(); - return; + return; } DEBUG_WITH_TYPE( "mach-o-rebase", @@ -3770,7 +3770,7 @@ void MachOBindEntry::moveNext() { Twine(error) + " for opcode at: 0x" + Twine::utohexstr(OpcodeStart - Opcodes.begin())); moveToEnd(); - return; + return; } DEBUG_WITH_TYPE( "mach-o-bind", diff --git a/llvm/lib/Support/Unix/Threading.inc b/llvm/lib/Support/Unix/Threading.inc index 267af388ecd..34bc906b058 100644 --- a/llvm/lib/Support/Unix/Threading.inc +++ b/llvm/lib/Support/Unix/Threading.inc @@ -108,14 +108,14 @@ uint64_t llvm::get_threadid() { static constexpr uint32_t get_max_thread_name_length_impl() { #if defined(__NetBSD__) - return PTHREAD_MAX_NAMELEN_NP; + return PTHREAD_MAX_NAMELEN_NP; #elif defined(__APPLE__) - return 64; + return 64; #elif defined(__linux__) #if HAVE_PTHREAD_SETNAME_NP - return 16; + return 16; #else - return 0; + return 0; #endif #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) return 16; diff --git a/llvm/lib/Support/Windows/Path.inc b/llvm/lib/Support/Windows/Path.inc index f82a6bc07bd..daa5e9bf13c 100644 --- a/llvm/lib/Support/Windows/Path.inc +++ b/llvm/lib/Support/Windows/Path.inc @@ -253,7 +253,7 @@ std::error_code create_link(const Twine &to, const Twine &from) { } std::error_code create_hard_link(const Twine &to, const Twine &from) { - return create_link(to, from); + return create_link(to, from); } std::error_code remove(const Twine &path, bool IgnoreNonExisting) { diff --git a/llvm/lib/TableGen/Record.cpp b/llvm/lib/TableGen/Record.cpp index b2636e1e6cb..2c5b745433b 100644 --- a/llvm/lib/TableGen/Record.cpp +++ b/llvm/lib/TableGen/Record.cpp @@ -496,7 +496,7 @@ Init *ListInit::convertInitializerTo(RecTy *Ty) const { Elements.push_back(CI); if (CI != I) Changed = true; - } else + } else return nullptr; if (!Changed) diff --git a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp b/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp index 963cfadc54f..bd5211d4ff5 100644 --- a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp +++ b/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp @@ -33,8 +33,8 @@ static bool shouldScheduleAdjacent(const TargetInstrInfo &TII, // Assume wildcards for unspecified instrs. unsigned FirstOpcode = - FirstMI ? FirstMI->getOpcode() - : static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END); + FirstMI ? FirstMI->getOpcode() + : static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END); unsigned SecondOpcode = SecondMI.getOpcode(); if (ST.hasArithmeticBccFusion()) diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index 3d7bcf9f013..71dc5601faf 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -227,10 +227,10 @@ ARMBaseTargetMachine::ARMBaseTargetMachine(const Target &T, const Triple &TT, Options.EABIVersion == EABI::Unknown) { // musl is compatible with glibc with regard to EABI version if ((TargetTriple.getEnvironment() == Triple::GNUEABI || - TargetTriple.getEnvironment() == Triple::GNUEABIHF || - TargetTriple.getEnvironment() == Triple::MuslEABI || - TargetTriple.getEnvironment() == Triple::MuslEABIHF) && - !(TargetTriple.isOSWindows() || TargetTriple.isOSDarwin())) + TargetTriple.getEnvironment() == Triple::GNUEABIHF || + TargetTriple.getEnvironment() == Triple::MuslEABI || + TargetTriple.getEnvironment() == Triple::MuslEABIHF) && + !(TargetTriple.isOSWindows() || TargetTriple.isOSDarwin())) this->Options.EABIVersion = EABI::GNU; else this->Options.EABIVersion = EABI::EABI5; diff --git a/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp b/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp index 53f33ac1fc0..8d61e81b1fc 100644 --- a/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp +++ b/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp @@ -243,8 +243,8 @@ bool PPCCTRLoops::mightUseCTR(BasicBlock *BB) { if (CallInst *CI = dyn_cast<CallInst>(J)) { // Inline ASM is okay, unless it clobbers the ctr register. if (InlineAsm *IA = dyn_cast<InlineAsm>(CI->getCalledValue())) { - if (asmClobbersCTR(IA)) - return true; + if (asmClobbersCTR(IA)) + return true; continue; } diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 058b8fa33df..e333ea68997 100644 --- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -2134,31 +2134,31 @@ void AddressSanitizer::initializeCallbacks(Module &M) { Args2.push_back(ExpType); Args1.push_back(ExpType); } - AsanErrorCallbackSized[AccessIsWrite][Exp] = - checkSanitizerInterfaceFunction(M.getOrInsertFunction( - kAsanReportErrorTemplate + ExpStr + TypeStr + SuffixStr + - EndingStr, - FunctionType::get(IRB.getVoidTy(), Args2, false))); - - AsanMemoryAccessCallbackSized[AccessIsWrite][Exp] = - checkSanitizerInterfaceFunction(M.getOrInsertFunction( - ClMemoryAccessCallbackPrefix + ExpStr + TypeStr + "N" + EndingStr, - FunctionType::get(IRB.getVoidTy(), Args2, false))); - - for (size_t AccessSizeIndex = 0; AccessSizeIndex < kNumberOfAccessSizes; - AccessSizeIndex++) { - const std::string Suffix = TypeStr + itostr(1ULL << AccessSizeIndex); - AsanErrorCallback[AccessIsWrite][Exp][AccessSizeIndex] = - checkSanitizerInterfaceFunction(M.getOrInsertFunction( - kAsanReportErrorTemplate + ExpStr + Suffix + EndingStr, - FunctionType::get(IRB.getVoidTy(), Args1, false))); - - AsanMemoryAccessCallback[AccessIsWrite][Exp][AccessSizeIndex] = - checkSanitizerInterfaceFunction(M.getOrInsertFunction( - ClMemoryAccessCallbackPrefix + ExpStr + Suffix + EndingStr, - FunctionType::get(IRB.getVoidTy(), Args1, false))); - } - } + AsanErrorCallbackSized[AccessIsWrite][Exp] = + checkSanitizerInterfaceFunction(M.getOrInsertFunction( + kAsanReportErrorTemplate + ExpStr + TypeStr + SuffixStr + + EndingStr, + FunctionType::get(IRB.getVoidTy(), Args2, false))); + + AsanMemoryAccessCallbackSized[AccessIsWrite][Exp] = + checkSanitizerInterfaceFunction(M.getOrInsertFunction( + ClMemoryAccessCallbackPrefix + ExpStr + TypeStr + "N" + EndingStr, + FunctionType::get(IRB.getVoidTy(), Args2, false))); + + for (size_t AccessSizeIndex = 0; AccessSizeIndex < kNumberOfAccessSizes; + AccessSizeIndex++) { + const std::string Suffix = TypeStr + itostr(1ULL << AccessSizeIndex); + AsanErrorCallback[AccessIsWrite][Exp][AccessSizeIndex] = + checkSanitizerInterfaceFunction(M.getOrInsertFunction( + kAsanReportErrorTemplate + ExpStr + Suffix + EndingStr, + FunctionType::get(IRB.getVoidTy(), Args1, false))); + + AsanMemoryAccessCallback[AccessIsWrite][Exp][AccessSizeIndex] = + checkSanitizerInterfaceFunction(M.getOrInsertFunction( + ClMemoryAccessCallbackPrefix + ExpStr + Suffix + EndingStr, + FunctionType::get(IRB.getVoidTy(), Args1, false))); + } + } } const std::string MemIntrinCallbackPrefix = diff --git a/llvm/lib/Transforms/Scalar/SROA.cpp b/llvm/lib/Transforms/Scalar/SROA.cpp index b9cee5b2ba9..83e5d38a0ad 100644 --- a/llvm/lib/Transforms/Scalar/SROA.cpp +++ b/llvm/lib/Transforms/Scalar/SROA.cpp @@ -4062,7 +4062,7 @@ bool SROA::splitAlloca(AllocaInst &AI, AllocaSlices &AS) { uint64_t Size = Fragment.Size; if (ExprFragment) { uint64_t AbsEnd = - ExprFragment->OffsetInBits + ExprFragment->SizeInBits; + ExprFragment->OffsetInBits + ExprFragment->SizeInBits; if (Start >= AbsEnd) // No need to describe a SROAed padding. continue; |