[Lldb-commits] [lldb] r348810 - [DataFormatters] Fixes to libc++ std::function formatter to deal with ABI change see

[Shafik Yaghmour via lldb-commits]

Author: shafik
Date: Mon Dec 10 15:26:38 2018
New Revision: 348810

URL: http://llvm.org/viewvc/llvm-project?rev=348810&view=rev
Log:
[DataFormatters] Fixes to libc++ std::function formatter to deal with ABI change see

    https://reviews.llvm.org/D55045

Modified:
    lldb/trunk/source/Target/CPPLanguageRuntime.cpp

Modified: lldb/trunk/source/Target/CPPLanguageRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/CPPLanguageRuntime.cpp?rev=348810&r1=348809&r2=348810&view=diff
==============================================================================
--- lldb/trunk/source/Target/CPPLanguageRuntime.cpp (original)
+++ lldb/trunk/source/Target/CPPLanguageRuntime.cpp Mon Dec 10 15:26:38 2018
@@ -93,6 +93,15 @@ CPPLanguageRuntime::FindLibCppStdFunctio
   //    we will obtain the name from this pointer.
   ValueObjectSP member__f_(
       valobj_sp->GetChildMemberWithName(ConstString("__f_"), true));
+
+  if (member__f_) {
+    ValueObjectSP sub_member__f_(
+       member__f_->GetChildMemberWithName(ConstString("__f_"), true));
+
+    if (sub_member__f_)
+        member__f_ = sub_member__f_;
+  }
+
   lldb::addr_t member__f_pointer_value = member__f_->GetValueAsUnsigned(0);
 
   optional_info.member__f_pointer_value = member__f_pointer_value;