Skip to content

Commit 0bb2642

Browse files
CodaFiadrian-prantl
authored andcommitted
[NFC] Hide SourceFile::Decls
Supports swiftlang/swift#28995 (cherry picked from commit f64e25b)
1 parent 84a354e commit 0bb2642

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ bool SwiftASTManipulator::RewriteResult() {
540540
// First step, walk the function body converting returns to assignments to
541541
// temp variables + return:
542542

543-
for (swift::Decl *decl : m_source_file.Decls) {
543+
for (swift::Decl *decl : m_source_file.getTopLevelDecls()) {
544544
if (auto top_level_code_decl =
545545
llvm::dyn_cast<swift::TopLevelCodeDecl>(decl)) {
546546
return_finder.SetDeclContext(top_level_code_decl);
@@ -551,8 +551,8 @@ bool SwiftASTManipulator::RewriteResult() {
551551
// Second step, fetch the last expression, and if it is non-null, set it to
552552
// a temp result as well:
553553

554-
if (!m_source_file.Decls.empty()) {
555-
swift::Decl *last_decl = *(m_source_file.Decls.end() - 1);
554+
if (!m_source_file.getTopLevelDecls().empty()) {
555+
swift::Decl *last_decl = *(m_source_file.getTopLevelDecls().end() - 1);
556556

557557
if (auto last_top_level_code_decl =
558558
llvm::dyn_cast<swift::TopLevelCodeDecl>(last_decl)) {
@@ -707,7 +707,7 @@ void SwiftASTManipulator::FindVariableDeclarations(
707707
};
708708

709709
if (m_repl) {
710-
for (swift::Decl *decl : m_source_file.Decls) {
710+
for (swift::Decl *decl : m_source_file.getTopLevelDecls()) {
711711
if (swift::VarDecl *var_decl = llvm::dyn_cast<swift::VarDecl>(decl)) {
712712
if (!var_decl->getName().str().startswith("$")) {
713713
register_one_var(var_decl);
@@ -750,7 +750,7 @@ void SwiftASTManipulator::FindNonVariableDeclarations(
750750
if (!m_repl)
751751
return; // we don't do this for non-REPL expressions... yet
752752

753-
for (swift::Decl *decl : m_source_file.Decls) {
753+
for (swift::Decl *decl : m_source_file.getTopLevelDecls()) {
754754
if (swift::ValueDecl *value_decl = llvm::dyn_cast<swift::ValueDecl>(decl)) {
755755
if (!llvm::isa<swift::VarDecl>(value_decl) && value_decl->hasName()) {
756756
non_variables.push_back(value_decl);
@@ -1078,9 +1078,8 @@ bool SwiftASTManipulator::AddExternalVariables(
10781078

10791079
redirected_var_decl->setImplicit(true);
10801080

1081-
m_source_file.Decls.insert(m_source_file.Decls.begin(), top_level_code);
1082-
m_source_file.Decls.insert(m_source_file.Decls.begin(),
1083-
redirected_var_decl);
1081+
m_source_file.addTopLevelDecl(top_level_code);
1082+
m_source_file.addTopLevelDecl(redirected_var_decl);
10841083

10851084
variable.m_decl = redirected_var_decl;
10861085

@@ -1355,7 +1354,7 @@ swift::ValueDecl *SwiftASTManipulator::MakeGlobalTypealias(
13551354
if (make_private) {
13561355
type_alias_decl->overwriteAccess(swift::AccessLevel::Private);
13571356
}
1358-
m_source_file.Decls.push_back(type_alias_decl);
1357+
m_source_file.addTopLevelDecl(type_alias_decl);
13591358
}
13601359

13611360
return type_alias_decl;

0 commit comments

Comments
 (0)