Skip to content

Commit ed01c1a

Browse files
Merge pull request swiftlang#2012 from adrian-prantl/nodeforprinting-main
Remove obsolete early exit. This fixes a regression hidden by 2c911bc
2 parents 7818c62 + 202bca8 commit ed01c1a

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,9 +522,6 @@ TypeSystemSwiftTypeRef::GetSwiftified(swift::Demangle::Demangler &dem,
522522
StringRef ident = GetObjCTypeName(node);
523523
if (ident.empty())
524524
return node;
525-
auto *Module = GetModule();
526-
if (!Module)
527-
return node;
528525

529526
// This is an imported Objective-C type; look it up in the
530527
// debug info.

lldb/test/API/lang/swift/protocol_extension_computed_property/TestProtocolExtensionComputerProperty.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
lldbinline.MakeInlineTest(
55
__file__, globals(),
66
decorators=[
7-
expectedFailureAll, #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
87
swiftTest,skipUnlessDarwin,
98
skipIf(bugnumber="rdar://60396797", # should work but crashes.
109
setting=('symbols.use-swift-clangimporter', 'false'))

lldb/test/API/lang/swift/protocol_extension_computed_property/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension Measurement where UnitType == UnitAngle {
1313
}
1414

1515
func f() {
16-
return //%self.expect('p self.radians', substrs=["(CGFloat) $R0 = 1.745"])
16+
return //%self.expect('p self.radians', substrs=["CGFloat) $R0 = 1.745"])
1717
//%self.expect('p self', substrs=["Measurement<UnitAngle>"])
1818
}
1919
}

0 commit comments

Comments
 (0)