I enabled some extra warnings for hidden local variables and for hidden
virtual functions and caught some things and did some general code cleanup.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@108299 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpression.cpp b/source/Expression/ClangExpression.cpp
index 1403366..e996749 100644
--- a/source/Expression/ClangExpression.cpp
+++ b/source/Expression/ClangExpression.cpp
@@ -583,15 +583,15 @@
// For now I only write functions with no stubs, globals, exception tables,
// etc. So I only need to write the functions.
- size_t size = 0;
+ size_t alloc_size = 0;
std::map<uint8_t *, uint8_t *>::iterator fun_pos, fun_end = m_jit_mm_ptr->m_functions.end();
for (fun_pos = m_jit_mm_ptr->m_functions.begin(); fun_pos != fun_end; fun_pos++)
{
- size += (*fun_pos).second - (*fun_pos).first;
+ alloc_size += (*fun_pos).second - (*fun_pos).first;
}
Error error;
- lldb::addr_t target_addr = exc_context.process->AllocateMemory (size, lldb::ePermissionsReadable|lldb::ePermissionsExecutable, error);
+ lldb::addr_t target_addr = exc_context.process->AllocateMemory (alloc_size, lldb::ePermissionsReadable|lldb::ePermissionsExecutable, error);
if (target_addr == LLDB_INVALID_ADDRESS)
return false;
diff --git a/source/Expression/ClangFunction.cpp b/source/Expression/ClangFunction.cpp
index 3b775e5..a7bbff7 100644
--- a/source/Expression/ClangFunction.cpp
+++ b/source/Expression/ClangFunction.cpp
@@ -552,7 +552,7 @@
{
timeout_ptr = NULL;
- lldb::StateType stop_state = process->WaitForStateChangedEvents (timeout_ptr, event_sp);
+ stop_state = process->WaitForStateChangedEvents (timeout_ptr, event_sp);
if (stop_state == lldb::eStateInvalid)
{
errors.Printf ("Got an invalid stop state after halt.");