Skip to content

[lldb] Remove unused source range limiting (downstream) #1828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2020
Merged

[lldb] Remove unused source range limiting (downstream) #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions lldb/include/lldb/Expression/IRExecutionUnit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ class IRExecutionUnit : public std::enable_shared_from_this<IRExecutionUnit>,

lldb::ModuleSP GetJITModule();

lldb::ModuleSP CreateJITModule(const char *name,
const FileSpec *limit_file_ptr = NULL,
uint32_t limit_start_line = 0,
uint32_t limit_end_line = 0);
lldb::ModuleSP CreateJITModule(const char *name);

/// Accessor for the mutex that guards LLVM::getGlobalContext()
static std::recursive_mutex &GetLLVMGlobalContextMutex();
Expand Down
17 changes: 0 additions & 17 deletions lldb/include/lldb/Symbol/SymbolFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,6 @@ class SymbolFile : public PluginInterface {
virtual std::vector<lldb::DataBufferSP>
GetASTData(lldb::LanguageType language);

// Used for the REPL to limit source file ranges that are valid within "file".
// Since
// breakpoint setting call fall through, we need to stop the fall through from
// happening
virtual bool SetLimitSourceFileRange(const FileSpec &file,
uint32_t first_line, uint32_t last_line);

struct RegisterInfoResolver {
virtual ~RegisterInfoResolver(); // anchor

Expand All @@ -343,15 +336,6 @@ class SymbolFile : public PluginInterface {
virtual void Dump(Stream &s);

protected:
class SourceRange {
public:
SourceRange(const FileSpec &f, uint32_t first, uint32_t last)
: file(f), first_line(first), last_line(last) {}
FileSpec file;
uint32_t first_line;
uint32_t last_line;
};

void AssertModuleLock();
virtual uint32_t CalculateNumCompileUnits() = 0;
virtual lldb::CompUnitSP ParseCompileUnitAtIndex(uint32_t idx) = 0;
Expand All @@ -368,7 +352,6 @@ class SymbolFile : public PluginInterface {
Symtab *m_symtab = nullptr;
uint32_t m_abilities;
bool m_calculated_abilities;
std::vector<SourceRange> m_limit_source_ranges;

private:
SymbolFile(const SymbolFile &) = delete;
Expand Down
10 changes: 1 addition & 9 deletions lldb/source/Expression/IRExecutionUnit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,10 +1353,7 @@ lldb::ModuleSP IRExecutionUnit::GetJITModule() {
return m_jit_module_wp.lock();
}

lldb::ModuleSP IRExecutionUnit::CreateJITModule(const char *name,
const FileSpec *limit_file_ptr,
uint32_t limit_start_line,
uint32_t limit_end_line) {
lldb::ModuleSP IRExecutionUnit::CreateJITModule(const char *name) {
lldb::ModuleSP jit_module_sp(m_jit_module_wp.lock());
if (jit_module_sp)
return jit_module_sp;
Expand Down Expand Up @@ -1387,11 +1384,6 @@ lldb::ModuleSP IRExecutionUnit::CreateJITModule(const char *name,
jit_file.GetFilename() = const_name;
jit_module_sp->SetFileSpecAndObjectName(jit_file, ConstString());

if (limit_file_ptr)
if (SymbolFile *symbol_file = jit_module_sp->GetSymbolFile())
symbol_file->SetLimitSourceFileRange(
*limit_file_ptr, limit_start_line, limit_end_line);

target->GetImages().Append(jit_module_sp);
return jit_module_sp;
}
Expand Down
14 changes: 1 addition & 13 deletions lldb/source/Plugins/ExpressionParser/Swift/SwiftUserExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,19 +438,7 @@ bool SwiftUserExpression::Parse(DiagnosticManager &diagnostic_manager,
StreamString jit_module_name;
jit_module_name.Printf("%s%u", FunctionName(),
m_options.GetExpressionNumber());
const char *limit_file = m_options.GetPoundLineFilePath();
FileSpec limit_file_spec;
uint32_t limit_start_line = 0;
uint32_t limit_end_line = 0;
if (limit_file) {
limit_file_spec.SetFile(limit_file, FileSpec::Style::native);
limit_start_line = m_options.GetPoundLineLine();
limit_end_line = limit_start_line +
std::count(m_expr_text.begin(), m_expr_text.end(), '\n');
}
m_execution_unit_sp->CreateJITModule(jit_module_name.GetString().data(),
limit_file ? &limit_file_spec : NULL,
limit_start_line, limit_end_line);
m_execution_unit_sp->CreateJITModule(jit_module_name.GetString().data());
}

if (jit_error.Success()) {
Expand Down
10 changes: 0 additions & 10 deletions lldb/source/Symbol/SymbolFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,6 @@ bool SymbolFile::ForceInlineSourceFileCheck() {
return m_objfile_sp->GetType() == ObjectFile::eTypeJIT;
}

bool SymbolFile::SetLimitSourceFileRange(const FileSpec &file,
uint32_t first_line,
uint32_t last_line) {
if (file && first_line <= last_line) {
m_limit_source_ranges.push_back(SourceRange(file, first_line, last_line));
return true;
}
return false;
}

std::vector<lldb::DataBufferSP>
SymbolFile::GetASTData(lldb::LanguageType language) {
// SymbolFile subclasses must add this functionality
Expand Down