Skip to content

Commit 7fee1ab

Browse files
authored
Merge pull request #6726 from compnerd/optionality
Swift: update API to newer spellings for optionality
2 parents aff144f + 4ed53f5 commit 7fee1ab

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,17 +142,17 @@ class SwiftASTContext : public TypeSystemSwift {
142142
auto r2_as1 = r2.GetAs<CompilerType>();
143143
auto r2_as2 = r2.GetAs<swift::Decl *>();
144144

145-
if (r1_as1.hasValue() && r2_as1.hasValue())
146-
return r1_as1.getValue() < r2_as1.getValue();
145+
if (r1_as1.has_value() && r2_as1.has_value())
146+
return r1_as1.value() < r2_as1.value();
147147

148-
if (r1_as2.hasValue() && r2_as2.hasValue())
149-
return r1_as2.getValue() < r2_as2.getValue();
148+
if (r1_as2.has_value() && r2_as2.has_value())
149+
return r1_as2.value() < r2_as2.value();
150150

151-
if (r1_as1.hasValue() && r2_as2.hasValue())
152-
return (void *)r1_as1->GetOpaqueQualType() < (void *)r2_as2.getValue();
151+
if (r1_as1.has_value() && r2_as2.has_value())
152+
return (void *)r1_as1->GetOpaqueQualType() < (void *)r2_as2.value();
153153

154-
if (r1_as2.hasValue() && r2_as1.hasValue())
155-
return (void *)r1_as2.getValue() < (void *)r2_as1->GetOpaqueQualType();
154+
if (r1_as2.has_value() && r2_as1.has_value())
155+
return (void *)r1_as2.value() < (void *)r2_as1->GetOpaqueQualType();
156156

157157
return false;
158158
}

0 commit comments

Comments
 (0)