diff options
author | Zachary Turner <zturner@google.com> | 2015-04-02 20:57:38 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2015-04-02 20:57:38 +0000 |
commit | 48b475cbaa098095b47d220aa3503a275ee70982 (patch) | |
tree | 549e17d17d08085eb196ffa9fcc2321f5d120a9f /lldb/source/Interpreter/CommandObject.cpp | |
parent | d4e1b8685e4c6f9514ffff5f7cd030d4aa4d58a1 (diff) | |
download | bcm5719-llvm-48b475cbaa098095b47d220aa3503a275ee70982.tar.gz bcm5719-llvm-48b475cbaa098095b47d220aa3503a275ee70982.zip |
Fix warnings generated by clang-cl.
There were a couple of real bugs here regarding error checking and
signed/unsigned comparisons, but mostly these were just noise.
There was one class of bugs fixed here which is particularly
annoying, dealing with MSVC's non-standard behavior regarding
the underlying type of enums. See the comment in
lldb-enumerations.h for details. In short, from now on please use
FLAGS_ENUM and FLAGS_ANONYMOUS_ENUM when defining enums which
contain values larger than can fit into a signed integer.
llvm-svn: 233943
Diffstat (limited to 'lldb/source/Interpreter/CommandObject.cpp')
-rw-r--r-- | lldb/source/Interpreter/CommandObject.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp index 5de3e9da781..c3883b81a19 100644 --- a/lldb/source/Interpreter/CommandObject.cpp +++ b/lldb/source/Interpreter/CommandObject.cpp @@ -1027,18 +1027,15 @@ CommandObject::AddIDsArgumentData(CommandArgumentEntry &arg, CommandArgumentType const char * CommandObject::GetArgumentTypeAsCString (const lldb::CommandArgumentType arg_type) { - if (arg_type >=0 && arg_type < eArgTypeLastArg) - return g_arguments_data[arg_type].arg_name; - return nullptr; - + assert(arg_type < eArgTypeLastArg && "Invalid argument type passed to GetArgumentTypeAsCString"); + return g_arguments_data[arg_type].arg_name; } const char * CommandObject::GetArgumentDescriptionAsCString (const lldb::CommandArgumentType arg_type) { - if (arg_type >=0 && arg_type < eArgTypeLastArg) - return g_arguments_data[arg_type].help_text; - return nullptr; + assert(arg_type < eArgTypeLastArg && "Invalid argument type passed to GetArgumentDescriptionAsCString"); + return g_arguments_data[arg_type].help_text; } Target * |