refactor(Corpus): valueless_after_move is asserted

Only use MRDOCS_ASSERT for valueless_after_move(). Since polymorphic objects are no longer nullable, and using moved-from objects is invalid, we should never check valueless_after_move() to determine conditional application logic.

Author: alandefreitas

include/mrdocs/ADT/Polymorphic.hpp

@@ -193,6 +193,19 @@ template <class T> inline constexpr bool IsPolymorphic<Polymorphic<T>> = true;
 
 } // namespace detail
 
+/// @copydoc CompareDerived(Polymorphic<Base> const&, Polymorphic<Base> const&)
+template <class Base>
+requires(!detail::IsPolymorphic<Base>) && detail::CanVisitCompare<Base>
+auto
+CompareDerived(Base const& lhs, Base const& rhs)
+{
+    if (lhs.Kind == rhs.Kind)
+    {
+        return visit(lhs, detail::VisitCompareFn<Base>(rhs));
+    }
+    return lhs.Kind <=> rhs.Kind;
+}
+
 /** @brief Compares two polymorphic objects that have visit functions
 
     This function compares two Polymorphic objects that
@@ -217,30 +230,9 @@ requires detail::CanVisitCompare<Base>
 auto
 CompareDerived(Polymorphic<Base> const& lhs, Polymorphic<Base> const& rhs)
 {
-    if (!lhs.valueless_after_move() && !rhs.valueless_after_move())
-    {
-        if (lhs->Kind == rhs->Kind)
-        {
-            return visit(*lhs, detail::VisitCompareFn<Base>(*rhs));
-        }
-        return lhs->Kind <=> rhs->Kind;
-    }
-    return lhs.valueless_after_move() ?
-               std::strong_ordering::less :
-               std::strong_ordering::greater;
-}
-
-/// @copydoc CompareDerived(Polymorphic<Base> const&, Polymorphic<Base> const&)
-template <class Base>
-requires(!detail::IsPolymorphic<Base>) && detail::CanVisitCompare<Base>
-auto
-CompareDerived(Base const& lhs, Base const& rhs)
-{
-    if (lhs.Kind == rhs.Kind)
-    {
-        return visit(lhs, detail::VisitCompareFn<Base>(rhs));
-    }
-    return lhs.Kind <=> rhs.Kind;
+    MRDOCS_ASSERT(!lhs.valueless_after_move());
+    MRDOCS_ASSERT(!rhs.valueless_after_move());
+    return CompareDerived(*lhs, *rhs);
 }
 
 template <class Base>

include/mrdocs/Metadata/Name.hpp

@@ -61,11 +61,7 @@ tag_invoke(
     Polymorphic<NameInfo> const& I,
     DomCorpus const* domCorpus)
 {
-    if(I.valueless_after_move())
-    {
-        v = nullptr;
-        return;
-    }
+    MRDOCS_ASSERT(!I.valueless_after_move());
     tag_invoke(dom::ValueFromTag{}, v, *I, domCorpus);
 }
 

include/mrdocs/Metadata/TArg.hpp

@@ -64,11 +64,7 @@ tag_invoke(
     Polymorphic<TArg> const& I,
     DomCorpus const* domCorpus)
 {
-    if (I.valueless_after_move())
-    {
-        v = nullptr;
-        return;
-    }
+    MRDOCS_ASSERT(!I.valueless_after_move());
     tag_invoke(dom::ValueFromTag{}, v, *I, domCorpus);
 }
 

include/mrdocs/Metadata/TParam.hpp

@@ -71,11 +71,7 @@ tag_invoke(
     Polymorphic<TParam> const& I,
     DomCorpus const* domCorpus)
 {
-    if (I.valueless_after_move())
-    {
-        v = nullptr;
-        return;
-    }
+    MRDOCS_ASSERT(!I.valueless_after_move());
     tag_invoke(dom::ValueFromTag{}, v, *I, domCorpus);
 }
 

include/mrdocs/Metadata/Type.hpp

@@ -175,11 +175,7 @@ tag_invoke(
     Polymorphic<TypeInfo> const& I,
     DomCorpus const* domCorpus)
 {
-    if (I.valueless_after_move())
-    {
-        v = nullptr;
-        return;
-    }
+    MRDOCS_ASSERT(!I.valueless_after_move());
     tag_invoke(dom::ValueFromTag{}, v, *I, domCorpus);
 }
 

src/lib/AST/ASTVisitor.cpp

@@ -714,8 +714,8 @@ populate(
             // CXXBaseSpecifier::getEllipsisLoc indicates whether the
             // base was a pack expansion; a PackExpansionType is not built
             // for base-specifiers
-            if (!BaseType.valueless_after_move() &&
-                B.getEllipsisLoc().isValid())
+            MRDOCS_ASSERT(!BaseType.valueless_after_move());
+            if (B.getEllipsisLoc().isValid())
             {
                 BaseType->IsPackExpansion = true;
             }
@@ -1341,11 +1341,7 @@ populate(
         for (auto it = Template.Args.begin(); it != Template.Args.end();)
         {
             auto& arg = *it;
-            if (arg.valueless_after_move())
-            {
-                ++it;
-                continue;
-            }
+            MRDOCS_ASSERT(!arg.valueless_after_move());
             if (auto* T = dynamic_cast<TypeTArg*>(arg.operator->()))
             {
                 MRDOCS_ASSERT(!T->Type.valueless_after_move());
@@ -1496,14 +1492,15 @@ populate(
     Polymorphic<TParam>& I,
     NamedDecl const* N)
 {
+    MRDOCS_ASSERT(!I.valueless_after_move());
     visit(N, [&]<typename DeclTy>(DeclTy const* P)
     {
         constexpr Decl::Kind kind =
             DeclToKind<DeclTy>();
 
         if constexpr(kind == Decl::TemplateTypeParm)
         {
-            if (I.valueless_after_move())
+            if (I->Kind != TParamKind::Type)
             {
                 I = Polymorphic<TParam>(std::in_place_type<TypeTParam>);
             }
@@ -1532,7 +1529,7 @@ populate(
         }
         else if constexpr(kind == Decl::NonTypeTemplateParm)
         {
-            if (I.valueless_after_move())
+            if (I->Kind != TParamKind::Constant)
             {
                 I = Polymorphic<TParam>(std::in_place_type<ConstantTParam>);
             }
@@ -1547,7 +1544,7 @@ populate(
         }
         else if constexpr(kind == Decl::TemplateTemplateParm)
         {
-            if (I.valueless_after_move())
+            if (I->Kind != TParamKind::Template)
             {
                 I = Polymorphic<TParam>(std::in_place_type<TemplateTParam>);
             }
@@ -1563,8 +1560,7 @@ populate(
                 auto& Param
                     = i < Result->Params.size() ?
                           Result->Params[i] :
-                          Result->Params.emplace_back(
-                              nullable_traits<Polymorphic<TParam>>::null());
+                          Result->Params.emplace_back(std::in_place_type<TypeTParam>);
                 populate(Param, TP);
             }
             if (TTPD->hasDefaultArgument() && !Result->Default)
@@ -1578,6 +1574,7 @@ populate(
         MRDOCS_UNREACHABLE();
     });
 
+    MRDOCS_ASSERT(!I.valueless_after_move());
     if (I->Name.empty())
     {
         I->Name = extractName(N);
@@ -1615,10 +1612,10 @@ populate(
     while (explicitIt != ExplicitTemplateParameters.end())
     {
         NamedDecl const* P = TPL->getParam(i);
-        auto& Param = i < TI.Params.size() ?
-                          TI.Params[i] :
-                          TI.Params.emplace_back(
-                              nullable_traits<Polymorphic<TParam>>::null());
+        Polymorphic<TParam>& Param =
+            i < TI.Params.size() ?
+                TI.Params[i] :
+                TI.Params.emplace_back(std::in_place_type<TypeTParam>);
         populate(Param, P);
         ++explicitIt;
         ++i;