maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Expression eval lookup speedup by not returning methods in ManualDWARFIndex::GetFunctions 

Summary:
This change is connected with
https://reviews.llvm.org/D69843

In large codebases, we sometimes see Module::FindFunctions (when called from
ClangExpressionDeclMap::FindExternalVisibleDecls) returning huge amounts of
functions.

In current fix I trying to return only function_fullnames from ManualDWARFIndex::GetFunctions when eFunctionNameTypeFull is passed as argument.

Reviewers: labath, jarin, aprantl

Reviewed By: labath

Subscribers: shafik, clayborg, teemperor, arphaman, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D70846
This commit is contained in:
Levon Ter-Grigoryan 2020-01-14 14:33:43 +01:00 committed by Pavel Labath
parent 77cc690bae
commit a705cf1acb
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lldb/packages/Python/lldbsuite/test/lang/cpp/printf/TestPrintf.py
View File

@ -1,7 +1,8 @@
from lldbsuite.test import lldbinline from lldbsuite.test import lldbinline, lldbplatformutil
from lldbsuite.test import decorators from lldbsuite.test import decorators
lldbinline.MakeInlineTest( lldbinline.MakeInlineTest(
__file__, globals(), [ __file__, globals(), [
decorators.expectedFailureAll( decorators.expectedFailureAll(
bugnumber="llvm.org/PR36715")]) bugnumber="llvm.org/PR36715",
oslist=lldbplatformutil.getDarwinOSTriples()+['windows'])])

6
lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
View File

@ -1254,9 +1254,9 @@ void ClangExpressionDeclMap::LookupFunction(NameSearchContext &context,
// TODO Fix FindFunctions so that it doesn't return // TODO Fix FindFunctions so that it doesn't return
// instance methods for eFunctionNameTypeBase. // instance methods for eFunctionNameTypeBase.
target->GetImages().FindFunctions(name, eFunctionNameTypeFull, target->GetImages().FindFunctions(
include_symbols, include_inlines, name, eFunctionNameTypeFull | eFunctionNameTypeBase, include_symbols,
sc_list); include_inlines, sc_list);
} }
// If we found more than one function, see if we can use the frame's decl // If we found more than one function, see if we can use the frame's decl

2
lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
View File

@ -401,8 +401,6 @@ void ManualDWARFIndex::GetFunctions(ConstString name, SymbolFileDWARF &dwarf,
if (name_type_mask & eFunctionNameTypeFull) { if (name_type_mask & eFunctionNameTypeFull) {
DIEArray offsets; DIEArray offsets;
m_set.function_basenames.Find(name, offsets);
m_set.function_methods.Find(name, offsets);
m_set.function_fullnames.Find(name, offsets); m_set.function_fullnames.Find(name, offsets);
for (const DIERef &die_ref: offsets) { for (const DIERef &die_ref: offsets) {
DWARFDIE die = dwarf.GetDIE(die_ref); DWARFDIE die = dwarf.GetDIE(die_ref);

20
lldb/test/Shell/SymbolFile/DWARF/find-basic-function.cpp
View File

@ -21,7 +21,7 @@
// RUN: lldb-test symbols --name=foo --find=function --function-flags=method %t | \ // RUN: lldb-test symbols --name=foo --find=function --function-flags=method %t | \
// RUN: FileCheck --check-prefix=METHOD %s // RUN: FileCheck --check-prefix=METHOD %s
// RUN: lldb-test symbols --name=foo --find=function --function-flags=full %t | \ // RUN: lldb-test symbols --name=foo --find=function --function-flags=full %t | \
// RUN: FileCheck --check-prefix=FULL %s // RUN: FileCheck --check-prefix=FULL-APPLE %s
// RUN: lldb-test symbols --name=_Z3fooi --find=function --function-flags=full %t | \ // RUN: lldb-test symbols --name=_Z3fooi --find=function --function-flags=full %t | \
// RUN: FileCheck --check-prefix=FULL-MANGLED %s // RUN: FileCheck --check-prefix=FULL-MANGLED %s
// RUN: lldb-test symbols --name=foo --context=context --find=function --function-flags=base %t | \ // RUN: lldb-test symbols --name=foo --context=context --find=function --function-flags=base %t | \
@ -55,14 +55,16 @@
// METHOD-DAG: name = "sbar::foo(int)", mangled = "_ZN4sbar3fooEi" // METHOD-DAG: name = "sbar::foo(int)", mangled = "_ZN4sbar3fooEi"
// METHOD-DAG: name = "ffbar()::sbaz::foo()", mangled = "_ZZ5ffbarvEN4sbaz3fooEv" // METHOD-DAG: name = "ffbar()::sbaz::foo()", mangled = "_ZZ5ffbarvEN4sbaz3fooEv"
// FULL: Found 7 functions: // FULL-APPLE: Found 7 functions:
// FULL-DAG: name = "foo()", mangled = "_Z3foov" // FULL-APPLE-DAG: name = "foo()", mangled = "_Z3foov"
// FULL-DAG: name = "foo(int)", mangled = "_Z3fooi" // FULL-APPLE-DAG: name = "foo(int)", mangled = "_Z3fooi"
// FULL-DAG: name = "bar::foo()", mangled = "_ZN3bar3fooEv" // FULL-APPLE-DAG: name = "bar::foo()", mangled = "_ZN3bar3fooEv"
// FULL-DAG: name = "bar::baz::foo()", mangled = "_ZN3bar3baz3fooEv" // FULL-APPLE-DAG: name = "bar::baz::foo()", mangled = "_ZN3bar3baz3fooEv"
// FULL-DAG: name = "sbar::foo()", mangled = "_ZN4sbar3fooEv" // FULL-APPLE-DAG: name = "sbar::foo()", mangled = "_ZN4sbar3fooEv"
// FULL-DAG: name = "sbar::foo(int)", mangled = "_ZN4sbar3fooEi" // FULL-APPLE-DAG: name = "sbar::foo(int)", mangled = "_ZN4sbar3fooEi"
// FULL-DAG: name = "ffbar()::sbaz::foo()", mangled = "_ZZ5ffbarvEN4sbaz3fooEv" // FULL-APPLE-DAG: name = "ffbar()::sbaz::foo()", mangled = "_ZZ5ffbarvEN4sbaz3fooEv"
// FULL: Found 0 functions:
// FULL-MANGLED: Found 1 functions: // FULL-MANGLED: Found 1 functions:
// FULL-MANGLED-DAG: name = "foo(int)", mangled = "_Z3fooi" // FULL-MANGLED-DAG: name = "foo(int)", mangled = "_Z3fooi"