Author: jdevlieghere
Date: Mon Jan 7 17:35:00 2019
New Revision: 350599
URL: http://llvm.org/viewvc/llvm-project?rev=350599&view=rev
Log:
[SymbolContext] Remove dead code
Removes two methods from SymbolContextList that aren't referenced.
Modified:
lldb/trunk/include/lldb/Symbol/SymbolContext.h
lldb/trunk/source/Symbol/SymbolContext.cpp
Modified: lldb/trunk/include/lldb/Symbol/SymbolContext.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/SymbolContext.h?rev=350599&r1=350598&r2=350599&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/SymbolContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/SymbolContext.h Mon Jan 7 17:35:00 2019
@@ -228,7 +228,7 @@ public:
bool GetAddressRangeFromHereToEndLine(uint32_t end_line, AddressRange &range,
Status &error);
-
+
//------------------------------------------------------------------
/// Find the best global data symbol visible from this context.
///
@@ -465,10 +465,6 @@ public:
bool AppendIfUnique(const SymbolContext &sc, bool
merge_symbol_into_function);
- bool MergeSymbolContextIntoFunctionContext(const SymbolContext &symbol_sc,
- uint32_t start_idx = 0,
- uint32_t stop_idx = UINT32_MAX);
-
uint32_t AppendIfUnique(const SymbolContextList &sc_list,
bool merge_symbol_into_function);
@@ -527,18 +523,6 @@ public:
return m_symbol_contexts[idx];
}
- //------------------------------------------------------------------
- /// Get accessor for the last symbol context in the list.
- ///
- /// @param[out] sc
- /// A reference to the symbol context to fill in.
- ///
- /// @return
- /// Returns \b true if \a sc was filled in, \b false if the
- /// list is empty.
- //------------------------------------------------------------------
- bool GetLastContext(SymbolContext &sc) const;
-
bool RemoveContextAtIndex(size_t idx);
//------------------------------------------------------------------
Modified: lldb/trunk/source/Symbol/SymbolContext.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolContext.cpp?rev=350599&r1=350598&r2=350599&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/SymbolContext.cpp (original)
+++ lldb/trunk/source/Symbol/SymbolContext.cpp Mon Jan 7 17:35:00 2019
@@ -796,14 +796,14 @@ bool SymbolContext::GetAddressRangeFromH
const Symbol *
SymbolContext::FindBestGlobalDataSymbol(const ConstString &name, Status
&error) {
error.Clear();
-
+
if (!target_sp) {
return nullptr;
}
-
+
Target &target = *target_sp;
Module *module = module_sp.get();
-
+
auto ProcessMatches = [this, &name, &target, module]
(SymbolContextList &sc_list, Status &error) -> const Symbol* {
llvm::SmallVector<const Symbol *, 1> external_symbols;
@@ -815,7 +815,7 @@ SymbolContext::FindBestGlobalDataSymbol(
if (sym_ctx.symbol) {
const Symbol *symbol = sym_ctx.symbol;
const Address sym_address = symbol->GetAddress();
-
+
if (sym_address.IsValid()) {
switch (symbol->GetType()) {
case eSymbolTypeData:
@@ -860,12 +860,12 @@ SymbolContext::FindBestGlobalDataSymbol(
if (name == symbol->GetReExportedSymbolName() &&
module == reexport_module_sp.get())
return nullptr;
-
+
return FindBestGlobalDataSymbol(
symbol->GetReExportedSymbolName(), error);
}
} break;
-
+
case eSymbolTypeCode: // We already lookup functions elsewhere
case eSymbolTypeVariable:
case eSymbolTypeLocal:
@@ -893,7 +893,7 @@ SymbolContext::FindBestGlobalDataSymbol(
}
}
}
-
+
if (external_symbols.size() > 1) {
StreamString ss;
ss.Printf("Multiple external symbols found for '%s'\n",
name.AsCString());
@@ -920,32 +920,32 @@ SymbolContext::FindBestGlobalDataSymbol(
return nullptr;
}
};
-
+
if (module) {
SymbolContextList sc_list;
module->FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list);
const Symbol *const module_symbol = ProcessMatches(sc_list, error);
-
+
if (!error.Success()) {
return nullptr;
} else if (module_symbol) {
return module_symbol;
}
}
-
+
{
SymbolContextList sc_list;
target.GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeAny,
sc_list);
const Symbol *const target_symbol = ProcessMatches(sc_list, error);
-
+
if (!error.Success()) {
return nullptr;
} else if (target_symbol) {
return target_symbol;
}
}
-
+
return nullptr; // no error; we just didn't find anything
}
@@ -1280,41 +1280,6 @@ bool SymbolContextList::AppendIfUnique(c
return true;
}
-bool SymbolContextList::MergeSymbolContextIntoFunctionContext(
- const SymbolContext &symbol_sc, uint32_t start_idx, uint32_t stop_idx) {
- if (symbol_sc.symbol != nullptr && symbol_sc.comp_unit == nullptr &&
- symbol_sc.function == nullptr && symbol_sc.block == nullptr &&
- !symbol_sc.line_entry.IsValid()) {
- if (symbol_sc.symbol->ValueIsAddress()) {
- const size_t end = std::min<size_t>(m_symbol_contexts.size(), stop_idx);
- for (size_t i = start_idx; i < end; ++i) {
- const SymbolContext &function_sc = m_symbol_contexts[i];
- // Don't merge symbols into inlined function symbol contexts
- if (function_sc.block &&
function_sc.block->GetContainingInlinedBlock())
- continue;
-
- if (function_sc.function) {
- if (function_sc.function->GetAddressRange().GetBaseAddress() ==
- symbol_sc.symbol->GetAddressRef()) {
- // Do we already have a function with this symbol?
- if (function_sc.symbol == symbol_sc.symbol)
- return true; // Already have a symbol context with this symbol,
- // return true
-
- if (function_sc.symbol == nullptr) {
- // We successfully merged this symbol into an existing symbol
- // context
- m_symbol_contexts[i].symbol = symbol_sc.symbol;
- return true;
- }
- }
- }
- }
- }
- }
- return false;
-}
-
void SymbolContextList::Clear() { m_symbol_contexts.clear(); }
void SymbolContextList::Dump(Stream *s, Target *target) const {
@@ -1339,14 +1304,6 @@ bool SymbolContextList::GetContextAtInde
return true;
}
return false;
-}
-
-bool SymbolContextList::GetLastContext(SymbolContext &sc) const {
- if (!m_symbol_contexts.empty()) {
- sc = m_symbol_contexts.back();
- return true;
- }
- return false;
}
bool SymbolContextList::RemoveContextAtIndex(size_t idx) {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
