summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lldb/include/lldb/Core/InputReaderEZ.h11
-rw-r--r--lldb/include/lldb/Core/Value.h2
-rw-r--r--lldb/include/lldb/Core/ValueObject.h2
-rw-r--r--lldb/include/lldb/Expression/ClangExpressionDeclMap.h4
-rw-r--r--lldb/include/lldb/Expression/ProcessDataAllocator.h10
-rw-r--r--lldb/include/lldb/Symbol/ClangASTContext.h2
-rw-r--r--lldb/include/lldb/Symbol/ClangASTImporter.h6
-rw-r--r--lldb/include/lldb/Symbol/ObjectFile.h2
-rw-r--r--lldb/include/lldb/Target/Process.h2
-rw-r--r--lldb/source/Commands/CommandObjectExpression.cpp16
-rw-r--r--lldb/source/Commands/CommandObjectType.cpp10
-rw-r--r--lldb/source/Core/ValueObject.cpp4
-rw-r--r--lldb/source/Expression/ClangExpressionDeclMap.cpp4
-rw-r--r--lldb/source/Expression/ClangExpressionParser.cpp2
-rw-r--r--lldb/source/Expression/ClangUserExpression.cpp8
-rw-r--r--lldb/source/Expression/IRForTarget.cpp8
-rw-r--r--lldb/source/Host/common/FileSpec.cpp2
-rw-r--r--lldb/source/Host/common/Host.cpp2
18 files changed, 49 insertions, 48 deletions
diff --git a/lldb/include/lldb/Core/InputReaderEZ.h b/lldb/include/lldb/Core/InputReaderEZ.h
index b41eb61f8ea..1ff7f25629b 100644
--- a/lldb/include/lldb/Core/InputReaderEZ.h
+++ b/lldb/include/lldb/Core/InputReaderEZ.h
@@ -26,11 +26,11 @@ class InputReaderEZ : public InputReader
private:
- static size_t Callback_Impl(void *baton,
- InputReader &reader,
- lldb::InputReaderAction notification,
- const char *bytes,
- size_t bytes_len);
+ static size_t Callback_Impl(void *baton,
+ InputReader &reader,
+ lldb::InputReaderAction notification,
+ const char *bytes,
+ size_t bytes_len);
public:
InputReaderEZ (Debugger &debugger) :
@@ -40,6 +40,7 @@ public:
virtual
~InputReaderEZ ();
+ using InputReader::Initialize;
virtual Error
Initialize(void* baton,
lldb::InputReaderGranularity token_size = lldb::eInputReaderGranularityLine,
diff --git a/lldb/include/lldb/Core/Value.h b/lldb/include/lldb/Core/Value.h
index a9dc6d1d978..c01783b5ef9 100644
--- a/lldb/include/lldb/Core/Value.h
+++ b/lldb/include/lldb/Core/Value.h
@@ -47,7 +47,7 @@ public:
eContextTypeClangType, // void * (an opaque clang::QualType * that can be fed to "static QualType QualType::getFromOpaquePtr(void *)")
eContextTypeRegisterInfo, // RegisterInfo *
eContextTypeLLDBType, // lldb_private::Type *
- eContextTypeVariable, // lldb_private::Variable *
+ eContextTypeVariable // lldb_private::Variable *
};
Value();
diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h
index 04f4753c384..1c3eddc8b25 100644
--- a/lldb/include/lldb/Core/ValueObject.h
+++ b/lldb/include/lldb/Core/ValueObject.h
@@ -69,7 +69,7 @@ public:
enum GetExpressionPathFormat
{
eDereferencePointers = 1,
- eHonorPointers,
+ eHonorPointers
};
enum ValueObjectRepresentationStyle
diff --git a/lldb/include/lldb/Expression/ClangExpressionDeclMap.h b/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
index 15c944ead88..e19940b20c7 100644
--- a/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
+++ b/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
@@ -644,8 +644,8 @@ private:
//----------------------------------------------------------------------
struct MaterialVars {
MaterialVars() :
- m_allocated_area(NULL),
- m_materialized_location(NULL)
+ m_allocated_area(0),
+ m_materialized_location(0)
{
}
diff --git a/lldb/include/lldb/Expression/ProcessDataAllocator.h b/lldb/include/lldb/Expression/ProcessDataAllocator.h
index 8b08aa33b20..51f84de7565 100644
--- a/lldb/include/lldb/Expression/ProcessDataAllocator.h
+++ b/lldb/include/lldb/Expression/ProcessDataAllocator.h
@@ -24,7 +24,7 @@ public:
IRForTarget::StaticDataAllocator(),
m_process(process),
m_stream_string(StreamString::eBinary, process.GetAddressByteSize(), process.GetByteOrder()),
- m_allocation(NULL)
+ m_allocation(0)
{
}
@@ -46,18 +46,18 @@ public:
if (m_allocation)
m_process.DeallocateMemory(m_allocation);
- m_allocation = NULL;
+ m_allocation = 0;
m_allocation = m_process.AllocateMemory(m_stream_string.GetSize(), lldb::ePermissionsReadable | lldb::ePermissionsWritable, err);
if (!err.Success())
- return NULL;
+ return 0;
if (m_allocation)
m_process.WriteMemory(m_allocation, m_stream_string.GetData(), m_stream_string.GetSize(), err);
if (!err.Success())
- return NULL;
+ return 0;
return m_allocation;
}
@@ -71,4 +71,4 @@ private:
} // namespace lldb_private
-#endif \ No newline at end of file
+#endif
diff --git a/lldb/include/lldb/Symbol/ClangASTContext.h b/lldb/include/lldb/Symbol/ClangASTContext.h
index dd3c2f49d63..3b0fe28999d 100644
--- a/lldb/include/lldb/Symbol/ClangASTContext.h
+++ b/lldb/include/lldb/Symbol/ClangASTContext.h
@@ -50,7 +50,7 @@ public:
eTypeIsTemplate = (1u << 14),
eTypeIsTypedef = (1u << 15),
eTypeIsVector = (1u << 16),
- eTypeIsScalar = (1u << 17),
+ eTypeIsScalar = (1u << 17)
};
typedef void (*CompleteTagDeclCallback)(void *baton, clang::TagDecl *);
diff --git a/lldb/include/lldb/Symbol/ClangASTImporter.h b/lldb/include/lldb/Symbol/ClangASTImporter.h
index 42fd947e3fd..b0037f249e6 100644
--- a/lldb/include/lldb/Symbol/ClangASTImporter.h
+++ b/lldb/include/lldb/Symbol/ClangASTImporter.h
@@ -24,8 +24,8 @@ class ClangASTImporter
{
public:
ClangASTImporter (clang::ASTContext *target_ctx) :
- m_target_ctx(target_ctx),
- m_file_manager(clang::FileSystemOptions())
+ m_file_manager(clang::FileSystemOptions()),
+ m_target_ctx(target_ctx)
{
}
@@ -161,4 +161,4 @@ private:
}
-#endif \ No newline at end of file
+#endif
diff --git a/lldb/include/lldb/Symbol/ObjectFile.h b/lldb/include/lldb/Symbol/ObjectFile.h
index b8a4880d64d..cf9c8753441 100644
--- a/lldb/include/lldb/Symbol/ObjectFile.h
+++ b/lldb/include/lldb/Symbol/ObjectFile.h
@@ -66,7 +66,7 @@ public:
eTypeObjectFile, /// An intermediate object file
eTypeSharedLibrary, /// A shared library that can be used during execution
eTypeStubLibrary, /// A library that can be linked against but not used for execution
- eTypeUnknown,
+ eTypeUnknown
} Type;
typedef enum
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index b9b30678056..f1afecbf31d 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -883,7 +883,7 @@ public:
{
if (idx < m_infos.size())
return m_infos[idx].GetProcessID();
- return NULL;
+ return 0;
}
bool
diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index 4a25477ce29..0afb0eb13db 100644
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -463,14 +463,14 @@ CommandObjectExpression::ExecuteRawCommandString
OptionDefinition
CommandObjectExpression::CommandOptions::g_option_table[] =
{
- //{ LLDB_OPT_SET_ALL, false, "language", 'l', required_argument, NULL, 0, "[c|c++|objc|objc++]", "Sets the language to use when parsing the expression."},
+//{ LLDB_OPT_SET_ALL, false, "language", 'l', required_argument, NULL, 0, "[c|c++|objc|objc++]", "Sets the language to use when parsing the expression."},
//{ LLDB_OPT_SET_1, false, "format", 'f', required_argument, NULL, 0, "[ [bool|b] | [bin] | [char|c] | [oct|o] | [dec|i|d|u] | [hex|x] | [float|f] | [cstr|s] ]", "Specify the format that the expression output should use."},
-{ LLDB_OPT_SET_1, false, "format", 'f', required_argument, NULL, 0, eArgTypeExprFormat, "Specify the format that the expression output should use."},
-{ LLDB_OPT_SET_2, false, "object-description", 'o', no_argument, NULL, 0, eArgTypeNone, "Print the object description of the value resulting from the expression."},
-{ LLDB_OPT_SET_2, false, "dynamic-value", 'd', required_argument, NULL, 0, eArgTypeBoolean, "Upcast the value resulting from the expression to its dynamic type if available."},
-{ LLDB_OPT_SET_ALL, false, "unwind-on-error", 'u', required_argument, NULL, 0, eArgTypeBoolean, "Clean up program state if the expression causes a crash, breakpoint hit or signal."},
-{ LLDB_OPT_SET_ALL, false, "debug", 'g', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug logging of the expression parsing and evaluation."},
-{ LLDB_OPT_SET_ALL, false, "use-ir", 'i', no_argument, NULL, 0, eArgTypeNone, "[Temporary] Instructs the expression evaluator to use IR instead of ASTs."},
-{ 0, false, NULL, 0, 0, NULL, NULL, eArgTypeNone, NULL }
+{ LLDB_OPT_SET_1, false, "format", 'f', required_argument, NULL, 0, eArgTypeExprFormat, "Specify the format that the expression output should use."},
+{ LLDB_OPT_SET_2, false, "object-description", 'o', no_argument, NULL, 0, eArgTypeNone, "Print the object description of the value resulting from the expression."},
+{ LLDB_OPT_SET_2, false, "dynamic-value", 'd', required_argument, NULL, 0, eArgTypeBoolean, "Upcast the value resulting from the expression to its dynamic type if available."},
+{ LLDB_OPT_SET_ALL, false, "unwind-on-error", 'u', required_argument, NULL, 0, eArgTypeBoolean, "Clean up program state if the expression causes a crash, breakpoint hit or signal."},
+{ LLDB_OPT_SET_ALL, false, "debug", 'g', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug logging of the expression parsing and evaluation."},
+{ LLDB_OPT_SET_ALL, false, "use-ir", 'i', no_argument, NULL, 0, eArgTypeNone, "[Temporary] Instructs the expression evaluator to use IR instead of ASTs."},
+{ 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
};
diff --git a/lldb/source/Commands/CommandObjectType.cpp b/lldb/source/Commands/CommandObjectType.cpp
index ab3574133df..6adbb602146 100644
--- a/lldb/source/Commands/CommandObjectType.cpp
+++ b/lldb/source/Commands/CommandObjectType.cpp
@@ -192,7 +192,7 @@ public:
// now I have a valid format, let's add it to every type
- for (int i = 0; i < argc; i++) {
+ for (size_t i = 0; i < argc; i++) {
const char* typeA = command.GetArgumentAtIndex(i);
ConstString typeCS(typeA);
if (typeCS)
@@ -542,7 +542,7 @@ public:
Error error;
- for (int i = 0; i < options->m_target_types.GetSize(); i++)
+ for (size_t i = 0; i < options->m_target_types.GetSize(); i++)
{
const char *type_name = options->m_target_types.GetStringAtIndex(i);
CommandObjectTypeSummaryAdd::AddSummary(ConstString(type_name),
@@ -785,7 +785,7 @@ CommandObjectTypeSummaryAdd::Execute_ScriptSummary (Args& command, CommandReturn
m_options.m_name,
m_options.m_category);
- for (int i = 0; i < argc; i++) {
+ for (size_t i = 0; i < argc; i++) {
const char* typeA = command.GetArgumentAtIndex(i);
if (typeA && *typeA)
options->m_target_types << typeA;
@@ -806,7 +806,7 @@ CommandObjectTypeSummaryAdd::Execute_ScriptSummary (Args& command, CommandReturn
Error error;
- for (int i = 0; i < command.GetArgumentCount(); i++)
+ for (size_t i = 0; i < command.GetArgumentCount(); i++)
{
const char *type_name = command.GetArgumentAtIndex(i);
CommandObjectTypeSummaryAdd::AddSummary(ConstString(type_name),
@@ -886,7 +886,7 @@ CommandObjectTypeSummaryAdd::Execute_StringSummary (Args& command, CommandReturn
// now I have a valid format, let's add it to every type
- for (int i = 0; i < argc; i++) {
+ for (size_t i = 0; i < argc; i++) {
const char* typeA = command.GetArgumentAtIndex(i);
if (!typeA || typeA[0] == '\0')
{
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index fc89f0fd4a4..2d2972d8600 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -2356,7 +2356,7 @@ ValueObject::ExpandArraySliceExpression(const char* expression_cstr,
}
else
{
- for (int index = index_lower;
+ for (unsigned long index = index_lower;
index <= index_higher; index++)
{
ValueObjectSP child =
@@ -3091,4 +3091,4 @@ ValueObject::ClearUserVisibleData()
m_value_str.clear();
m_summary_str.clear();
m_object_desc_str.clear();
-} \ No newline at end of file
+}
diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index dd952c91b4b..97e73bd541e 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -168,7 +168,7 @@ ClangExpressionDeclMap::BuildIntegerVariable (const ConstString &name,
if (num_bytes > num_data_bytes)
num_bytes = num_data_bytes;
- for (off_t byte_idx = 0;
+ for (size_t byte_idx = 0;
byte_idx < num_bytes;
++byte_idx)
{
@@ -915,7 +915,7 @@ ClangExpressionDeclMap::DoMaterialize
if (log)
log->PutCString("Not bothering to allocate a struct because no arguments are needed");
- m_material_vars->m_allocated_area = NULL;
+ m_material_vars->m_allocated_area = 0;
return true;
}
diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp
index c7050f328f4..01095b50969 100644
--- a/lldb/source/Expression/ClangExpressionParser.cpp
+++ b/lldb/source/Expression/ClangExpressionParser.cpp
@@ -257,7 +257,7 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
std::string triple = target->GetArchitecture().GetTriple().str();
int dash_count = 0;
- for (int i = 0; i < triple.size(); ++i)
+ for (size_t i = 0; i < triple.size(); ++i)
{
if (triple[i] == '-')
dash_count++;
diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 359b011c546..d8d65bc379f 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -413,8 +413,8 @@ ClangUserExpression::GetThreadPlanToExecuteJITExpression (Stream &error_stream,
{
lldb::addr_t struct_address;
- lldb::addr_t object_ptr = NULL;
- lldb::addr_t cmd_ptr = NULL;
+ lldb::addr_t object_ptr = 0;
+ lldb::addr_t cmd_ptr = 0;
PrepareToExecuteJITExpression (error_stream, exe_ctx, struct_address, object_ptr, cmd_ptr);
@@ -494,8 +494,8 @@ ClangUserExpression::Execute (Stream &error_stream,
{
lldb::addr_t struct_address;
- lldb::addr_t object_ptr = NULL;
- lldb::addr_t cmd_ptr = NULL;
+ lldb::addr_t object_ptr = 0;
+ lldb::addr_t cmd_ptr = 0;
if (!PrepareToExecuteJITExpression (error_stream, exe_ctx, struct_address, object_ptr, cmd_ptr))
return eExecutionSetupError;
diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index e20af16f61d..6037cd0c342 100644
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -52,16 +52,16 @@ IRForTarget::IRForTarget (lldb_private::ClangExpressionDeclMap *decl_map,
ModulePass(ID),
m_resolve_vars(resolve_vars),
m_func_name(func_name),
- m_decl_map(decl_map),
m_module(NULL),
+ m_decl_map(decl_map),
+ m_data_allocator(data_allocator),
m_CFStringCreateWithBytes(NULL),
m_sel_registerName(NULL),
+ m_const_result(const_result),
m_error_stream(error_stream),
m_has_side_effects(false),
m_result_store(NULL),
m_result_is_pointer(false),
- m_const_result(const_result),
- m_data_allocator(data_allocator),
m_reloc_placeholder(NULL)
{
}
@@ -1918,7 +1918,7 @@ IRForTarget::UnfoldConstant(Constant *old_constant, Value *new_constant, Instruc
++ui)
users.push_back(*ui);
- for (int i = 0;
+ for (size_t i = 0;
i < users.size();
++i)
{
diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp
index 1b6a69b3ef8..ba9f9201fc4 100644
--- a/lldb/source/Host/common/FileSpec.cpp
+++ b/lldb/source/Host/common/FileSpec.cpp
@@ -913,7 +913,7 @@ FileSpec::EnumerateDirectory
{
char child_path[PATH_MAX];
const int child_path_len = ::snprintf (child_path, sizeof(child_path), "%s/%s", dir_path, dp->d_name);
- if (child_path_len < sizeof(child_path) - 1)
+ if (child_path_len < (int)(sizeof(child_path) - 1))
{
// Don't resolve the file type or path
FileSpec child_path_spec (child_path, false);
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp
index b699bc8bcd5..6908eb1949a 100644
--- a/lldb/source/Host/common/Host.cpp
+++ b/lldb/source/Host/common/Host.cpp
@@ -183,7 +183,7 @@ MonitorChildProcessThreadFunction (void *arg)
}
else
{
- status_cstr = "(???)";
+ status_cstr = "(\?\?\?)";
}
// Scope for pthread_cancel_disabler
OpenPOWER on IntegriCloud