[Lldb-commits] [lldb] r160151 - /lldb/trunk/source/Target/ThreadPlanStepInRange.cpp

[Greg Clayton]

Author: gclayton
Date: Thu Jul 12 19:19:40 2012
New Revision: 160151

URL: http://llvm.org/viewvc/llvm-project?rev=160151&view=rev
Log:
Make the setting for "target.process.thread.step-avoid-regexp" work for inlined functions, not just concrete top level functions.


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

Modified: lldb/trunk/source/Target/ThreadPlanStepInRange.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepInRange.cpp?rev=160151&r1=160150&r2=160151&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepInRange.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepInRange.cpp Thu Jul 12 19:19:40 2012
@@ -242,13 +242,12 @@
         
     if (avoid_regexp_to_use != NULL)
     {
-        SymbolContext sc = frame->GetSymbolContext(eSymbolContextSymbol);
+        SymbolContext sc = frame->GetSymbolContext(eSymbolContextFunction|eSymbolContextBlock|eSymbolContextSymbol);
         if (sc.symbol != NULL)
         {
-            const char *unnamed_symbol = "<UNKNOWN>";
-            const char *sym_name = sc.symbol->GetMangled().GetName().AsCString(unnamed_symbol);
-            if (strcmp (sym_name, unnamed_symbol) != 0)
-               return avoid_regexp_to_use->Execute(sym_name);
+            const char *frame_function_name = sc.GetFunctionName().GetCString();
+            if (frame_function_name)
+               return avoid_regexp_to_use->Execute(frame_function_name);
         }
     }
     return false;