Changeset b6f2e7ab for src/GenPoly

Timestamp:

Sep 9, 2024, 5:15:32 PM (14 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

f5dbc8d

Parents:

5c6d439

Message:

Removed SizeofExpr::expr and AlignofExpr::expr, expressions that would be stored there are wrapped in TypeofType and stored in the type field. Some special cases to hide the typeof in code generation were added. In addition, initializer length is calculated in more cases so that the full type of more arrays is known sooner. Other than that, most of the code changes were just stripping out the conditional code and checks no longer needed. Some tests had to be updated, because the typeof is not hidden in dumps and the resolver replaces known typeof expressions with the type. The extension case caused some concern but it appears that just hides warnings in the expression which no longer exists.

Location:

src/GenPoly

Files:

• Box.cpp (modified) (2 diffs)
• GenPoly.cpp (modified) (1 diff)
• Lvalue.cpp (modified) (2 diffs)

src/GenPoly/Box.cpp

@@ -1925 +1925 @@
 ast::Expr const * PolyGenericCalculator::postvisit(
                 ast::SizeofExpr const * expr ) {
-        ast::Type const * type = expr->type ? expr->type : expr->expr->result;
-        ast::Expr const * gen = genSizeof( expr->location, type );
+        ast::Expr const * gen = genSizeof( expr->location, expr->type );
         return ( gen ) ? gen : expr;
 }
@@ -1932 +1931 @@
 ast::Expr const * PolyGenericCalculator::postvisit(
                 ast::AlignofExpr const * expr ) {
-        ast::Type const * type = expr->type ? expr->type : expr->expr->result;
-        ast::Expr const * gen = genAlignof( expr->location, type );
+        ast::Expr const * gen = genAlignof( expr->location, expr->type );
         return ( gen ) ? gen : expr;
 }

src/GenPoly/GenPoly.cpp

@@ -299 +299 @@
                 ast::SizeofExpr const * r = as<ast::SizeofExpr>(rhs);
 
-                assert((l->type != nullptr) ^ (l->expr != nullptr));
-                assert((r->type != nullptr) ^ (r->expr != nullptr));
-                if ( !(l->type && r->type) ) return false;
+                assert( l->type );
+                assert( r->type );
 
                 // mutual recursion with type poly compatibility

src/GenPoly/Lvalue.cpp

@@ -607 +607 @@
 ast::SizeofExpr const * ReferenceTypeElimination::previsit(
                 ast::SizeofExpr const * expr ) {
-        if ( expr->expr ) return expr;
         return ast::mutate_field( expr, &ast::SizeofExpr::type,
                 expr->type->stripReferences() );
@@ -614 +613 @@
 ast::AlignofExpr const * ReferenceTypeElimination::previsit(
                 ast::AlignofExpr const * expr ) {
-        if ( expr->expr ) return expr;
         return ast::mutate_field( expr, &ast::AlignofExpr::type,
                 expr->type->stripReferences() );