Changeset 3d618a0 for src/GenPoly

Timestamp:

Sep 9, 2024, 6:16:09 PM (13 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

aa14aafe

Parents:

d93b813 (diff), f5dbc8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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() );