Skip to content

Reenable objcconflicttest #8054

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
Jan 26, 2024
Merged

Reenable objcconflicttest #8054

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
37c40dc
Improve error logging
adrian-prantl Jan 25, 2024
cff1866
Re-enable test under precise compiler invocations
adrian-prantl Jan 25, 2024
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
6 changes: 6 additions & 0 deletions lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,12 @@ SwiftLanguageRuntimeImpl::GetNumChildren(CompilerType type,
root, {Kind::TypeMangling, Kind::Type, Kind::BuiltinTypeName});
if (builtin_type)
return 0;
LLDB_LOG(GetLog(LLDBLog::Types),
"{0}: unrecognized builtin type info or this is a Clang type with "
"DWARF debug info",
type.GetMangledTypeName());
return {};

}
// Structs and Tuples.
if (auto *rti = llvm::dyn_cast<swift::reflection::RecordTypeInfo>(ti)) {
Expand Down
9 changes: 6 additions & 3 deletions ...n_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ def test(self):
'break here', lldb.SBFileSpec('Foo.swift'))
process.Continue()
self.expect("fr var foo", "expected result", substrs=["23"])
precise = self.dbg.GetSetting('symbols.swift-precise-compiler-invocation').GetBooleanValue()
if not precise:
return
# FIXME: This should work with precise compiler invocations.
#self.expect("expression foo", "expected result", substrs=["$R3", "23"])
#self.expect("expression $R3", "expected result", substrs=["23"])
#self.expect("expression $R4", "expected result", substrs=["23"])
self.expect("expression foo", "expected result", substrs=["$R3", "23"])
self.expect("expression $R3", "expected result", substrs=["23"])
self.expect("expression $R4", "expected result", substrs=["23"])
2 changes: 1 addition & 1 deletion lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/dylib.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DYLIB_ONLY := YES
DYLIB_NAME := $(BASENAME)
DYLIB_SWIFT_SOURCES := $(DYLIB_NAME).swift
SWIFT_BRIDGING_HEADER := $(DYLIB_NAME)/$(DYLIB_NAME)-Bridging.h
SWIFT_PRECOMPILE_BRIDGING_HEADER := NO
SWIFT_PRECOMPILE_BRIDGING_HEADER := YES
SWIFT_OBJC_HEADER = $(DYLIB_NAME)-Swift.h
SWIFT_OBJC_INTEROP := 1
SWIFTFLAGS_EXTRAS = -Xcc -I$(SRCDIR)
Expand Down