summaryrefslogtreecommitdiffstats
path: root/lldb/source
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source')
-rw-r--r--lldb/source/Core/FastDemangle.cpp2
-rw-r--r--lldb/source/Core/ModuleList.cpp4
-rw-r--r--lldb/source/Core/RegisterValue.cpp4
-rw-r--r--lldb/source/Host/common/XML.cpp2
-rw-r--r--lldb/source/Host/windows/ConnectionGenericFileWindows.cpp4
-rw-r--r--lldb/source/Host/windows/EditLineWin.cpp16
-rw-r--r--lldb/source/Interpreter/Args.cpp2
-rw-r--r--lldb/source/Interpreter/CommandObject.cpp2
-rw-r--r--lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp10
-rw-r--r--lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp8
-rw-r--r--lldb/source/Plugins/Process/elf-core/ProcessElfCore.h2
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp6
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h2
-rw-r--r--lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp4
-rw-r--r--lldb/source/Symbol/ClangASTContext.cpp2
-rw-r--r--lldb/source/Symbol/CompactUnwindInfo.cpp2
-rw-r--r--lldb/source/Symbol/DWARFCallFrameInfo.cpp4
-rw-r--r--lldb/source/Symbol/LineTable.cpp4
-rw-r--r--lldb/source/Symbol/SymbolVendor.cpp2
-rw-r--r--lldb/source/Symbol/TypeList.cpp4
-rw-r--r--lldb/source/Target/ThreadList.cpp4
-rw-r--r--lldb/source/Utility/JSON.cpp2
-rw-r--r--lldb/source/Utility/SharingPtr.cpp2
23 files changed, 47 insertions, 47 deletions
diff --git a/lldb/source/Core/FastDemangle.cpp b/lldb/source/Core/FastDemangle.cpp
index 0f12af2783d..a27a2f1dbff 100644
--- a/lldb/source/Core/FastDemangle.cpp
+++ b/lldb/source/Core/FastDemangle.cpp
@@ -161,7 +161,7 @@ public:
/// the Itanium C++ ABI mangling specification as implemented by Clang
///
/// @result Newly allocated null-terminated demangled name when demangling
- /// is succesful, and nullptr when demangling fails. The caller is
+ /// is successful, and nullptr when demangling fails. The caller is
/// responsible for freeing the allocated memory.
char *
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index 6b4aa047e12..d89831e6a25 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -70,7 +70,7 @@ ModuleList::operator= (const ModuleList& rhs)
// That's probably me nit-picking, but in theoretical situation:
//
// * that two threads A B and
- // * two ModuleList's x y do opposite assignemnts ie.:
+ // * two ModuleList's x y do opposite assignments ie.:
//
// in thread A: | in thread B:
// x = y; | y = x;
@@ -684,7 +684,7 @@ ModuleList::FindTypes (const SymbolContext& sc, const ConstString &name, bool na
{
// Search the module if the module is not equal to the one in the symbol
// context "sc". If "sc" contains a empty module shared pointer, then
- // the comparisong will always be true (valid_module_ptr != NULL).
+ // the comparison will always be true (valid_module_ptr != NULL).
if (sc.module_sp.get() != (*pos).get())
total_matches += (*pos)->FindTypes (world_sc, name, name_is_fully_qualified, max_matches, types);
diff --git a/lldb/source/Core/RegisterValue.cpp b/lldb/source/Core/RegisterValue.cpp
index 272c1eecf92..a1e9e4e92b5 100644
--- a/lldb/source/Core/RegisterValue.cpp
+++ b/lldb/source/Core/RegisterValue.cpp
@@ -119,7 +119,7 @@ RegisterValue::GetAsMemoryData (const RegisterInfo *reg_info,
return 0;
}
- // ReadRegister should have already been called on tgus object prior to
+ // ReadRegister should have already been called on this object prior to
// calling this.
if (GetType() == eTypeInvalid)
{
@@ -217,7 +217,7 @@ RegisterValue::SetFromMemoryData (const RegisterInfo *reg_info,
{
m_data.buffer.byte_order = src_byte_order;
// Make sure to set the buffer length of the destination buffer to avoid
- // problems due to uninitalized variables.
+ // problems due to uninitialized variables.
m_data.buffer.length = src_len;
}
diff --git a/lldb/source/Host/common/XML.cpp b/lldb/source/Host/common/XML.cpp
index 14e786ab8b1..6cd9af0051a 100644
--- a/lldb/source/Host/common/XML.cpp
+++ b/lldb/source/Host/common/XML.cpp
@@ -329,7 +329,7 @@ XMLNode::ForEachSiblingElementWithName (const char *name, NodeCallback const &ca
else
{
if (node->name)
- continue; // nullptr name specified and this elemnt has a name, ignore this one
+ continue; // nullptr name specified and this element has a name, ignore this one
}
if (callback(XMLNode(node)) == false)
diff --git a/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp b/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp
index e2b23d0a0f5..eebf3d4f633 100644
--- a/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp
+++ b/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp
@@ -21,7 +21,7 @@ using namespace lldb_private;
namespace
{
// This is a simple helper class to package up the information needed to return from a Read/Write
-// operation function. Since there is alot of code to be run before exit regardless of whether the
+// operation function. Since there is a lot of code to be run before exit regardless of whether the
// operation succeeded or failed, combined with many possible return paths, this is the cleanest
// way to represent it.
class ReturnInfo
@@ -251,7 +251,7 @@ ConnectionGenericFile::Read(void *dst, size_t dst_len, uint32_t timeout_usec, ll
}
else
{
- // An unknown error occured. Fail out.
+ // An unknown error occurred. Fail out.
return_info.Set(0, eConnectionStatusError, ::GetLastError());
}
goto finish;
diff --git a/lldb/source/Host/windows/EditLineWin.cpp b/lldb/source/Host/windows/EditLineWin.cpp
index 8b5c2f2501b..55fe52dc8cc 100644
--- a/lldb/source/Host/windows/EditLineWin.cpp
+++ b/lldb/source/Host/windows/EditLineWin.cpp
@@ -35,7 +35,7 @@ struct el_binding
// stored key bindings
static std::vector<el_binding*> _bindings;
-//TODO: this should infact be related to the exact edit line context we create
+//TODO: this should in fact be related to the exact edit line context we create
static void *clientData = NULL;
// store the current prompt string
@@ -125,7 +125,7 @@ el_get_s (char *buffer, int chars)
DWORD _read = 0;
if ( ReadConsoleInputA( GetStdHandle( STD_INPUT_HANDLE ), &_record, 1, &_read ) == FALSE )
break;
- // if we didnt read a key
+ // if we didn't read a key
if ( _read == 0 )
continue;
// only interested in key events
@@ -179,7 +179,7 @@ el_get_s (char *buffer, int chars)
}
#endif
-// edit line initalise
+// edit line initialize
EditLine *
el_init (const char *, FILE *, FILE *, FILE *)
{
@@ -263,7 +263,7 @@ el_set (EditLine *el, int code, ...)
case ( EL_HIST ):
{
// EL_HIST, History *(*fun)(History *, int op, ... ), const char *ptr
- // defines which histroy function to use, which is usualy history(). Ptr should be the
+ // defines which history function to use, which is usually history(). Ptr should be the
// value returned by history_init().
}
break;
@@ -271,7 +271,7 @@ el_set (EditLine *el, int code, ...)
{
// EL_ADDFN, const char *name, const char *help, unsigned char (*func)(EditLine *e, int ch)
// add a user defined function, func), referred to as 'name' which is invoked when a key which is bound to 'name' is
- // entered. 'help' is a description of 'name'. at involcation time, 'ch' is the key which caused the invocation. the
+ // entered. 'help' is a description of 'name'. at invocation time, 'ch' is the key which caused the invocation. the
// return value of 'func()' should be one of:
// CC_NORM add a normal character
// CC_NEWLINE end of line was entered
@@ -280,8 +280,8 @@ el_set (EditLine *el, int code, ...)
// CC_REFRESH refresh display.
// CC_REFRESH_BEEP refresh display and beep.
// CC_CURSOR cursor moved so update and perform CC_REFRESH
- // CC_REDISPLAY redisplay entire input line. this is usefull if a key binding outputs extra information.
- // CC_ERROR an error occured. beep and flush tty.
+ // CC_REDISPLAY redisplay entire input line. this is useful if a key binding outputs extra information.
+ // CC_ERROR an error occurred. beep and flush tty.
// CC_FATAL fatal error, reset tty to known state.
el_binding *binding = new el_binding;
@@ -296,7 +296,7 @@ el_set (EditLine *el, int code, ...)
case ( EL_BIND ):
{
// EL_BIND, const char *, ..., NULL
- // perform the BIND buildin command. Refer to editrc(5) for more information.
+ // perform the BIND built-in command. Refer to editrc(5) for more information.
const char *name = va_arg( vl, const char* );
diff --git a/lldb/source/Interpreter/Args.cpp b/lldb/source/Interpreter/Args.cpp
index 2258c26e6c3..2895f0ebdea 100644
--- a/lldb/source/Interpreter/Args.cpp
+++ b/lldb/source/Interpreter/Args.cpp
@@ -719,7 +719,7 @@ Args::StringToAddress (const ExecutionContext *exe_ctx, const char *s, lldb::add
else
{
// Since the compiler can't handle things like "main + 12" we should
- // try to do this for now. The compliler doesn't like adding offsets
+ // try to do this for now. The compiler doesn't like adding offsets
// to function pointer types.
static RegularExpression g_symbol_plus_offset_regex("^(.*)([-\\+])[[:space:]]*(0x[0-9A-Fa-f]+|[0-9]+)[[:space:]]*$");
RegularExpression::Match regex_match(3);
diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index c0efd9e33c0..d42053c1aa7 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -395,7 +395,7 @@ CommandObject::HandleCompletion
StringList &matches
)
{
- // Default implmentation of WantsCompletion() is !WantsRawCommandString().
+ // Default implementation of WantsCompletion() is !WantsRawCommandString().
// Subclasses who want raw command string but desire, for example,
// argument completion should override WantsCompletion() to return true,
// instead.
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 789fd491330..a3a1113ffc8 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -1731,7 +1731,7 @@ ObjectFileELF::CreateSections(SectionList &unified_section_list)
if (eSectionTypeOther == sect_type)
{
// the kalimba toolchain assumes that ELF section names are free-form. It does
- // supports linkscripts which (can) give rise to various arbitarily named
+ // support linkscripts which (can) give rise to various arbitrarily named
// sections being "Code" or "Data".
sect_type = kalimbaSectionType(m_header, header);
}
@@ -2069,7 +2069,7 @@ ObjectFileELF::ParseSymbols (Symtab *symtab,
Mangled mangled(ConstString(symbol_bare), is_mangled);
// Now append the suffix back to mangled and unmangled names. Only do it if the
- // demangling was sucessful (string is not empty).
+ // demangling was successful (string is not empty).
if (has_suffix)
{
llvm::StringRef suffix = symbol_ref.substr(version_pos);
@@ -2221,7 +2221,7 @@ ObjectFileELF::PLTRelocationType()
}
// Returns the size of the normal plt entries and the offset of the first normal plt entry. The
-// 0th entry in the plt table is ususally a resolution entry which have different size in some
+// 0th entry in the plt table is usually a resolution entry which have different size in some
// architectures then the rest of the plt entries.
static std::pair<uint64_t, uint64_t>
GetPltEntrySizeAndOffset(const ELFSectionHeader* rel_hdr, const ELFSectionHeader* plt_hdr)
@@ -2237,8 +2237,8 @@ GetPltEntrySizeAndOffset(const ELFSectionHeader* rel_hdr, const ELFSectionHeader
{
// The linker haven't set the plt_hdr->sh_entsize field. Try to guess the size of the plt
// entries based on the number of entries and the size of the plt section with the
- // asumption that the size of the 0th entry is at least as big as the size of the normal
- // entries and it isn't mutch bigger then that.
+ // assumption that the size of the 0th entry is at least as big as the size of the normal
+ // entries and it isn't much bigger then that.
if (plt_hdr->sh_addralign)
plt_entsize = plt_hdr->sh_size / plt_hdr->sh_addralign / (num_relocations + 1) * plt_hdr->sh_addralign;
else
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
index b4711bc29c5..2d70196379b 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -649,17 +649,17 @@ PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite
bool
PlatformDarwin::GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &process_info)
{
- bool sucess = false;
+ bool success = false;
if (IsHost())
{
- sucess = Platform::GetProcessInfo (pid, process_info);
+ success = Platform::GetProcessInfo (pid, process_info);
}
else
{
if (m_remote_platform_sp)
- sucess = m_remote_platform_sp->GetProcessInfo (pid, process_info);
+ success = m_remote_platform_sp->GetProcessInfo (pid, process_info);
}
- return sucess;
+ return success;
}
uint32_t
diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h
index 775d9e94dd8..538deacfef5 100644
--- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h
+++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h
@@ -10,7 +10,7 @@
// 2) The ELF file's PT_NOTE and PT_LOAD segments describes the program's
// address space and thread contexts.
// 3) PT_NOTE segment contains note entries which describes a thread context.
-// 4) PT_LOAD segment describes a valid contigous range of process address
+// 4) PT_LOAD segment describes a valid contiguous range of process address
// space.
//===----------------------------------------------------------------------===//
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index f4862167d49..cca9209bc04 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -782,7 +782,7 @@ GDBRemoteCommunicationClient::SendPacketAndWaitForResponse
Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS));
// In order to stop async notifications from being processed in the middle of the
- // send/recieve sequence Hijack the broadcast. Then rebroadcast any events when we are done.
+ // send/receive sequence Hijack the broadcast. Then rebroadcast any events when we are done.
static Listener hijack_listener("lldb.NotifyHijacker");
HijackBroadcaster(&hijack_listener, eBroadcastBitGdbReadThreadGotNotify);
@@ -878,10 +878,10 @@ GDBRemoteCommunicationClient::SendPacketAndWaitForResponse
}
}
- // Remove our Hijacking listner from the broadcast.
+ // Remove our Hijacking listener from the broadcast.
RestoreBroadcaster();
- // If a notification event occured, rebroadcast since it can now be processed safely.
+ // If a notification event occurred, rebroadcast since it can now be processed safely.
EventSP event_sp;
if (hijack_listener.GetNextEvent(event_sp))
BroadcastEvent(event_sp);
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
index 005f6f10031..746c127ec1d 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -376,7 +376,7 @@ protected:
bool m_destroy_tried_resuming;
lldb::CommandObjectSP m_command_sp;
int64_t m_breakpoint_pc_offset;
- lldb::tid_t m_initial_tid; // The inital thread ID, given by stub on attach
+ lldb::tid_t m_initial_tid; // The initial thread ID, given by stub on attach
bool
HandleNotifyPacket(StringExtractorGDBRemote &packet);
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index 9785627ba94..ba2f31c17c2 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -3331,7 +3331,7 @@ SymbolFileDWARF::Index ()
s.Printf("\nObjective C class selectors:\n"); m_objc_class_selectors_index.Dump (&s);
s.Printf("\nGlobals and statics:\n"); m_global_index.Dump (&s);
s.Printf("\nTypes:\n"); m_type_index.Dump (&s);
- s.Printf("\nNamepaces:\n"); m_namespace_index.Dump (&s);
+ s.Printf("\nNamespaces:\n") m_namespace_index.Dump (&s);
#endif
}
}
@@ -8014,7 +8014,7 @@ SymbolFileDWARF::DumpIndexes ()
s.Printf("\nObjective C class selectors:\n"); m_objc_class_selectors_index.Dump (&s);
s.Printf("\nGlobals and statics:\n"); m_global_index.Dump (&s);
s.Printf("\nTypes:\n"); m_type_index.Dump (&s);
- s.Printf("\nNamepaces:\n"); m_namespace_index.Dump (&s);
+ s.Printf("\nNamespaces:\n"); m_namespace_index.Dump (&s);
}
void
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 68bcde8a47c..192c942a2e8 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -896,7 +896,7 @@ ClangASTContext::GetBuiltinTypeForDWARFEncodingAndBitSize (const char *type_name
return ClangASTType (ast, ast->DoubleTy.getAsOpaquePtr());
if (streq(type_name, "long double") && QualTypeMatchesBitSize (bit_size, ast, ast->LongDoubleTy))
return ClangASTType (ast, ast->LongDoubleTy.getAsOpaquePtr());
- // Fall back to not requring a name match
+ // Fall back to not requiring a name match
if (QualTypeMatchesBitSize (bit_size, ast, ast->FloatTy))
return ClangASTType (ast, ast->FloatTy.getAsOpaquePtr());
if (QualTypeMatchesBitSize (bit_size, ast, ast->DoubleTy))
diff --git a/lldb/source/Symbol/CompactUnwindInfo.cpp b/lldb/source/Symbol/CompactUnwindInfo.cpp
index afef4e480e8..624591c24dc 100644
--- a/lldb/source/Symbol/CompactUnwindInfo.cpp
+++ b/lldb/source/Symbol/CompactUnwindInfo.cpp
@@ -297,7 +297,7 @@ CompactUnwindInfo::ScanIndex (const ProcessSP &process_sp)
Host::SystemLog (Host::eSystemLogError,
"error: Invalid offset encountered in compact unwind info, skipping\n");
// don't trust anything from this compact_unwind section if it looks
- // blatently invalid data in the header.
+ // blatantly invalid data in the header.
m_indexes_computed = eLazyBoolNo;
return;
}
diff --git a/lldb/source/Symbol/DWARFCallFrameInfo.cpp b/lldb/source/Symbol/DWARFCallFrameInfo.cpp
index a5f9017918d..8ee21a81a73 100644
--- a/lldb/source/Symbol/DWARFCallFrameInfo.cpp
+++ b/lldb/source/Symbol/DWARFCallFrameInfo.cpp
@@ -342,7 +342,7 @@ DWARFCallFrameInfo::GetFDEIndex ()
"error: Invalid fde/cie next entry offset of 0x%x found in cie/fde at 0x%x\n",
next_entry,
current_entry);
- // Don't trust anything in this eh_frame section if we find blatently
+ // Don't trust anything in this eh_frame section if we find blatantly
// invalid data.
m_fde_index.Clear();
m_fde_index_initialized = true;
@@ -354,7 +354,7 @@ DWARFCallFrameInfo::GetFDEIndex ()
"error: Invalid cie offset of 0x%x found in cie/fde at 0x%x\n",
cie_offset,
current_entry);
- // Don't trust anything in this eh_frame section if we find blatently
+ // Don't trust anything in this eh_frame section if we find blatantly
// invalid data.
m_fde_index.Clear();
m_fde_index_initialized = true;
diff --git a/lldb/source/Symbol/LineTable.cpp b/lldb/source/Symbol/LineTable.cpp
index 3b951f56766..7c4a1ccbb36 100644
--- a/lldb/source/Symbol/LineTable.cpp
+++ b/lldb/source/Symbol/LineTable.cpp
@@ -215,7 +215,7 @@ LineTable::FindLineEntryByAddress (const Address &so_addr, LineEntry& line_entry
--pos;
else if (pos->file_addr == search_entry.file_addr)
{
- // If this is a termination entry, it should't match since
+ // If this is a termination entry, it shouldn't match since
// entries with the "is_terminal_entry" member set to true
// are termination entries that define the range for the
// previous entry.
@@ -529,7 +529,7 @@ LineTable::LinkLineTable (const FileRangeMap &file_range_map)
{
entry_linked_file_addr = entry.file_addr - file_range_entry->GetRangeBase() + file_range_entry->data;
// Determine if we need to terminate the previous entry when the previous
- // entry was not contguous with this one after being linked.
+ // entry was not contiguous with this one after being linked.
if (range_changed && prev_file_range_entry)
{
prev_end_entry_linked_file_addr = std::min<lldb::addr_t>(entry.file_addr, prev_file_range_entry->GetRangeEnd()) - prev_file_range_entry->GetRangeBase() + prev_file_range_entry->data;
diff --git a/lldb/source/Symbol/SymbolVendor.cpp b/lldb/source/Symbol/SymbolVendor.cpp
index 6ec9f3861ec..752edd1af71 100644
--- a/lldb/source/Symbol/SymbolVendor.cpp
+++ b/lldb/source/Symbol/SymbolVendor.cpp
@@ -77,7 +77,7 @@ SymbolVendor::~SymbolVendor()
}
//----------------------------------------------------------------------
-// Add a represention given an object file.
+// Add a representation given an object file.
//----------------------------------------------------------------------
void
SymbolVendor::AddSymbolFileRepresentation(const ObjectFileSP &objfile_sp)
diff --git a/lldb/source/Symbol/TypeList.cpp b/lldb/source/Symbol/TypeList.cpp
index 8d97b2ba25c..05ef73a7475 100644
--- a/lldb/source/Symbol/TypeList.cpp
+++ b/lldb/source/Symbol/TypeList.cpp
@@ -249,9 +249,9 @@ TypeList::RemoveMismatchedTypes (const std::string &type_scope,
{
if (type_scope_pos >= 2)
{
- // Our match scope ends with the type scope we were lookikng for,
+ // Our match scope ends with the type scope we were looking for,
// but we need to make sure what comes before the matching
- // type scope is a namepace boundary in case we are trying to match:
+ // type scope is a namespace boundary in case we are trying to match:
// type_basename = "d"
// type_scope = "b::c::"
// We want to match:
diff --git a/lldb/source/Target/ThreadList.cpp b/lldb/source/Target/ThreadList.cpp
index d581a7c9606..3ccadfd81b8 100644
--- a/lldb/source/Target/ThreadList.cpp
+++ b/lldb/source/Target/ThreadList.cpp
@@ -46,7 +46,7 @@ ThreadList::operator = (const ThreadList& rhs)
if (this != &rhs)
{
// Lock both mutexes to make sure neither side changes anyone on us
- // while the assignement occurs
+ // while the assignment occurs
Mutex::Locker locker(GetMutex());
m_process = rhs.m_process;
m_stop_id = rhs.m_stop_id;
@@ -750,7 +750,7 @@ ThreadList::Update (ThreadList &rhs)
if (this != &rhs)
{
// Lock both mutexes to make sure neither side changes anyone on us
- // while the assignement occurs
+ // while the assignment occurs
Mutex::Locker locker(GetMutex());
m_process = rhs.m_process;
m_stop_id = rhs.m_stop_id;
diff --git a/lldb/source/Utility/JSON.cpp b/lldb/source/Utility/JSON.cpp
index 1e16a5ac995..ef5c98ff6be 100644
--- a/lldb/source/Utility/JSON.cpp
+++ b/lldb/source/Utility/JSON.cpp
@@ -392,7 +392,7 @@ JSONParser::GetToken (std::string &value)
case 'E':
if (exp_index != 0)
{
- error.Printf("error: extra expenent character found at offset %" PRIu64, start_index);
+ error.Printf("error: extra exponent character found at offset %" PRIu64, start_index);
value = std::move(error.GetString());
return Token::Error;
}
diff --git a/lldb/source/Utility/SharingPtr.cpp b/lldb/source/Utility/SharingPtr.cpp
index 4083975bba7..7f1278567ff 100644
--- a/lldb/source/Utility/SharingPtr.cpp
+++ b/lldb/source/Utility/SharingPtr.cpp
@@ -11,7 +11,7 @@
#if defined (ENABLE_SP_LOGGING)
-// If ENABLE_SP_LOGGING is defined, then log all shared pointer assignements
+// If ENABLE_SP_LOGGING is defined, then log all shared pointer assignments
// and allow them to be queried using a pointer by a call to:
#include <execinfo.h>
#include <map>
OpenPOWER on IntegriCloud