Changeset de7b7a5 for src/GenPoly

Timestamp:

Nov 21, 2024, 8:38:47 AM (4 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

10a9479d, e25ef8c

Parents:

1cd2839 (diff), bdf40650 (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

File:

• src/GenPoly/Lvalue.cpp (modified) (3 diffs)

src/GenPoly/Lvalue.cpp ¶

@@ -365 +365 @@
                         ret = new ast::AddressExpr( ret->location, ret );
                 }
+                // Must keep cast if types are different.
                 if ( !ResolvExpr::typesCompatible(
                                 srcType,
                                 strict_dynamic_cast<ast::ReferenceType const *>( dstType )->base ) ) {
-                        // Must keep cast if cast-to type is different from the actual type.
                         return ast::mutate_field( expr, &ast::CastExpr::arg, ret );
                 }
@@ -503 +503 @@
 }
 
+/// Recursively move an address expression underneath casts. Casts are not
+/// lvalue expressions in C but are sometimes considered as such in Cforall,
+/// (passes like InstantiateGeneric can add them.) - &(int) => (int*)&
+ast::Expr const * moveAddressUnderCast( ast::AddressExpr const * expr ) {
+        if ( !dynamic_cast<ast::CastExpr const *>( expr->arg.get() ) ) {
+                return expr;
+        }
+        auto mutExpr = ast::mutate( expr );
+        auto mutCast = strict_dynamic_cast<ast::CastExpr *>(
+                        ast::mutate( mutExpr->arg.release() ) );
+        mutExpr->arg = mutCast->arg;
+        mutCast->arg = moveAddressUnderCast( mutExpr );
+        mutCast->result = new ast::PointerType( mutCast->result );
+        return mutCast;
+}
+
 ast::Expr const * CollapseAddressDeref::postvisit(
                 ast::AddressExpr const * expr ) {
@@ -514 +530 @@
                         return ret;
                 }
-        } else if ( auto cast = dynamic_cast<ast::CastExpr const *>( arg ) ) {
-                // Need to move cast to pointer type out a level since address of
-                // pointer is not valid C code (can be introduced in prior passes,
-                // e.g., InstantiateGeneric)
-                if ( ast::getPointerBase( cast->result ) ) {
-                        auto mutExpr = ast::mutate( expr );
-                        auto mutCast = strict_dynamic_cast<ast::CastExpr *>(
-                                        ast::mutate( mutExpr->arg.release() ) );
-                        mutExpr->arg = mutCast->arg;
-                        mutCast->arg = mutExpr;
-                        mutCast->result = new ast::PointerType( mutCast->result );
-                        return mutCast;
-                }
+        } else {
+                return moveAddressUnderCast( expr );
         }
         return expr;