Skip to content

Commit 94f1132

Browse files
authored
Merge pull request #1307 from hamishknight/pipeline-parse
2 parents 15c0dbb + b47464f commit 94f1132

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,10 +1224,9 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
12241224

12251225
// Create the source file. Note, we disable delayed parsing for the
12261226
// swift expression parser.
1227-
swift::SourceFile *source_file = new (*ast_context) swift::SourceFile(
1228-
module, source_file_kind, buffer_id, /*Keep tokens*/ false,
1229-
/*KeepSyntaxTree*/ false,
1230-
swift::SourceFile::ParsingFlags::DisableDelayedBodies);
1227+
swift::SourceFile *source_file = new (*ast_context)
1228+
swift::SourceFile(module, source_file_kind, buffer_id,
1229+
swift::SourceFile::ParsingFlags::DisableDelayedBodies);
12311230
module.addFile(*source_file);
12321231

12331232
// Swift Modules that rely on shared libraries (not frameworks)

lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,9 +571,8 @@ void SwiftREPL::CompleteCode(const std::string &current_code,
571571
repl_module = swift_ast->CreateModule(completion_module_info, error,
572572
importInfo);
573573
llvm::Optional<unsigned> bufferID;
574-
swift::SourceFile *repl_source_file = new (*ast)
575-
swift::SourceFile(*repl_module, swift::SourceFileKind::Main, bufferID,
576-
/*Keep tokens*/false);
574+
swift::SourceFile *repl_source_file = new (*ast) swift::SourceFile(
575+
*repl_module, swift::SourceFileKind::Main, bufferID);
577576
repl_module->addFile(*repl_source_file);
578577
swift::performImportResolution(*repl_source_file);
579578
m_completion_module_initialized = true;

0 commit comments

Comments
 (0)