diff --git a/bolt/include/bolt/Core/DebugData.h b/bolt/include/bolt/Core/DebugData.h --- a/bolt/include/bolt/Core/DebugData.h +++ b/bolt/include/bolt/Core/DebugData.h @@ -330,8 +330,8 @@ protected: class AddressForDWOCU { public: - AddressToIndexMap::iterator find(uint64_t Adddress) { - return AddressToIndex.find(Adddress); + AddressToIndexMap::iterator find(uint64_t Address) { + return AddressToIndex.find(Address); } AddressToIndexMap::iterator end() { return AddressToIndex.end(); } AddressToIndexMap::iterator begin() { return AddressToIndex.begin(); } diff --git a/bolt/include/bolt/Core/MCPlusBuilder.h b/bolt/include/bolt/Core/MCPlusBuilder.h --- a/bolt/include/bolt/Core/MCPlusBuilder.h +++ b/bolt/include/bolt/Core/MCPlusBuilder.h @@ -1431,7 +1431,7 @@ return false; } - /// Store \p Target absolute adddress to \p RegName + /// Store \p Target absolute address to \p RegName virtual InstructionListType materializeAddress(const MCSymbol *Target, MCContext *Ctx, MCPhysReg RegName, diff --git a/bolt/lib/Passes/BinaryPasses.cpp b/bolt/lib/Passes/BinaryPasses.cpp --- a/bolt/lib/Passes/BinaryPasses.cpp +++ b/bolt/lib/Passes/BinaryPasses.cpp @@ -894,7 +894,7 @@ // Annotate it, so "isCall" returns true for this jcc MIB->setConditionalTailCall(*CondBranch); - // Add info abount the conditional tail call frequency, otherwise this + // Add info about the conditional tail call frequency, otherwise this // info will be lost when we delete the associated BranchInfo entry auto &CTCAnnotation = MIB->getOrCreateAnnotationAs(*CondBranch, "CTCTakenCount"); diff --git a/bolt/lib/Passes/IndirectCallPromotion.cpp b/bolt/lib/Passes/IndirectCallPromotion.cpp --- a/bolt/lib/Passes/IndirectCallPromotion.cpp +++ b/bolt/lib/Passes/IndirectCallPromotion.cpp @@ -416,15 +416,15 @@ ++TotalIndexBasedCandidates; - auto ErrorOrMemAccesssProfile = + auto ErrorOrMemAccessProfile = BC.MIB->tryGetAnnotationAs(*MemLocInstr, "MemoryAccessProfile"); - if (!ErrorOrMemAccesssProfile) { + if (!ErrorOrMemAccessProfile) { DEBUG_VERBOSE(1, dbgs() << "BOLT-INFO: ICP no memory profiling data found\n"); return JumpTableInfoType(); } - MemoryAccessProfile &MemAccessProfile = ErrorOrMemAccesssProfile.get(); + MemoryAccessProfile &MemAccessProfile = ErrorOrMemAccessProfile.get(); uint64_t ArrayStart; if (DispExpr) { @@ -670,15 +670,15 @@ }); // Try to get value profiling data for the method load instruction. - auto ErrorOrMemAccesssProfile = + auto ErrorOrMemAccessProfile = BC.MIB->tryGetAnnotationAs(*MethodFetchInsns.back(), "MemoryAccessProfile"); - if (!ErrorOrMemAccesssProfile) { + if (!ErrorOrMemAccessProfile) { DEBUG_VERBOSE(1, dbgs() << "BOLT-INFO: ICP no memory profiling data found\n"); return MethodInfoType(); } - MemoryAccessProfile &MemAccessProfile = ErrorOrMemAccesssProfile.get(); + MemoryAccessProfile &MemAccessProfile = ErrorOrMemAccessProfile.get(); // Find the vtable that each method belongs to. std::map MethodToVtable; diff --git a/bolt/lib/Passes/ReorderData.cpp b/bolt/lib/Passes/ReorderData.cpp --- a/bolt/lib/Passes/ReorderData.cpp +++ b/bolt/lib/Passes/ReorderData.cpp @@ -182,14 +182,14 @@ for (const BinaryBasicBlock &BB : BF) { for (const MCInst &Inst : BB) { - auto ErrorOrMemAccesssProfile = + auto ErrorOrMemAccessProfile = BC.MIB->tryGetAnnotationAs( Inst, "MemoryAccessProfile"); - if (!ErrorOrMemAccesssProfile) + if (!ErrorOrMemAccessProfile) continue; const MemoryAccessProfile &MemAccessProfile = - ErrorOrMemAccesssProfile.get(); + ErrorOrMemAccessProfile.get(); for (const AddressAccess &AccessInfo : MemAccessProfile.AddressAccessInfo) { if (BinaryData *BD = AccessInfo.MemoryObject) { @@ -238,14 +238,14 @@ continue; for (const MCInst &Inst : BB) { - auto ErrorOrMemAccesssProfile = + auto ErrorOrMemAccessProfile = BC.MIB->tryGetAnnotationAs( Inst, "MemoryAccessProfile"); - if (!ErrorOrMemAccesssProfile) + if (!ErrorOrMemAccessProfile) continue; const MemoryAccessProfile &MemAccessProfile = - ErrorOrMemAccesssProfile.get(); + ErrorOrMemAccessProfile.get(); for (const AddressAccess &AccessInfo : MemAccessProfile.AddressAccessInfo) { if (AccessInfo.MemoryObject) diff --git a/bolt/lib/Passes/RetpolineInsertion.cpp b/bolt/lib/Passes/RetpolineInsertion.cpp --- a/bolt/lib/Passes/RetpolineInsertion.cpp +++ b/bolt/lib/Passes/RetpolineInsertion.cpp @@ -44,19 +44,17 @@ cl::Hidden, cl::cat(BoltCategory)); -cl::opt -R11Availability("r11-availability", - cl::desc("determine the availablity of r11 before indirect branches"), - cl::init(RetpolineInsertion::AvailabilityOptions::NEVER), - cl::values( - clEnumValN(RetpolineInsertion::AvailabilityOptions::NEVER, - "never", "r11 not available"), - clEnumValN(RetpolineInsertion::AvailabilityOptions::ALWAYS, - "always", "r11 avaialable before calls and jumps"), - clEnumValN(RetpolineInsertion::AvailabilityOptions::ABI, - "abi", "r11 avaialable before calls but not before jumps")), - cl::ZeroOrMore, - cl::cat(BoltCategory)); +cl::opt R11Availability( + "r11-availability", + cl::desc("determine the availability of r11 before indirect branches"), + cl::init(RetpolineInsertion::AvailabilityOptions::NEVER), + cl::values(clEnumValN(RetpolineInsertion::AvailabilityOptions::NEVER, + "never", "r11 not available"), + clEnumValN(RetpolineInsertion::AvailabilityOptions::ALWAYS, + "always", "r11 avaialable before calls and jumps"), + clEnumValN(RetpolineInsertion::AvailabilityOptions::ABI, "abi", + "r11 avaialable before calls but not before jumps")), + cl::ZeroOrMore, cl::cat(BoltCategory)); } // namespace opts diff --git a/bolt/lib/RuntimeLibs/HugifyRuntimeLibrary.cpp b/bolt/lib/RuntimeLibs/HugifyRuntimeLibrary.cpp --- a/bolt/lib/RuntimeLibs/HugifyRuntimeLibrary.cpp +++ b/bolt/lib/RuntimeLibs/HugifyRuntimeLibrary.cpp @@ -46,7 +46,7 @@ errs() << "BOLT-ERROR: -hot-text should be applied to binaries with " "pre-compiled manual hugify support, while -hugify will add hugify " - "support automatcally. These two options cannot both be present.\n"; + "support automatically. These two options cannot both be present.\n"; exit(1); } // After the check, we set HotText to be true because automated hugify support