Skip to content

Commit ddcbf4c

Browse files
author
git apple-llvm automerger
committed
Merge commit 'fc1036139c5e' from swift/release/6.0 into stable/20230725
2 parents cf6b703 + fc10361 commit ddcbf4c

File tree

10 files changed

+69
-53
lines changed

10 files changed

+69
-53
lines changed

‎lldb/include/lldb/Symbol/TypeSystem.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,8 @@ class TypeSystem : public PluginInterface,
558558
/// have a way to communicate errors. This method can be called by a
559559
/// process to tell the TypeSystem to send any diagnostics to the
560560
/// process so they can be surfaced to the user.
561-
virtual void DiagnoseWarnings(Process &process, Module &module) const;
561+
virtual void DiagnoseWarnings(Process &process,
562+
const SymbolContext &sc) const;
562563

563564
virtual std::optional<llvm::json::Value> ReportStatistics();
564565

‎lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,13 +1165,14 @@ static void printASTValidationError(
11651165
LLDB_LOG(log, " -- {0}", ExtraOpt);
11661166
}
11671167

1168-
void SwiftASTContext::DiagnoseWarnings(Process &process, Module &module) const {
1169-
if (!HasDiagnostics())
1168+
void SwiftASTContext::DiagnoseWarnings(Process &process,
1169+
const SymbolContext &sc) const {
1170+
if (!sc.module_sp || !HasDiagnostics())
11701171
return;
11711172
auto debugger_id = process.GetTarget().GetDebugger().GetID();
11721173
std::string msg;
11731174
llvm::raw_string_ostream(msg) << "Cannot load Swift type information for "
1174-
<< module.GetFileSpec().GetPath();
1175+
<< sc.module_sp->GetFileSpec().GetPath();
11751176
Debugger::ReportWarning(msg, debugger_id, &m_swift_import_warning);
11761177
StreamAllDiagnostics(debugger_id);
11771178
}
@@ -2110,7 +2111,8 @@ ProcessModule(Module &module, std::string m_description,
21102111
std::vector<swift::PluginSearchOption> &plugin_search_options,
21112112
std::vector<std::string> &module_search_paths,
21122113
std::vector<std::pair<std::string, bool>> &framework_search_paths,
2113-
std::vector<std::string> &extra_clang_args) {
2114+
std::vector<std::string> &extra_clang_args,
2115+
std::string &error) {
21142116
{
21152117
llvm::raw_string_ostream ss(m_description);
21162118
ss << "::ProcessModule(" << '"';
@@ -2214,8 +2216,7 @@ ProcessModule(Module &module, std::string m_description,
22142216
return;
22152217
bool found_swift_modules = false;
22162218
bool got_serialized_options = false;
2217-
llvm::SmallString<0> error;
2218-
llvm::raw_svector_ostream errs(error);
2219+
llvm::raw_string_ostream errs(error);
22192220
swift::CompilerInvocation invocation;
22202221
auto ast_file_datas = module.GetASTData(eLanguageTypeSwift);
22212222
std::string module_name = module.GetSpecificationDescription();
@@ -2364,7 +2365,7 @@ SwiftASTContext::CreateInstance(lldb::LanguageType language, Module &module,
23642365
bool got_serialized_options = false;
23652366
llvm::SmallString<0> error;
23662367
llvm::raw_svector_ostream errs(error);
2367-
// Implicit search paths will be discovered by ValidateSecionModules().
2368+
// Implicit search paths will be discovered by ValidateSectionModules().
23682369
bool discover_implicit_search_paths = false;
23692370
auto ast_file_datas = module.GetASTData(eLanguageTypeSwift);
23702371
std::string module_name = module.GetSpecificationDescription();
@@ -2435,6 +2436,7 @@ SwiftASTContext::CreateInstance(lldb::LanguageType language, Module &module,
24352436
const bool use_all_compiler_flags = false;
24362437
const bool is_target_module = true;
24372438

2439+
std::string error;
24382440
StringRef module_filter;
24392441
std::vector<swift::PluginSearchOption> plugin_search_options;
24402442
std::vector<std::string> extra_clang_args = swift_ast_sp->GetClangArguments();
@@ -2443,7 +2445,10 @@ SwiftASTContext::CreateInstance(lldb::LanguageType language, Module &module,
24432445
ProcessModule(module, m_description, discover_implicit_search_paths,
24442446
use_all_compiler_flags, is_target_module, module_filter, triple,
24452447
plugin_search_options, module_search_paths,
2446-
framework_search_paths, extra_clang_args);
2448+
framework_search_paths, extra_clang_args, error);
2449+
if (!error.empty())
2450+
swift_ast_sp->AddDiagnostic(eSeverityError, error);
2451+
24472452
// Apply the working directory to all relative paths.
24482453
StringRef overrideOpts = target ? target->GetSwiftClangOverrideOptions() : "";
24492454
swift_ast_sp->AddExtraClangArgs(extra_clang_args, overrideOpts);
@@ -2799,14 +2804,15 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(
27992804

28002805
for (ModuleSP module_sp : target.GetImages().Modules())
28012806
if (module_sp) {
2807+
std::string error;
28022808
StringRef module_filter;
28032809
std::vector<std::string> extra_clang_args;
28042810
ProcessModule(*module_sp, m_description, discover_implicit_search_paths,
28052811
use_all_compiler_flags,
28062812
target.GetExecutableModulePointer() == module_sp.get(),
28072813
module_filter, triple, plugin_search_options,
28082814
module_search_paths, framework_search_paths,
2809-
extra_clang_args);
2815+
extra_clang_args, error);
28102816
swift_ast_sp->AddExtraClangArgs(extra_clang_args,
28112817
target.GetSwiftClangOverrideOptions());
28122818
}
@@ -3136,14 +3142,17 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(
31363142
/*is_system*/ false});
31373143
ModuleSP module_sp = sc.module_sp;
31383144
if (module_sp) {
3145+
std::string error;
31393146
StringRef module_filter = swift_module_name;
31403147
std::vector<std::string> extra_clang_args;
31413148
ProcessModule(*module_sp, m_description, discover_implicit_search_paths,
31423149
use_all_compiler_flags,
31433150
target.GetExecutableModulePointer() == module_sp.get(),
31443151
module_filter, triple, plugin_search_options,
3145-
module_search_paths, framework_search_paths,
3146-
extra_clang_args);
3152+
module_search_paths, framework_search_paths, extra_clang_args,
3153+
error);
3154+
if (!error.empty())
3155+
swift_ast_sp->AddDiagnostic(eSeverityError, error);
31473156
swift_ast_sp->AddExtraClangArgs(extra_clang_args,
31483157
target.GetSwiftClangOverrideOptions());
31493158
}
@@ -5602,13 +5611,16 @@ void SwiftASTContextForExpressions::ModulesDidLoad(ModuleList &module_list) {
56025611
lldb::ModuleSP module_sp = module_list.GetModuleAtIndex(mi);
56035612
if (!module_sp)
56045613
continue;
5614+
std::string error;
56055615
StringRef module_filter;
56065616
ProcessModule(*module_sp, m_description, discover_implicit_search_paths,
56075617
use_all_compiler_flags,
56085618
target_sp->GetExecutableModulePointer() == module_sp.get(),
56095619
module_filter, GetTriple(), plugin_search_options,
5610-
module_search_paths, framework_search_paths,
5611-
extra_clang_args);
5620+
module_search_paths, framework_search_paths, extra_clang_args,
5621+
error);
5622+
if (!error.empty())
5623+
AddDiagnostic(eSeverityError, error);
56125624
// If the use-all-compiler-flags setting is enabled, the
56135625
// expression context is supposed to merge all search paths
56145626
// from all dylibs.

‎lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,9 @@ class SwiftASTContext : public TypeSystemSwift {
485485
/// Return only fatal errors.
486486
Status GetFatalErrors() const;
487487
/// Notify the Process about any Swift or ClangImporter errors.
488-
void DiagnoseWarnings(Process &process, Module &module) const override;
489-
488+
void DiagnoseWarnings(Process &process,
489+
const SymbolContext &sc) const override;
490+
490491
bool SetColorizeDiagnostics(bool b);
491492

492493
void PrintDiagnostics(DiagnosticManager &diagnostic_manager,

‎lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2059,11 +2059,10 @@ Status TypeSystemSwiftTypeRef::IsCompatible() {
20592059
}
20602060

20612061
void TypeSystemSwiftTypeRef::DiagnoseWarnings(Process &process,
2062-
Module &module) const {
2063-
// This gets called only from Thread::FrameSelectedCallback(StackFrame)
2064-
// and is of limited usefuleness.
2065-
if (auto *swift_ast_context = GetSwiftASTContextOrNull(nullptr))
2066-
swift_ast_context->DiagnoseWarnings(process, module);
2062+
const SymbolContext &sc) const {
2063+
// This gets called only from Thread::FrameSelectedCallback(StackFrame).
2064+
if (auto *swift_ast_context = GetSwiftASTContextOrNull(&sc))
2065+
swift_ast_context->DiagnoseWarnings(process, sc);
20672066
}
20682067

20692068
plugin::dwarf::DWARFASTParser *TypeSystemSwiftTypeRef::GetDWARFParser() {

‎lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
108108
bool SupportsLanguage(lldb::LanguageType language) override;
109109
Status IsCompatible() override;
110110

111-
void DiagnoseWarnings(Process &process, Module &module) const override;
111+
void DiagnoseWarnings(Process &process,
112+
const SymbolContext &sc) const override;
112113
plugin::dwarf::DWARFASTParser *GetDWARFParser() override;
113114
// CompilerDecl functions
114115
ConstString DeclGetName(void *opaque_decl) override {

‎lldb/source/Symbol/TypeSystem.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ bool TypeSystem::IsMeaninglessWithoutDynamicResolution(void *type) {
161161
return false;
162162
}
163163

164-
void TypeSystem::DiagnoseWarnings(Process &process, Module &module) const {}
164+
void TypeSystem::DiagnoseWarnings(Process &process,
165+
const SymbolContext &sc) const {}
165166

166167
Status TypeSystem::IsCompatible() {
167168
// Assume a language is compatible. Override this virtual function

‎lldb/source/Target/Thread.cpp

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
#include "lldb/Utility/StreamString.h"
5454
#include "lldb/lldb-enumerations.h"
5555

56+
#ifdef LLDB_ENABLE_SWIFT
57+
#include "Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h"
58+
#endif
59+
5660
#include <memory>
5761
#include <optional>
5862

@@ -343,13 +347,20 @@ void Thread::FrameSelectedCallback(StackFrame *frame) {
343347
GetProcess()->PrintWarningToolchainMismatch(sc);
344348
#endif
345349
}
346-
SymbolContext msc = frame->GetSymbolContext(eSymbolContextModule);
347-
if (msc.module_sp)
348-
msc.module_sp->ForEachTypeSystem([&](lldb::TypeSystemSP ts) {
349-
if (ts)
350-
ts->DiagnoseWarnings(*GetProcess(), *msc.module_sp);
351-
return true;
352-
});
350+
#ifdef LLDB_ENABLE_SWIFT
351+
{
352+
SymbolContext msc =
353+
frame->GetSymbolContext(eSymbolContextFunction | eSymbolContextModule);
354+
Status error;
355+
ExecutionContext exe_ctx;
356+
frame->CalculateExecutionContext(exe_ctx);
357+
if (auto *exe_scope = exe_ctx.GetBestExecutionContextScope())
358+
if (auto target = frame->CalculateTarget())
359+
if (auto swift_ast_ctx =
360+
target->GetSwiftScratchContext(error, *exe_scope, false))
361+
swift_ast_ctx->get()->DiagnoseWarnings(*GetProcess(), msc);
362+
}
363+
#endif
353364
}
354365

355366
lldb::StopInfoSP Thread::GetStopInfo() {

‎lldb/test/API/lang/swift/expression/import_search_paths/TestSwiftImportSearchPaths.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ class TestSwiftImportSearchPaths(lldbtest.TestBase):
99
NO_DEBUG_INFO_TESTCASE = True
1010
mydir = lldbtest.TestBase.compute_mydir(__file__)
1111

12-
@skipIf(bugnumber='rdar://135553659')
1312
@swiftTest
1413
def test_positive(self):
1514
self.do_test('true')
1615

17-
@skipIf(bugnumber='rdar://135553659')
1816
@swiftTest
1917
def test_negative(self):
2018
self.do_test('false')
@@ -39,12 +37,8 @@ def do_test(self, flag):
3937
prefix = 'POSITIVE'
4038
else:
4139
prefix = 'NEGATIVE'
42-
self.filecheck('platform shell cat "%s"' % types_log, __file__,
43-
'--check-prefix=CHECK_MOD_'+prefix)
4440
self.filecheck('platform shell cat "%s"' % types_log, __file__,
4541
'--check-prefix=CHECK_EXP_'+prefix)
46-
# CHECK_MOD_POSITIVE: SwiftASTContextForModule("a.out")::LogConfiguration(){{.*hidden$}}
47-
# CHECK_MOD_NEGATIVE: SwiftASTContextForModule("a.out")::LogConfiguration(){{.*hidden$}}
48-
# CHECK_EXP_POSITIVE: SwiftASTContextForExpressions::LogConfiguration(){{.*hidden$}}
49-
# CHECK_EXP_NEGATIVE-NOT: SwiftASTContextForExpressions::LogConfiguration(){{.*hidden$}}
50-
# CHECK_EXP_NEGATIVE: SwiftASTContextForExpressions::LogConfiguration(){{.*}}Extra clang arguments
42+
# CHECK_EXP_POSITIVE: SwiftASTContextForExpressions{{.*}}::LogConfiguration(){{.*hidden$}}
43+
# CHECK_EXP_NEGATIVE-NOT: SwiftASTContextForExpressions{{.*}}::LogConfiguration(){{.*hidden$}}
44+
# CHECK_EXP_NEGATIVE: SwiftASTContextForExpressions{{.*}}::LogConfiguration(){{.*}}Extra clang arguments

‎lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import swift
1414
import lldbsuite.test.lldbutil as lldbutil
1515
from lldbsuite.test.lldbtest import *
16-
from lldbsuite.test import decorators
16+
from lldbsuite.test.decorators import *
1717

1818

1919
class TestSwiftREPLExceptions(TestBase):
@@ -23,32 +23,29 @@ class TestSwiftREPLExceptions(TestBase):
2323
# each debug info format.
2424
NO_DEBUG_INFO_TESTCASE = True
2525

26-
@decorators.skipUnlessDarwin
27-
@decorators.swiftTest
28-
def test_set_repl_mode_exceptions(self):
26+
@skipUnlessDarwin
27+
@swiftTest
28+
def DISABLED_test_set_repl_mode_exceptions(self):
2929
""" Test that SetREPLMode turns off trapping exceptions."""
30-
return
3130
self.build()
3231
self.main_source_file = lldb.SBFileSpec("main.swift")
3332
self.do_repl_mode_test()
3433

35-
@decorators.skipUnlessDarwin
36-
@decorators.swiftTest
34+
@skipUnlessDarwin
35+
@swiftTest
3736
def test_repl_exceptions(self):
3837
""" Test the lldb --repl turns off trapping exceptions."""
3938
self.build()
4039
self.do_repl_test()
4140

42-
def setUp(self):
43-
# Call super's setUp().
44-
TestBase.setUp(self)
45-
46-
@decorators.skipIfRemote
41+
@skipIfRemote
4742
def do_repl_test(self):
4843
sdk_root = ""
4944
with open(self.getBuildArtifact("sdkroot.txt"), 'r') as f:
5045
sdk_root = f.readlines()[0]
5146
self.assertGreater(len(sdk_root), 0)
47+
if sdk_root[-1] == '\n':
48+
sdk_root = sdk_root[:-1]
5249
build_dir = self.getBuildDir()
5350
repl_args = [lldbtest_config.lldbExec, "-x", "--repl=-enable-objc-interop -sdk %s -L%s -I%s"%(sdk_root, build_dir, build_dir)]
5451
repl_proc = subprocess.Popen(repl_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, cwd=build_dir)
@@ -71,7 +68,7 @@ def do_repl_mode_test(self):
7168
lldb.SBFileSpec(os.path.join(wd, filename)))
7269
self.assertFalse(err.Fail(), 'Failed to copy ' + filename)
7370
(target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(self,
74-
"Set a breakpoint here", self.main_source_file)
71+
"Set a breakpoint here", self.main_source_file)
7572

7673
frame = thread.GetFrameAtIndex(0)
7774
options = lldb.SBExpressionOptions()

‎lldb/test/Shell/Swift/MissingVFSOverlay.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Test that error messages from constructing ClangImporter
22
# are surfaced to the user.
3-
# REQUIRES: 135553659
43
# REQUIRES: swift
54

65
# RUN: rm -rf %t && mkdir %t && cd %t

0 commit comments

Comments
 (0)