summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Mitchener <bruce.mitchener@gmail.com>2018-10-04 22:33:39 +0000
committerBruce Mitchener <bruce.mitchener@gmail.com>2018-10-04 22:33:39 +0000
commit64f18610c50c659804d46dee0fdaec2a5f5ac44a (patch)
tree32237303e1ef533df85f2651f8e45f6d6eee4a37
parent38729b562817425c16e4b20db0062d79df020bcc (diff)
Reviewers: lldb-commits Subscribers: srhines, ki.stfu Differential Revision: https://reviews.llvm.org/D52884
-rw-r--r--lldb/include/lldb/Utility/ConstString.h2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py2
-rw-r--r--lldb/source/Host/common/MainLoop.cpp4
-rw-r--r--lldb/source/Host/posix/ProcessLauncherPosixFork.cpp2
-rw-r--r--lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp4
-rw-r--r--lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp4
-rw-r--r--lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp4
-rw-r--r--lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp2
-rw-r--r--lldb/tools/lldb-mi/MICmnResources.cpp2
-rw-r--r--lldb/tools/lldb-vscode/JSONUtils.h4
-rw-r--r--lldb/tools/lldb-vscode/LLDBUtils.h4
-rw-r--r--lldb/tools/lldb-vscode/README.md4
-rw-r--r--lldb/tools/lldb-vscode/lldb-vscode.cpp14
-rw-r--r--lldb/unittests/Core/BroadcasterTest.cpp2
-rw-r--r--lldb/unittests/Core/ListenerTest.cpp4
-rw-r--r--lldb/utils/sync-source/README.txt2
-rw-r--r--lldb/www/python_reference/epydoc.css2
17 files changed, 31 insertions, 31 deletions
diff --git a/lldb/include/lldb/Utility/ConstString.h b/lldb/include/lldb/Utility/ConstString.h
index 1c580caf290..db9256f588e 100644
--- a/lldb/include/lldb/Utility/ConstString.h
+++ b/lldb/include/lldb/Utility/ConstString.h
@@ -253,7 +253,7 @@ public:
//------------------------------------------------------------------
/// Clear this object's state.
///
- /// Clear any contained string and reset the value to the an empty string
+ /// Clear any contained string and reset the value to the empty string
/// value.
//------------------------------------------------------------------
void Clear() { m_string = nullptr; }
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
index 7e959d71d8f..066158d0877 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
@@ -907,7 +907,7 @@ def main():
'--vscode',
type='string',
dest='vscode_path',
- help=('The path to the a command line program that implements the '
+ help=('The path to the command line program that implements the '
'Visual Studio Code Debug Adaptor protocol.'),
default=None)
diff --git a/lldb/source/Host/common/MainLoop.cpp b/lldb/source/Host/common/MainLoop.cpp
index 65158c94293..39c353e6717 100644
--- a/lldb/source/Host/common/MainLoop.cpp
+++ b/lldb/source/Host/common/MainLoop.cpp
@@ -309,7 +309,7 @@ MainLoop::RegisterSignal(int signo, const Callback &callback, Status &error) {
g_signal_flags[signo] = 0;
// Even if using kqueue, the signal handler will still be invoked, so it's
- // important to replace it with our "bening" handler.
+ // important to replace it with our "benign" handler.
int ret = sigaction(signo, &new_action, &info.old_action);
assert(ret == 0 && "sigaction failed");
@@ -321,7 +321,7 @@ MainLoop::RegisterSignal(int signo, const Callback &callback, Status &error) {
#endif
// If we're using kqueue, the signal needs to be unblocked in order to
- // recieve it. If using pselect/ppoll, we need to block it, and later unblock
+ // receive it. If using pselect/ppoll, we need to block it, and later unblock
// it as a part of the system call.
ret = pthread_sigmask(HAVE_SYS_EVENT_H ? SIG_UNBLOCK : SIG_BLOCK,
&new_action.sa_mask, &old_set);
diff --git a/lldb/source/Host/posix/ProcessLauncherPosixFork.cpp b/lldb/source/Host/posix/ProcessLauncherPosixFork.cpp
index 46ce3e3d224..6bf78463d06 100644
--- a/lldb/source/Host/posix/ProcessLauncherPosixFork.cpp
+++ b/lldb/source/Host/posix/ProcessLauncherPosixFork.cpp
@@ -157,7 +157,7 @@ static void LLVM_ATTRIBUTE_NORETURN ChildFunc(int error_fd,
#if defined(__linux__)
if (errno == ETXTBSY) {
- // On android M and earlier we can get this error because the adb deamon
+ // On android M and earlier we can get this error because the adb daemon
// can hold a write handle on the executable even after it has finished
// uploading it. This state lasts only a short time and happens only when
// there are many concurrent adb commands being issued, such as when
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
index 253e69d038d..5147446ad56 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -2449,7 +2449,7 @@ bool AppleObjCRuntimeV2::NonPointerISACache::EvaluateNonPointerISA(
// If all of the indexed ISA variables are set, then its possible that this
// ISA is indexed, and we should first try to get its value using the index.
- // Note, we check these varaibles first as the ObjC runtime will set at least
+ // Note, we check these variables first as the ObjC runtime will set at least
// one of their values to 0 if they aren't needed.
if (m_objc_debug_indexed_isa_magic_mask &&
m_objc_debug_indexed_isa_magic_value &&
@@ -2536,7 +2536,7 @@ bool AppleObjCRuntimeV2::NonPointerISACache::EvaluateNonPointerISA(
return false;
}
- // Definately not an indexed ISA, so try to use a mask to extract the pointer
+ // Definitely not an indexed ISA, so try to use a mask to extract the pointer
// from the ISA.
if ((isa & m_objc_debug_isa_magic_mask) == m_objc_debug_isa_magic_value) {
ret_isa = isa & m_objc_debug_isa_class_mask;
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
index c75fa71ba13..b3f25cea1a3 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
@@ -80,7 +80,7 @@ extern \"C\" void * __lldb_objc_find_implementation_for_selector ( \n\
void *super_ptr; \n\
}; \n\
struct __lldb_objc_super { \n\
- void *reciever; \n\
+ void *receiver; \n\
struct __lldb_objc_class *class_ptr; \n\
}; \n\
struct __lldb_msg_ref { \n\
@@ -202,7 +202,7 @@ extern \"C\" void * __lldb_objc_find_implementation_for_selector (void *object,
void *super_ptr; \n\
}; \n\
struct __lldb_objc_super { \n\
- void *reciever; \n\
+ void *receiver; \n\
struct __lldb_objc_class *class_ptr; \n\
}; \n\
struct __lldb_msg_ref { \n\
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
index d00a17d39e6..df7872f16b7 100644
--- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
@@ -482,11 +482,11 @@ static constexpr OptionDefinition g_enable_option_table[] = {
"message."},
{LLDB_OPT_SET_ALL, false, "subsystem", 's', OptionParser::eNoArgument,
nullptr, {}, 0, eArgTypeNone,
- "Include the subsystem in the the message header when displaying "
+ "Include the subsystem in the message header when displaying "
"a log message."},
{LLDB_OPT_SET_ALL, false, "category", 'c', OptionParser::eNoArgument,
nullptr, {}, 0, eArgTypeNone,
- "Include the category in the the message header when displaying "
+ "Include the category in the message header when displaying "
"a log message."},
{LLDB_OPT_SET_ALL, false, "activity-chain", 'C', OptionParser::eNoArgument,
nullptr, {}, 0, eArgTypeNone,
diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
index 54e182b30b6..b70c2c44d3e 100644
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
@@ -606,7 +606,7 @@ bool UnwindAssemblyInstEmulation::WriteRegister(
assert(
(generic_regnum == LLDB_REGNUM_GENERIC_PC ||
generic_regnum == LLDB_REGNUM_GENERIC_FLAGS) &&
- "eInfoTypeISA used for poping a register other the the PC/FLAGS");
+ "eInfoTypeISA used for popping a register other the PC/FLAGS");
if (generic_regnum != LLDB_REGNUM_GENERIC_FLAGS) {
m_curr_row->SetRegisterLocationToSame(reg_num,
false /*must_replace*/);
diff --git a/lldb/tools/lldb-mi/MICmnResources.cpp b/lldb/tools/lldb-mi/MICmnResources.cpp
index e32a816fc9f..bf179bb92c7 100644
--- a/lldb/tools/lldb-mi/MICmnResources.cpp
+++ b/lldb/tools/lldb-mi/MICmnResources.cpp
@@ -78,7 +78,7 @@ const CMICmnResources::SRsrcTextData
"and a custom plugin.\nThe custom plugin is not necessary to operate "
"the MI Driver."},
{IDE_MI_APP_ARG_USAGE, "\nMI driver usage:\n\n\tlldb-mi [--longOption] "
- "[-s hortOption] [executeable]\n\n[] = optional "
+ "[-s hortOption] [executable]\n\n[] = optional "
"argument."},
{IDE_MI_APP_ARG_HELP, "-h\n--help\n\tPrints out usage information for "
"the MI debugger. Exit the MI\n\tDriver "
diff --git a/lldb/tools/lldb-vscode/JSONUtils.h b/lldb/tools/lldb-vscode/JSONUtils.h
index acc3fc7bd7d..1ef3b733cfb 100644
--- a/lldb/tools/lldb-vscode/JSONUtils.h
+++ b/lldb/tools/lldb-vscode/JSONUtils.h
@@ -379,7 +379,7 @@ llvm::json::Value CreateThreadStopped(lldb::SBThread &thread, uint32_t stop_id);
/// object:
/// "name" - the name of the variable
/// "value" - the value of the variable as a string
-/// "type" - the typename of the varaible as a string
+/// "type" - the typename of the variable as a string
/// "id" - a unique identifier for a value in case there are multiple
/// variables with the same name. Other parts of the VSCode
/// protocol refer to values by name so this can help
@@ -401,7 +401,7 @@ llvm::json::Value CreateThreadStopped(lldb::SBThread &thread, uint32_t stop_id);
/// might be asked to expand itself.
///
/// @param[in] varID
-/// A unique variable indentifier to help in properly identifying
+/// A unique variable identifier to help in properly identifying
/// variables with the same name. This is an extension to the
/// VS protocol.
///
diff --git a/lldb/tools/lldb-vscode/LLDBUtils.h b/lldb/tools/lldb-vscode/LLDBUtils.h
index bf89021d3f9..f5ff2c97561 100644
--- a/lldb/tools/lldb-vscode/LLDBUtils.h
+++ b/lldb/tools/lldb-vscode/LLDBUtils.h
@@ -27,7 +27,7 @@ namespace lldb_vscode {
///
/// @param[in] prefix
/// A string that will be printed into \a strm prior to emitting
-/// the prmopt + command and command output. Can be NULL.
+/// the prompt + command and command output. Can be NULL.
///
/// @param[in] commands
/// An array of LLDB commands to execute.
@@ -48,7 +48,7 @@ void RunLLDBCommands(llvm::StringRef prefix,
///
/// @param[in] prefix
/// A string that will be printed into \a strm prior to emitting
-/// the prmopt + command and command output. Can be NULL.
+/// the prompt + command and command output. Can be NULL.
///
/// @param[in] commands
/// An array of LLDB commands to execute.
diff --git a/lldb/tools/lldb-vscode/README.md b/lldb/tools/lldb-vscode/README.md
index 9e69b5ce244..2294659fc29 100644
--- a/lldb/tools/lldb-vscode/README.md
+++ b/lldb/tools/lldb-vscode/README.md
@@ -82,7 +82,7 @@ file that defines how your program will be run. The JSON configuration file can
|**cwd** |string| | The program working directory.
|**env** |dictionary| | Environment variables to set when launching the program. The format of each environment variable string is "VAR=VALUE" for environment variables with values or just "VAR" for environment variables with no values.
|**stopOnEntry** |boolean| | Whether to stop program immediately after launching.
-|**initCommands** |[string]| | LLDB commands executed upon debugger startup prior to creating a the LLDB target. Commands and command output will be sent to the debugger console when they are executed.
+|**initCommands** |[string]| | LLDB commands executed upon debugger startup prior to creating the LLDB target. Commands and command output will be sent to the debugger console when they are executed.
|**preRunCommands** |[string]| | LLDB commands executed just before launching after the LLDB target has been created. Commands and command output will be sent to the debugger console when they are executed.
|**stopCommands** |[string]| | LLDB commands executed just after each stop. Commands and command output will be sent to the debugger console when they are executed.
|**exitCommands** |[string]| | LLDB commands executed when the program exits. Commands and command output will be sent to the debugger console when they are executed.
@@ -108,7 +108,7 @@ The JSON configuration file can contain the following `lldb-vscode` specific lau
|**pid** |number | | The process id of the process you wish to attach to. If **pid** is omitted, the debugger will attempt to attach to the program by finding a process whose file name matches the file name from **porgram**. Setting this value to `${command:pickMyProcess}` will allow interactive process selection in the IDE.
|**stopOnEntry** |boolean| | Whether to stop program immediately after launching.
|**waitFor** |boolean | | Wait for the process to launch.
-|**initCommands** |[string]| | LLDB commands executed upon debugger startup prior to creating a the LLDB target. Commands and command output will be sent to the debugger console when they are executed.
+|**initCommands** |[string]| | LLDB commands executed upon debugger startup prior to creating the LLDB target. Commands and command output will be sent to the debugger console when they are executed.
|**preRunCommands** |[string]| | LLDB commands executed just before launching after the LLDB target has been created. Commands and command output will be sent to the debugger console when they are executed.
|**stopCommands** |[string]| | LLDB commands executed just after each stop. Commands and command output will be sent to the debugger console when they are executed.
|**exitCommands** |[string]| | LLDB commands executed when the program exits. Commands and command output will be sent to the debugger console when they are executed.
diff --git a/lldb/tools/lldb-vscode/lldb-vscode.cpp b/lldb/tools/lldb-vscode/lldb-vscode.cpp
index e3d7a1ae356..8eacc541184 100644
--- a/lldb/tools/lldb-vscode/lldb-vscode.cpp
+++ b/lldb/tools/lldb-vscode/lldb-vscode.cpp
@@ -152,7 +152,7 @@ void SendTerminatedEvent() {
}
//----------------------------------------------------------------------
-// Send a thread stopped event for all threads as lons as the process
+// Send a thread stopped event for all threads as long as the process
// is stopped.
//----------------------------------------------------------------------
void SendThreadStoppedEvent() {
@@ -191,7 +191,7 @@ void SendThreadStoppedEvent() {
if (g_vsc.focus_tid == LLDB_INVALID_THREAD_ID)
g_vsc.focus_tid = first_tid_with_reason;
- // If no threads stopped with a reaspon, then report the first one so
+ // If no threads stopped with a reason, then report the first one so
// we at least let the UI know we stopped.
if (num_threads_with_reason == 0) {
lldb::SBThread thread = process.GetThreadAtIndex(0);
@@ -324,7 +324,7 @@ void SendStdOutStdErr(lldb::SBProcess &process) {
}
//----------------------------------------------------------------------
-// All events from a the debugger, target, process, thread and frames are
+// All events from the debugger, target, process, thread and frames are
// received in this function that runs in its own thread. We are using a
// "FILE *" to output packets back to VS Code and they have mutexes in them
// them prevent multiple threads from writing simultaneously so no locking
@@ -1623,7 +1623,7 @@ void request_setBreakpoints(const llvm::json::Object &request) {
remove_lines.push_back(pair.first);
} else {
pair.second.UpdateBreakpoint(request_pos->second);
- // Remove this breakpopint from the request breakpoints since we have
+ // Remove this breakpoint from the request breakpoints since we have
// handled it here and we don't need to set a new breakpoint below.
request_bps.erase(request_pos);
// Add this breakpoint info to the response
@@ -1849,7 +1849,7 @@ void request_setFunctionBreakpoints(const llvm::json::Object &request) {
// Update the existing breakpoint as any setting withing the function
// breakpoint might have changed.
pair.second.UpdateBreakpoint(request_pos->second);
- // Remove this breakpopint from the request breakpoints since we have
+ // Remove this breakpoint from the request breakpoints since we have
// handled it here and we don't need to set a new breakpoint below.
request_bps.erase(request_pos);
// Add this breakpoint info to the response
@@ -2334,13 +2334,13 @@ void request_setVariable(const llvm::json::Object &request) {
// only specifies the variable reference of the enclosing scope/variable, and
// the name of the variable. We could have two shadowed variables with the
// same name in "Locals" or "Globals". In our case the "id" absolute index
- // of the variable within the the g_vsc.variables list.
+ // of the variable within the g_vsc.variables list.
const auto id_value = GetUnsigned(arguments, "id", UINT64_MAX);
if (id_value != UINT64_MAX) {
variable = g_vsc.variables.GetValueAtIndex(id_value);
} else if (VARREF_IS_SCOPE(variablesReference)) {
// variablesReference is one of our scopes, not an actual variable it is
- // asking for a variable inlocals or globals or registers
+ // asking for a variable in locals or globals or registers
int64_t start_idx = 0;
int64_t end_idx = 0;
switch (variablesReference) {
diff --git a/lldb/unittests/Core/BroadcasterTest.cpp b/lldb/unittests/Core/BroadcasterTest.cpp
index 1cbe1533a31..e59999cc437 100644
--- a/lldb/unittests/Core/BroadcasterTest.cpp
+++ b/lldb/unittests/Core/BroadcasterTest.cpp
@@ -24,7 +24,7 @@ TEST(BroadcasterTest, BroadcastEvent) {
Broadcaster broadcaster(nullptr, "test-broadcaster");
std::chrono::seconds timeout(0);
- // Create a listener, sign it up, make sure it recieves an event.
+ // Create a listener, sign it up, make sure it receives an event.
ListenerSP listener1_sp = Listener::MakeListener("test-listener1");
const uint32_t event_mask1 = 1;
EXPECT_EQ(event_mask1,
diff --git a/lldb/unittests/Core/ListenerTest.cpp b/lldb/unittests/Core/ListenerTest.cpp
index 7c5a52e3dc4..f548d767bce 100644
--- a/lldb/unittests/Core/ListenerTest.cpp
+++ b/lldb/unittests/Core/ListenerTest.cpp
@@ -21,7 +21,7 @@ TEST(ListenerTest, GetEventImmediate) {
EventSP event_sp;
Broadcaster broadcaster(nullptr, "test-broadcaster");
- // Create a listener, sign it up, make sure it recieves an event.
+ // Create a listener, sign it up, make sure it receives an event.
ListenerSP listener_sp = Listener::MakeListener("test-listener");
const uint32_t event_mask = 1;
ASSERT_EQ(event_mask,
@@ -58,7 +58,7 @@ TEST(ListenerTest, GetEventWait) {
EventSP event_sp;
Broadcaster broadcaster(nullptr, "test-broadcaster");
- // Create a listener, sign it up, make sure it recieves an event.
+ // Create a listener, sign it up, make sure it receives an event.
ListenerSP listener_sp = Listener::MakeListener("test-listener");
const uint32_t event_mask = 1;
ASSERT_EQ(event_mask,
diff --git a/lldb/utils/sync-source/README.txt b/lldb/utils/sync-source/README.txt
index 9e019b64d9a..5d1dc641ed1 100644
--- a/lldb/utils/sync-source/README.txt
+++ b/lldb/utils/sync-source/README.txt
@@ -97,7 +97,7 @@ syncsource.py configuration in ~/.syncsourcerc:
# option.
#
# Below, I have transfer of the lldb dir skip everything
- # rooted at "/llvm" below the the lldb dir. This is
+ # rooted at "/llvm" below the lldb dir. This is
# because we want the source OS X lldb to move to
# a destination of {some-dest-root}/llvm/tools/lldb, and
# not have the OS-X-inverted llvm copy over with the lldb
diff --git a/lldb/www/python_reference/epydoc.css b/lldb/www/python_reference/epydoc.css
index 86d41706824..1a0abed4b57 100644
--- a/lldb/www/python_reference/epydoc.css
+++ b/lldb/www/python_reference/epydoc.css
@@ -176,7 +176,7 @@ table.summary
font-family: monospace; }
/* Variable values
- * - In the 'variable details' sections, each varaible's value is
+ * - In the 'variable details' sections, each variable's value is
* listed in a 'pre.variable' box. The width of this box is
* restricted to 80 chars; if the value's repr is longer than
* this it will be wrapped, using a backslash marked with