Author: jingham
Date: Fri Sep 7 11:43:04 2018
New Revision: 341690
URL: http://llvm.org/viewvc/llvm-project?rev=341690&view=rev
Log:
NFC: Move Searcher::Depth into lldb-enumerations as SearchDepth.
In a subsequent commit, I will need to expose the search depth
to the SB API's, so I'm moving this define into lldb-enumerations
where it will get added to the lldb module.
Modified:
lldb/trunk/include/lldb/Breakpoint/BreakpointResolverAddress.h
lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileLine.h
lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileRegex.h
lldb/trunk/include/lldb/Breakpoint/BreakpointResolverName.h
lldb/trunk/include/lldb/Core/AddressResolverFileLine.h
lldb/trunk/include/lldb/Core/AddressResolverName.h
lldb/trunk/include/lldb/Core/FileLineResolver.h
lldb/trunk/include/lldb/Core/SearchFilter.h
lldb/trunk/include/lldb/Interpreter/CommandCompletions.h
lldb/trunk/include/lldb/lldb-enumerations.h
lldb/trunk/source/Breakpoint/BreakpointResolverAddress.cpp
lldb/trunk/source/Breakpoint/BreakpointResolverFileLine.cpp
lldb/trunk/source/Breakpoint/BreakpointResolverFileRegex.cpp
lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp
lldb/trunk/source/Commands/CommandCompletions.cpp
lldb/trunk/source/Core/AddressResolverFileLine.cpp
lldb/trunk/source/Core/AddressResolverName.cpp
lldb/trunk/source/Core/FileLineResolver.cpp
lldb/trunk/source/Core/SearchFilter.cpp
lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
lldb/trunk/source/Target/LanguageRuntime.cpp
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointResolverAddress.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointResolverAddress.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/BreakpointResolverAddress.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointResolverAddress.h Fri Sep 7
11:43:04 2018
@@ -51,7 +51,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
void GetDescription(Stream *s) override;
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileLine.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileLine.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileLine.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileLine.h Fri Sep 7
11:43:04 2018
@@ -45,7 +45,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
void GetDescription(Stream *s) override;
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileRegex.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileRegex.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileRegex.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointResolverFileRegex.h Fri Sep 7
11:43:04 2018
@@ -47,7 +47,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
void GetDescription(Stream *s) override;
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointResolverName.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointResolverName.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/BreakpointResolverName.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointResolverName.h Fri Sep 7
11:43:04 2018
@@ -65,7 +65,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
void GetDescription(Stream *s) override;
Modified: lldb/trunk/include/lldb/Core/AddressResolverFileLine.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/AddressResolverFileLine.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/AddressResolverFileLine.h (original)
+++ lldb/trunk/include/lldb/Core/AddressResolverFileLine.h Fri Sep 7 11:43:04
2018
@@ -47,7 +47,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
void GetDescription(Stream *s) override;
Modified: lldb/trunk/include/lldb/Core/AddressResolverName.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/AddressResolverName.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/AddressResolverName.h (original)
+++ lldb/trunk/include/lldb/Core/AddressResolverName.h Fri Sep 7 11:43:04 2018
@@ -52,7 +52,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
void GetDescription(Stream *s) override;
Modified: lldb/trunk/include/lldb/Core/FileLineResolver.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FileLineResolver.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FileLineResolver.h (original)
+++ lldb/trunk/include/lldb/Core/FileLineResolver.h Fri Sep 7 11:43:04 2018
@@ -48,7 +48,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
void GetDescription(Stream *s) override;
Modified: lldb/trunk/include/lldb/Core/SearchFilter.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/SearchFilter.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/SearchFilter.h (original)
+++ lldb/trunk/include/lldb/Core/SearchFilter.h Fri Sep 7 11:43:04 2018
@@ -70,15 +70,6 @@ public:
eCallbackReturnPop // Pop one level up and continue iterating
} CallbackReturn;
- typedef enum {
- eDepthTarget,
- eDepthModule,
- eDepthCompUnit,
- eDepthFunction,
- eDepthBlock,
- eDepthAddress
- } Depth;
-
Searcher();
virtual ~Searcher();
@@ -87,7 +78,7 @@ public:
SymbolContext &context, Address *addr,
bool complete) = 0;
- virtual Depth GetDepth() = 0;
+ virtual lldb::SearchDepth GetDepth() = 0;
//------------------------------------------------------------------
/// Prints a canonical description for the searcher to the stream \a s.
Modified: lldb/trunk/include/lldb/Interpreter/CommandCompletions.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandCompletions.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandCompletions.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandCompletions.h Fri Sep 7
11:43:04 2018
@@ -116,7 +116,7 @@ public:
CallbackReturn SearchCallback(SearchFilter &filter, SymbolContext &context,
Address *addr, bool complete) override = 0;
- Depth GetDepth() override = 0;
+ lldb::SearchDepth GetDepth() override = 0;
virtual size_t DoCompletion(SearchFilter *filter) = 0;
@@ -136,7 +136,7 @@ public:
SourceFileCompleter(CommandInterpreter &interpreter,
bool include_support_files, CompletionRequest
&request);
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
Searcher::CallbackReturn SearchCallback(SearchFilter &filter,
SymbolContext &context,
@@ -162,7 +162,7 @@ public:
ModuleCompleter(CommandInterpreter &interpreter,
CompletionRequest &request);
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
Searcher::CallbackReturn SearchCallback(SearchFilter &filter,
SymbolContext &context,
@@ -186,7 +186,7 @@ public:
SymbolCompleter(CommandInterpreter &interpreter,
CompletionRequest &request);
- Searcher::Depth GetDepth() override;
+ lldb::SearchDepth GetDepth() override;
Searcher::CallbackReturn SearchCallback(SearchFilter &filter,
SymbolContext &context,
Modified: lldb/trunk/include/lldb/lldb-enumerations.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-enumerations.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-enumerations.h (original)
+++ lldb/trunk/include/lldb/lldb-enumerations.h Fri Sep 7 11:43:04 2018
@@ -256,6 +256,16 @@ enum ExpressionResults {
eExpressionStoppedForDebug
};
+enum SearchDepth {
+ eSearchDepthTarget = 0,
+ eSearchDepthModule,
+ eSearchDepthCompUnit,
+ eSearchDepthFunction,
+ eSearchDepthBlock,
+ eSearchDepthAddress,
+ kNumSearchDepthKinds = eSearchDepthAddress
+};
+
//----------------------------------------------------------------------
// Connection Status Types
//----------------------------------------------------------------------
Modified: lldb/trunk/source/Breakpoint/BreakpointResolverAddress.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointResolverAddress.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/BreakpointResolverAddress.cpp (original)
+++ lldb/trunk/source/Breakpoint/BreakpointResolverAddress.cpp Fri Sep 7
11:43:04 2018
@@ -173,8 +173,8 @@ BreakpointResolverAddress::SearchCallbac
return Searcher::eCallbackReturnStop;
}
-Searcher::Depth BreakpointResolverAddress::GetDepth() {
- return Searcher::eDepthTarget;
+lldb::SearchDepth BreakpointResolverAddress::GetDepth() {
+ return lldb::eSearchDepthTarget;
}
void BreakpointResolverAddress::GetDescription(Stream *s) {
Modified: lldb/trunk/source/Breakpoint/BreakpointResolverFileLine.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointResolverFileLine.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/BreakpointResolverFileLine.cpp (original)
+++ lldb/trunk/source/Breakpoint/BreakpointResolverFileLine.cpp Fri Sep 7
11:43:04 2018
@@ -257,8 +257,8 @@ BreakpointResolverFileLine::SearchCallba
return Searcher::eCallbackReturnContinue;
}
-Searcher::Depth BreakpointResolverFileLine::GetDepth() {
- return Searcher::eDepthModule;
+lldb::SearchDepth BreakpointResolverFileLine::GetDepth() {
+ return lldb::eSearchDepthModule;
}
void BreakpointResolverFileLine::GetDescription(Stream *s) {
Modified: lldb/trunk/source/Breakpoint/BreakpointResolverFileRegex.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointResolverFileRegex.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/BreakpointResolverFileRegex.cpp (original)
+++ lldb/trunk/source/Breakpoint/BreakpointResolverFileRegex.cpp Fri Sep 7
11:43:04 2018
@@ -157,8 +157,8 @@ BreakpointResolverFileRegex::SearchCallb
return Searcher::eCallbackReturnContinue;
}
-Searcher::Depth BreakpointResolverFileRegex::GetDepth() {
- return Searcher::eDepthCompUnit;
+lldb::SearchDepth BreakpointResolverFileRegex::GetDepth() {
+ return lldb::eSearchDepthCompUnit;
}
void BreakpointResolverFileRegex::GetDescription(Stream *s) {
Modified: lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp (original)
+++ lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp Fri Sep 7 11:43:04
2018
@@ -396,8 +396,8 @@ BreakpointResolverName::SearchCallback(S
return Searcher::eCallbackReturnContinue;
}
-Searcher::Depth BreakpointResolverName::GetDepth() {
- return Searcher::eDepthModule;
+lldb::SearchDepth BreakpointResolverName::GetDepth() {
+ return lldb::eSearchDepthModule;
}
void BreakpointResolverName::GetDescription(Stream *s) {
Modified: lldb/trunk/source/Commands/CommandCompletions.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandCompletions.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandCompletions.cpp (original)
+++ lldb/trunk/source/Commands/CommandCompletions.cpp Fri Sep 7 11:43:04 2018
@@ -366,8 +366,8 @@ CommandCompletions::SourceFileCompleter:
m_dir_name = partial_spec.GetDirectory().GetCString();
}
-Searcher::Depth CommandCompletions::SourceFileCompleter::GetDepth() {
- return eDepthCompUnit;
+lldb::SearchDepth CommandCompletions::SourceFileCompleter::GetDepth() {
+ return lldb::eSearchDepthCompUnit;
}
Searcher::CallbackReturn
@@ -458,8 +458,8 @@ CommandCompletions::SymbolCompleter::Sym
m_regex.Compile(regex_str);
}
-Searcher::Depth CommandCompletions::SymbolCompleter::GetDepth() {
- return eDepthModule;
+lldb::SearchDepth CommandCompletions::SymbolCompleter::GetDepth() {
+ return lldb::eSearchDepthModule;
}
Searcher::CallbackReturn CommandCompletions::SymbolCompleter::SearchCallback(
@@ -506,8 +506,8 @@ CommandCompletions::ModuleCompleter::Mod
m_dir_name = partial_spec.GetDirectory().GetCString();
}
-Searcher::Depth CommandCompletions::ModuleCompleter::GetDepth() {
- return eDepthModule;
+lldb::SearchDepth CommandCompletions::ModuleCompleter::GetDepth() {
+ return lldb::eSearchDepthModule;
}
Searcher::CallbackReturn CommandCompletions::ModuleCompleter::SearchCallback(
Modified: lldb/trunk/source/Core/AddressResolverFileLine.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/AddressResolverFileLine.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Core/AddressResolverFileLine.cpp (original)
+++ lldb/trunk/source/Core/AddressResolverFileLine.cpp Fri Sep 7 11:43:04 2018
@@ -78,8 +78,8 @@ AddressResolverFileLine::SearchCallback(
return Searcher::eCallbackReturnContinue;
}
-Searcher::Depth AddressResolverFileLine::GetDepth() {
- return Searcher::eDepthCompUnit;
+lldb::SearchDepth AddressResolverFileLine::GetDepth() {
+ return lldb::eSearchDepthCompUnit;
}
void AddressResolverFileLine::GetDescription(Stream *s) {
Modified: lldb/trunk/source/Core/AddressResolverName.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/AddressResolverName.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Core/AddressResolverName.cpp (original)
+++ lldb/trunk/source/Core/AddressResolverName.cpp Fri Sep 7 11:43:04 2018
@@ -186,8 +186,8 @@ AddressResolverName::SearchCallback(Sear
return Searcher::eCallbackReturnContinue;
}
-Searcher::Depth AddressResolverName::GetDepth() {
- return Searcher::eDepthModule;
+lldb::SearchDepth AddressResolverName::GetDepth() {
+ return lldb::eSearchDepthModule;
}
void AddressResolverName::GetDescription(Stream *s) {
Modified: lldb/trunk/source/Core/FileLineResolver.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FileLineResolver.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Core/FileLineResolver.cpp (original)
+++ lldb/trunk/source/Core/FileLineResolver.cpp Fri Sep 7 11:43:04 2018
@@ -68,8 +68,8 @@ FileLineResolver::SearchCallback(SearchF
return Searcher::eCallbackReturnContinue;
}
-Searcher::Depth FileLineResolver::GetDepth() {
- return Searcher::eDepthCompUnit;
+lldb::SearchDepth FileLineResolver::GetDepth() {
+ return lldb::eSearchDepthCompUnit;
}
void FileLineResolver::GetDescription(Stream *s) {
Modified: lldb/trunk/source/Core/SearchFilter.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/SearchFilter.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Core/SearchFilter.cpp (original)
+++ lldb/trunk/source/Core/SearchFilter.cpp Fri Sep 7 11:43:04 2018
@@ -207,7 +207,7 @@ void SearchFilter::Search(Searcher &sear
return;
empty_sc.target_sp = m_target_sp;
- if (searcher.GetDepth() == Searcher::eDepthTarget)
+ if (searcher.GetDepth() == lldb::eSearchDepthTarget)
searcher.SearchCallback(*this, empty_sc, nullptr, false);
else
DoModuleIteration(empty_sc, searcher);
@@ -220,7 +220,7 @@ void SearchFilter::SearchInModuleList(Se
return;
empty_sc.target_sp = m_target_sp;
- if (searcher.GetDepth() == Searcher::eDepthTarget)
+ if (searcher.GetDepth() == lldb::eSearchDepthTarget)
searcher.SearchCallback(*this, empty_sc, nullptr, false);
else {
std::lock_guard<std::recursive_mutex> guard(modules.GetMutex());
@@ -247,9 +247,9 @@ SearchFilter::DoModuleIteration(const ll
Searcher::CallbackReturn
SearchFilter::DoModuleIteration(const SymbolContext &context,
Searcher &searcher) {
- if (searcher.GetDepth() >= Searcher::eDepthModule) {
+ if (searcher.GetDepth() >= lldb::eSearchDepthModule) {
if (context.module_sp) {
- if (searcher.GetDepth() == Searcher::eDepthModule) {
+ if (searcher.GetDepth() == lldb::eSearchDepthModule) {
SymbolContext matchingContext(context.module_sp.get());
searcher.SearchCallback(*this, matchingContext, nullptr, false);
} else {
@@ -267,7 +267,7 @@ SearchFilter::DoModuleIteration(const Sy
if (!ModulePasses(module_sp))
continue;
- if (searcher.GetDepth() == Searcher::eDepthModule) {
+ if (searcher.GetDepth() == lldb::eSearchDepthModule) {
SymbolContext matchingContext(m_target_sp, module_sp);
Searcher::CallbackReturn shouldContinue =
@@ -301,7 +301,7 @@ SearchFilter::DoCUIteration(const Module
if (!CompUnitPasses(*(cu_sp.get())))
continue;
- if (searcher.GetDepth() == Searcher::eDepthCompUnit) {
+ if (searcher.GetDepth() == lldb::eSearchDepthCompUnit) {
SymbolContext matchingContext(m_target_sp, module_sp, cu_sp.get());
shouldContinue =
@@ -421,7 +421,7 @@ void SearchFilterByModule::Search(Search
if (!m_target_sp)
return;
- if (searcher.GetDepth() == Searcher::eDepthTarget) {
+ if (searcher.GetDepth() == lldb::eSearchDepthTarget) {
SymbolContext empty_sc;
empty_sc.target_sp = m_target_sp;
searcher.SearchCallback(*this, empty_sc, nullptr, false);
@@ -570,7 +570,7 @@ void SearchFilterByModuleList::Search(Se
if (!m_target_sp)
return;
- if (searcher.GetDepth() == Searcher::eDepthTarget) {
+ if (searcher.GetDepth() == lldb::eSearchDepthTarget) {
SymbolContext empty_sc;
empty_sc.target_sp = m_target_sp;
searcher.SearchCallback(*this, empty_sc, nullptr, false);
@@ -773,7 +773,7 @@ void SearchFilterByModuleListAndCU::Sear
if (!m_target_sp)
return;
- if (searcher.GetDepth() == Searcher::eDepthTarget) {
+ if (searcher.GetDepth() == lldb::eSearchDepthTarget) {
SymbolContext empty_sc;
empty_sc.target_sp = m_target_sp;
searcher.SearchCallback(*this, empty_sc, nullptr, false);
@@ -797,7 +797,7 @@ void SearchFilterByModuleListAndCU::Sear
SymbolContext matchingContext(m_target_sp, module_sp);
Searcher::CallbackReturn shouldContinue;
- if (searcher.GetDepth() == Searcher::eDepthModule) {
+ if (searcher.GetDepth() == lldb::eSearchDepthModule) {
shouldContinue = DoModuleIteration(matchingContext, searcher);
if (shouldContinue == Searcher::eCallbackReturnStop)
return;
Modified:
lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
---
lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
(original)
+++
lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
Fri Sep 7 11:43:04 2018
@@ -74,7 +74,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override { return Searcher::eDepthModule; }
+ lldb::SearchDepth GetDepth() override { return lldb::eSearchDepthModule; }
lldb::BreakpointResolverSP
CopyForBreakpoint(Breakpoint &breakpoint) override {
@@ -124,7 +124,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override { return Searcher::eDepthModule; }
+ lldb::SearchDepth GetDepth() override { return lldb::eSearchDepthModule; }
lldb::BreakpointResolverSP
CopyForBreakpoint(Breakpoint &breakpoint) override {
@@ -269,7 +269,7 @@ public:
SymbolContext &context, Address
*addr,
bool containing) override;
- Searcher::Depth GetDepth() override { return Searcher::eDepthModule; }
+ lldb::SearchDepth GetDepth() override { return lldb::eSearchDepthModule; }
lldb::BreakpointResolverSP
CopyForBreakpoint(Breakpoint &breakpoint) override {
Modified: lldb/trunk/source/Target/LanguageRuntime.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/LanguageRuntime.cpp?rev=341690&r1=341689&r2=341690&view=diff
==============================================================================
--- lldb/trunk/source/Target/LanguageRuntime.cpp (original)
+++ lldb/trunk/source/Target/LanguageRuntime.cpp Fri Sep 7 11:43:04 2018
@@ -125,11 +125,11 @@ public:
return eCallbackReturnStop;
}
- Searcher::Depth GetDepth() override {
+ lldb::SearchDepth GetDepth() override {
if (SetActualResolver())
return m_actual_resolver_sp->GetDepth();
else
- return eDepthTarget;
+ return lldb::eSearchDepthTarget;
}
void GetDescription(Stream *s) override {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
