Merge pull request #61005 from benlangmuir/storage-is-optional

[syntax] Add has_value() and value() to OptionalStorage

Author: benlangmuir

include/swift/Syntax/AbsoluteRawSyntax.h

@@ -395,17 +395,30 @@ class OptionalStorage<AbsoluteRawSyntax> {
 
   void reset() { Storage = AbsoluteRawSyntax(nullptr); }
 
+  bool has_value() const { return !Storage.isNull(); }
   bool hasValue() const { return !Storage.isNull(); }
 
+  AbsoluteRawSyntax &value() & {
+    assert(hasValue());
+    return Storage;
+  }
   AbsoluteRawSyntax &getValue() & {
     assert(hasValue());
     return Storage;
   }
+  AbsoluteRawSyntax const &value() const & {
+    assert(hasValue());
+    return Storage;
+  }
   AbsoluteRawSyntax const &getValue() const & {
     assert(hasValue());
     return Storage;
   }
 #if LLVM_HAS_RVALUE_REFERENCE_THIS
+  AbsoluteRawSyntax &&value() &&noexcept {
+    assert(hasValue());
+    return std::move(Storage);
+  }
   AbsoluteRawSyntax &&getValue() &&noexcept {
     assert(hasValue());
     return std::move(Storage);

include/swift/Syntax/SyntaxData.h

@@ -414,17 +414,30 @@ class OptionalStorage<SyntaxDataRef> {
 
   void reset() { Storage = SyntaxDataRef(AbsoluteRawSyntax(nullptr), nullptr); }
 
+  bool has_value() const { return !Storage.getAbsoluteRaw().isNull(); }
   bool hasValue() const { return !Storage.getAbsoluteRaw().isNull(); }
 
+  SyntaxDataRef &value() & {
+    assert(hasValue());
+    return Storage;
+  }
   SyntaxDataRef &getValue() & {
     assert(hasValue());
     return Storage;
   }
+  SyntaxDataRef const &value() const & {
+    assert(hasValue());
+    return Storage;
+  }
   SyntaxDataRef const &getValue() const & {
     assert(hasValue());
     return Storage;
   }
 #if LLVM_HAS_RVALUE_REFERENCE_THIS
+  SyntaxDataRef &&value() &&noexcept {
+    assert(hasValue());
+    return std::move(Storage);
+  }
   SyntaxDataRef &&getValue() &&noexcept {
     assert(hasValue());
     return std::move(Storage);