Skip to content

[pull] swiftwasm from swift/master #16

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 2 commits into from
Apr 25, 2020
Merged

[pull] swiftwasm from swift/master #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1660bd5
Revert "Revert "[lldb] Update for removal of SourceFile::addImports""
fredriss Apr 25, 2020
a60975d
Merge pull request #1122 from fredriss/revert-the-revert-to-fix-the-fix
fredriss Apr 25, 2020
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
43 changes: 32 additions & 11 deletions lldb/include/lldb/Symbol/SwiftASTContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ enum class IRGenDebugInfoLevel : unsigned;
class CanType;
class DependencyTracker;
class DWARFImporterDelegate;
struct ImplicitImportInfo;
class IRGenOptions;
class NominalTypeDecl;
class SearchPathOptions;
Expand Down Expand Up @@ -595,7 +596,13 @@ class SwiftASTContext : public TypeSystemSwift {
/// \return the ExtraArgs of the ClangImporterOptions.
const std::vector<std::string> &GetClangArguments();

swift::ModuleDecl *CreateModule(const SourceModule &module, Status &error);
/// Attempt to create a Swift module, returning \c nullptr and setting
/// \p error if unsuccessful.
///
/// \param importInfo Information about which modules should be implicitly
/// imported by each file of the module.
swift::ModuleDecl *CreateModule(const SourceModule &module, Status &error,
swift::ImplicitImportInfo importInfo);

// This function should only be called when all search paths
// for all items in a swift::ASTContext have been setup to
Expand Down Expand Up @@ -1064,16 +1071,30 @@ class SwiftASTContext : public TypeSystemSwift {

void SetCachedType(ConstString mangled, const lldb::TypeSP &type_sp) override;

static bool PerformUserImport(SwiftASTContext &swift_ast_context,
SymbolContext &sc,
ExecutionContextScope &exe_scope,
lldb::StackFrameWP &stack_frame_wp,
swift::SourceFile &source_file, Status &error);

static bool PerformAutoImport(SwiftASTContext &swift_ast_context,
SymbolContext &sc,
lldb::StackFrameWP &stack_frame_wp,
swift::SourceFile *source_file, Status &error);
/// Retrieves the modules that need to be implicitly imported in a given
/// execution scope. This includes the modules imported by both the compile
/// unit as well as any imports from previous expression evaluations.
static bool
GetImplicitImports(SwiftASTContext &swift_ast_context, SymbolContext &sc,
ExecutionContextScope &exe_scope,
lldb::StackFrameWP &stack_frame_wp,
llvm::SmallVectorImpl<swift::ModuleDecl *> &modules,
Status &error);

/// Cache the user's imports from a SourceFile in a given execution scope such
/// that they are carried over into future expression evaluations.
static bool CacheUserImports(SwiftASTContext &swift_ast_context,
SymbolContext &sc,
ExecutionContextScope &exe_scope,
lldb::StackFrameWP &stack_frame_wp,
swift::SourceFile &source_file, Status &error);

/// Retrieve the modules imported by the compilation unit.
static bool
GetCompileUnitImports(SwiftASTContext &swift_ast_context, SymbolContext &sc,
lldb::StackFrameWP &stack_frame_wp,
llvm::SmallVectorImpl<swift::ModuleDecl *> &modules,
Status &error);

protected:
/// This map uses the string value of ConstStrings as the key, and the
Expand Down
59 changes: 33 additions & 26 deletions lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,35 +1197,40 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
snprintf(expr_name_buf, sizeof(expr_name_buf), "__lldb_expr_%u",
options.GetExpressionNumber());

// Gather the modules that need to be implicitly imported.
// The Swift stdlib needs to be imported before the SwiftLanguageRuntime can
// be used.
Status implicit_import_error;
llvm::SmallVector<swift::ModuleDecl *, 16> additional_imports;
if (!SwiftASTContext::GetImplicitImports(*swift_ast_context, sc, exe_scope,
stack_frame_wp, additional_imports,
implicit_import_error)) {
return make_error<ModuleImportError>(llvm::Twine("in implicit-import:\n") +
implicit_import_error.AsCString());
}

swift::ImplicitImportInfo importInfo;
importInfo.StdlibKind = swift::ImplicitStdlibKind::Stdlib;
for (auto *module : additional_imports)
importInfo.AdditionalModules.emplace_back(module, /*exported*/ false);

auto module_id = ast_context->getIdentifier(expr_name_buf);
auto &module = *swift::ModuleDecl::create(module_id, *ast_context);
const auto implicit_import_kind =
swift::SourceFile::ImplicitModuleImportKind::Stdlib;
auto &module = *swift::ModuleDecl::create(module_id, *ast_context,
importInfo);

swift::SourceFileKind source_file_kind = swift::SourceFileKind::Library;

if (playground || repl) {
source_file_kind = swift::SourceFileKind::Main;
}

// Create the source file. Note, we disable delayed parsing for the
// swift expression parser.
swift::SourceFile *source_file = new (*ast_context) swift::SourceFile(
module, source_file_kind, buffer_id, implicit_import_kind,
/*Keep tokens*/ false, /*KeepSyntaxTree*/ false,
module, source_file_kind, buffer_id, /*Keep tokens*/ false,
/*KeepSyntaxTree*/ false,
swift::SourceFile::ParsingFlags::DisableDelayedBodies);
module.addFile(*source_file);


// The Swift stdlib needs to be imported before the
// SwiftLanguageRuntime can be used.
Status auto_import_error;
if (!SwiftASTContext::PerformAutoImport(*swift_ast_context, sc,
stack_frame_wp, source_file,
auto_import_error))
return make_error<ModuleImportError>(llvm::Twine("in auto-import:\n") +
auto_import_error.AsCString());

// Swift Modules that rely on shared libraries (not frameworks)
// don't record the link information in the swiftmodule file, so we
// can't really make them work without outside information.
Expand Down Expand Up @@ -1276,6 +1281,13 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
// inserting them in.
swift_ast_context->AddDebuggerClient(external_lookup);

if (swift_ast_context->HasErrors())
return make_error<SwiftASTContextError>();

// Resolve the file's imports, including the implicit ones returned from
// GetImplicitImports.
swift::performImportResolution(*source_file);

if (swift_ast_context->HasErrors())
return make_error<SwiftASTContextError>();

Expand Down Expand Up @@ -1327,21 +1339,16 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
stack_frame_sp.reset();
}

swift::performImportResolution(*source_file);

if (swift_ast_context->HasErrors())
return make_error<SwiftASTContextError>();

// Do the auto-importing after Name Binding, that's when the Imports
// for the source file are figured out.
// Cache the source file's imports such that they're accessible to future
// expression evaluations.
{
std::lock_guard<std::recursive_mutex> global_context_locker(
IRExecutionUnit::GetLLVMGlobalContextMutex());

Status auto_import_error;
if (!SwiftASTContext::PerformUserImport(*swift_ast_context, sc, exe_scope,
stack_frame_wp, *source_file,
auto_import_error)) {
if (!SwiftASTContext::CacheUserImports(*swift_ast_context, sc, exe_scope,
stack_frame_wp, *source_file,
auto_import_error)) {
return make_error<ModuleImportError>(llvm::Twine("in user-import:\n") +
auto_import_error.AsCString());
}
Expand Down
14 changes: 6 additions & 8 deletions lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,18 +566,16 @@ void SwiftREPL::CompleteCode(const std::string &current_code,
repl_module =
swift_ast->GetModule(completion_module_info, error);
if (repl_module == nullptr) {
repl_module = swift_ast->CreateModule(completion_module_info, error);
const swift::SourceFile::ImplicitModuleImportKind implicit_import_kind =
swift::SourceFile::ImplicitModuleImportKind::Stdlib;
swift::ImplicitImportInfo importInfo;
importInfo.StdlibKind = swift::ImplicitStdlibKind::Stdlib;
repl_module = swift_ast->CreateModule(completion_module_info, error,
importInfo);
llvm::Optional<unsigned> bufferID;
swift::SourceFile *repl_source_file = new (*ast)
swift::SourceFile(*repl_module, swift::SourceFileKind::REPL, bufferID,
implicit_import_kind, /*Keep tokens*/false);

// Given this file is empty and only exists to import the standard
// library, we can go ahead and just mark it as having been type checked.
repl_source_file->ASTStage = swift::SourceFile::TypeChecked;
/*Keep tokens*/false);
repl_module->addFile(*repl_source_file);
swift::performImportResolution(*repl_source_file);
m_completion_module_initialized = true;
}
if (repl_module) {
Expand Down
135 changes: 71 additions & 64 deletions lldb/source/Symbol/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3611,8 +3611,9 @@ SwiftASTContext::GetCachedModule(const SourceModule &module) {
return nullptr;
}

swift::ModuleDecl *SwiftASTContext::CreateModule(const SourceModule &module,
Status &error) {
swift::ModuleDecl *
SwiftASTContext::CreateModule(const SourceModule &module, Status &error,
swift::ImplicitImportInfo importInfo) {
VALID_OR_RETURN(nullptr);
if (!module.path.size()) {
error.SetErrorStringWithFormat("invalid module name (empty)");
Expand All @@ -3633,7 +3634,7 @@ swift::ModuleDecl *SwiftASTContext::CreateModule(const SourceModule &module,

swift::Identifier module_id(
ast->getIdentifier(module.path.front().GetCString()));
auto *module_decl = swift::ModuleDecl::create(module_id, *ast);
auto *module_decl = swift::ModuleDecl::create(module_id, *ast, importInfo);
if (!module_decl) {
error.SetErrorStringWithFormat("failed to create module for \"%s\"",
module.path.front().GetCString());
Expand Down Expand Up @@ -8355,14 +8356,12 @@ static void GetNameFromModule(swift::ModuleDecl *module, std::string &result) {
}
}

static bool
LoadOneModule(const SourceModule &module, SwiftASTContext &swift_ast_context,
lldb::StackFrameWP &stack_frame_wp,
llvm::SmallVectorImpl<swift::SourceFile::ImportedModuleDesc>
&additional_imports,
Status &error) {
static swift::ModuleDecl *LoadOneModule(const SourceModule &module,
SwiftASTContext &swift_ast_context,
lldb::StackFrameWP &stack_frame_wp,
Status &error) {
if (!module.path.size())
return false;
return nullptr;

error.Clear();
ConstString toplevel = module.path.front();
Expand Down Expand Up @@ -8401,7 +8400,7 @@ LoadOneModule(const SourceModule &module, SwiftASTContext &swift_ast_context,
toplevel.AsCString(), error.AsCString());

if (!swift_module || swift_ast_context.HasFatalErrors()) {
return false;
return nullptr;
}
}

Expand All @@ -8412,23 +8411,42 @@ LoadOneModule(const SourceModule &module, SwiftASTContext &swift_ast_context,
LOG_PRINTF(LIBLLDB_LOG_EXPRESSIONS, "Imported module %s from {%s}",
module.path.front().AsCString(), ss.GetData());
}
return swift_module;
}

bool SwiftASTContext::GetImplicitImports(
SwiftASTContext &swift_ast_context, SymbolContext &sc,
ExecutionContextScope &exe_scope, lldb::StackFrameWP &stack_frame_wp,
llvm::SmallVectorImpl<swift::ModuleDecl *> &modules, Status &error) {
if (!GetCompileUnitImports(swift_ast_context, sc, stack_frame_wp, modules,
error)) {
return false;
}

auto *persistent_expression_state =
sc.target_sp->GetSwiftPersistentExpressionState(exe_scope);

additional_imports.push_back(swift::SourceFile::ImportedModuleDesc(
std::make_pair(swift::ModuleDecl::AccessPathTy(), swift_module),
swift::SourceFile::ImportOptions()));
// Get the hand-loaded modules from the SwiftPersistentExpressionState.
for (ConstString name : persistent_expression_state->GetHandLoadedModules()) {
SourceModule module_info;
module_info.path.push_back(name);
auto *module = LoadOneModule(module_info, swift_ast_context, stack_frame_wp,
error);
if (!module)
return false;

modules.push_back(module);
}
return true;
}

bool SwiftASTContext::PerformUserImport(SwiftASTContext &swift_ast_context,
SymbolContext &sc,
ExecutionContextScope &exe_scope,
lldb::StackFrameWP &stack_frame_wp,
swift::SourceFile &source_file,
Status &error) {
bool SwiftASTContext::CacheUserImports(SwiftASTContext &swift_ast_context,
SymbolContext &sc,
ExecutionContextScope &exe_scope,
lldb::StackFrameWP &stack_frame_wp,
swift::SourceFile &source_file,
Status &error) {
llvm::SmallString<1> m_description;
llvm::SmallVector<swift::SourceFile::ImportedModuleDesc, 2>
additional_imports;

llvm::SmallVector<swift::ModuleDecl::ImportedModule, 2> parsed_imports;

swift::ModuleDecl::ImportFilter import_filter;
Expand All @@ -8452,62 +8470,51 @@ bool SwiftASTContext::PerformUserImport(SwiftASTContext &swift_ast_context,
"Performing auto import on found module: %s.\n",
module_name.c_str());
if (!LoadOneModule(module_info, swift_ast_context, stack_frame_wp,
additional_imports, error))
error))
return false;

// How do we tell we are in REPL or playground mode?
persistent_expression_state->AddHandLoadedModule(module_const_str);
}
}
}
// Finally get the hand-loaded modules from the
// SwiftPersistentExpressionState and load them into this context:
for (ConstString name : persistent_expression_state->GetHandLoadedModules()) {
SourceModule module_info;
module_info.path.push_back(name);
if (!LoadOneModule(module_info, swift_ast_context, stack_frame_wp,
additional_imports, error))
return false;
}

source_file.addImports(additional_imports);
return true;
}

bool SwiftASTContext::PerformAutoImport(SwiftASTContext &swift_ast_context,
SymbolContext &sc,
lldb::StackFrameWP &stack_frame_wp,
swift::SourceFile *source_file,
Status &error) {
llvm::SmallVector<swift::SourceFile::ImportedModuleDesc, 2>
additional_imports;

// Import the Swift standard library and its dependecies.
bool SwiftASTContext::GetCompileUnitImports(
SwiftASTContext &swift_ast_context, SymbolContext &sc,
lldb::StackFrameWP &stack_frame_wp,
llvm::SmallVectorImpl<swift::ModuleDecl *> &modules, Status &error) {
// Import the Swift standard library and its dependencies.
SourceModule swift_module;
swift_module.path.push_back(ConstString("Swift"));
if (!LoadOneModule(swift_module, swift_ast_context, stack_frame_wp,
additional_imports, error))
auto *stdlib =
LoadOneModule(swift_module, swift_ast_context, stack_frame_wp, error);
if (!stdlib)
return false;

modules.push_back(stdlib);

CompileUnit *compile_unit = sc.comp_unit;
if (compile_unit && compile_unit->GetLanguage() == lldb::eLanguageTypeSwift)
for (const SourceModule &module : compile_unit->GetImportedModules()) {
// When building the Swift stdlib with debug info these will
// show up in "Swift.o", but we already imported them and
// manually importing them will fail.
if (module.path.size() &&
llvm::StringSwitch<bool>(module.path.front().GetStringRef())
.Cases("Swift", "SwiftShims", "Builtin", true)
.Default(false))
continue;
if (!compile_unit || compile_unit->GetLanguage() != lldb::eLanguageTypeSwift)
return true;

if (!LoadOneModule(module, swift_ast_context, stack_frame_wp,
additional_imports, error))
return false;
}
// source_file might be NULL outside of the expression parser, where
// we don't need to notify the source file of additional imports.
if (source_file)
source_file->addImports(additional_imports);
for (const SourceModule &module : compile_unit->GetImportedModules()) {
// When building the Swift stdlib with debug info these will
// show up in "Swift.o", but we already imported them and
// manually importing them will fail.
if (module.path.size() &&
llvm::StringSwitch<bool>(module.path.front().GetStringRef())
.Cases("Swift", "SwiftShims", "Builtin", true)
.Default(false))
continue;

auto *loaded_module =
LoadOneModule(module, swift_ast_context, stack_frame_wp, error);
if (!loaded_module)
return false;

modules.push_back(loaded_module);
}
return true;
}
3 changes: 2 additions & 1 deletion lldb/source/Target/SwiftLanguageRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,8 @@ void SwiftLanguageRuntime::RegisterGlobalError(Target &target, ConstString name,

Status module_creation_error;
swift::ModuleDecl *module_decl =
ast_context->CreateModule(module_info, module_creation_error);
ast_context->CreateModule(module_info, module_creation_error,
/*importInfo*/ {});

if (module_creation_error.Success() && module_decl) {
const bool is_static = false;
Expand Down
Loading