ovyalov created this revision.
ovyalov added a reviewer: granata.enrico.
ovyalov added a subscriber: lldb-commits.
Herald added subscribers: danalbert, tberghammer.
Fix Android build after r266267
http://reviews.llvm.org/D19092
Files:
source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
Index:
source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
===================================================================
--- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -596,47 +596,47 @@
{
auto iterators_pair = objc_runtime->GetDescriptorIteratorPair();
auto iterator = iterators_pair.first;
- Stream &stdout(result.GetOutputStream());
+ auto &out = result.GetOutputStream();
for(; iterator != iterators_pair.second; iterator++)
{
if (iterator->second)
{
const char* class_name =
iterator->second->GetClassName().AsCString("<unknown>");
if (regex_up && class_name &&
!regex_up->Execute(class_name))
continue;
- stdout.Printf("isa = 0x%" PRIx64, iterator->first);
- stdout.Printf(" name = %s", class_name);
- stdout.Printf(" instance size = %" PRIu64,
iterator->second->GetInstanceSize());
- stdout.Printf(" num ivars = %" PRIuPTR,
(uintptr_t)iterator->second->GetNumIVars());
+ out.Printf("isa = 0x%" PRIx64, iterator->first);
+ out.Printf(" name = %s", class_name);
+ out.Printf(" instance size = %" PRIu64,
iterator->second->GetInstanceSize());
+ out.Printf(" num ivars = %" PRIuPTR,
(uintptr_t)iterator->second->GetNumIVars());
if (auto superclass = iterator->second->GetSuperclass())
{
- stdout.Printf(" superclass = %s",
superclass->GetClassName().AsCString("<unknown>"));
+ out.Printf(" superclass = %s",
superclass->GetClassName().AsCString("<unknown>"));
}
- stdout.Printf("\n");
+ out.Printf("\n");
if (m_options.m_verbose)
{
for(size_t i = 0;
i < iterator->second->GetNumIVars();
i++)
{
auto ivar = iterator->second->GetIVarAtIndex(i);
- stdout.Printf(" ivar name = %s type = %s size =
%" PRIu64 " offset = %" PRId32 "\n",
+ out.Printf(" ivar name = %s type = %s size = %"
PRIu64 " offset = %" PRId32 "\n",
ivar.m_name.AsCString("<unknown>"),
ivar.m_type.GetDisplayTypeName().AsCString("<unknown>"),
ivar.m_size,
ivar.m_offset);
}
iterator->second->Describe(nullptr,
- [objc_runtime, &stdout]
(const char* name, const char* type) -> bool {
- stdout.Printf("
instance method name = %s type = %s\n",
- name,
- type);
+ [objc_runtime, &out] (const
char* name, const char* type) -> bool {
+ out.Printf(" instance
method name = %s type = %s\n",
+ name,
+ type);
return false;
},
- [objc_runtime, &stdout]
(const char* name, const char* type) -> bool {
- stdout.Printf(" class
method name = %s type = %s\n",
- name,
- type);
+ [objc_runtime, &out] (const
char* name, const char* type) -> bool {
+ out.Printf(" class
method name = %s type = %s\n",
+ name,
+ type);
return false;
},
nullptr);
@@ -646,7 +646,7 @@
{
if (regex_up && !regex_up->Execute(""))
continue;
- stdout.Printf("isa = 0x%" PRIx64 " has no associated
class.\n", iterator->first);
+ out.Printf("isa = 0x%" PRIx64 " has no associated
class.\n", iterator->first);
}
}
result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
===================================================================
--- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -596,47 +596,47 @@
{
auto iterators_pair = objc_runtime->GetDescriptorIteratorPair();
auto iterator = iterators_pair.first;
- Stream &stdout(result.GetOutputStream());
+ auto &out = result.GetOutputStream();
for(; iterator != iterators_pair.second; iterator++)
{
if (iterator->second)
{
const char* class_name = iterator->second->GetClassName().AsCString("<unknown>");
if (regex_up && class_name && !regex_up->Execute(class_name))
continue;
- stdout.Printf("isa = 0x%" PRIx64, iterator->first);
- stdout.Printf(" name = %s", class_name);
- stdout.Printf(" instance size = %" PRIu64, iterator->second->GetInstanceSize());
- stdout.Printf(" num ivars = %" PRIuPTR, (uintptr_t)iterator->second->GetNumIVars());
+ out.Printf("isa = 0x%" PRIx64, iterator->first);
+ out.Printf(" name = %s", class_name);
+ out.Printf(" instance size = %" PRIu64, iterator->second->GetInstanceSize());
+ out.Printf(" num ivars = %" PRIuPTR, (uintptr_t)iterator->second->GetNumIVars());
if (auto superclass = iterator->second->GetSuperclass())
{
- stdout.Printf(" superclass = %s", superclass->GetClassName().AsCString("<unknown>"));
+ out.Printf(" superclass = %s", superclass->GetClassName().AsCString("<unknown>"));
}
- stdout.Printf("\n");
+ out.Printf("\n");
if (m_options.m_verbose)
{
for(size_t i = 0;
i < iterator->second->GetNumIVars();
i++)
{
auto ivar = iterator->second->GetIVarAtIndex(i);
- stdout.Printf(" ivar name = %s type = %s size = %" PRIu64 " offset = %" PRId32 "\n",
+ out.Printf(" ivar name = %s type = %s size = %" PRIu64 " offset = %" PRId32 "\n",
ivar.m_name.AsCString("<unknown>"),
ivar.m_type.GetDisplayTypeName().AsCString("<unknown>"),
ivar.m_size,
ivar.m_offset);
}
iterator->second->Describe(nullptr,
- [objc_runtime, &stdout] (const char* name, const char* type) -> bool {
- stdout.Printf(" instance method name = %s type = %s\n",
- name,
- type);
+ [objc_runtime, &out] (const char* name, const char* type) -> bool {
+ out.Printf(" instance method name = %s type = %s\n",
+ name,
+ type);
return false;
},
- [objc_runtime, &stdout] (const char* name, const char* type) -> bool {
- stdout.Printf(" class method name = %s type = %s\n",
- name,
- type);
+ [objc_runtime, &out] (const char* name, const char* type) -> bool {
+ out.Printf(" class method name = %s type = %s\n",
+ name,
+ type);
return false;
},
nullptr);
@@ -646,7 +646,7 @@
{
if (regex_up && !regex_up->Execute(""))
continue;
- stdout.Printf("isa = 0x%" PRIx64 " has no associated class.\n", iterator->first);
+ out.Printf("isa = 0x%" PRIx64 " has no associated class.\n", iterator->first);
}
}
result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
