Author: gclayton
Date: Fri May 15 16:27:16 2015
New Revision: 237477

URL: http://llvm.org/viewvc/llvm-project?rev=237477&view=rev
Log:
Don't allow infininte recursion when trying to resolve re-exported symbols.

<rdar://problem/20821289>


Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=237477&r1=237476&r2=237477&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri May 15 16:27:16 
2015
@@ -842,6 +842,11 @@ ClangExpressionDeclMap::FindGlobalDataSy
                                         reexport_module_sp = 
target.GetImages().FindFirstModule(reexport_module_spec);
                                     }
                                 }
+                                // Don't allow us to try and resolve a 
re-exported symbol if it is the same
+                                // as the current symbol
+                                if (name == symbol->GetReExportedSymbolName() 
&& module == reexport_module_sp.get())
+                                    return NULL;
+
                                 return FindGlobalDataSymbol(target, 
symbol->GetReExportedSymbolName(), reexport_module_sp.get());
                             }
                         }


_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits

Reply via email to