Changeset d945be9 for src/GenPoly

Timestamp:

Nov 20, 2024, 9:46:17 AM (10 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

1cd2839, bdf40650

Parents:

7c80a86 (diff), ecf3812 (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) (4 diffs)

src/GenPoly/Lvalue.cpp

@@ -315 +315 @@
                 SemanticWarning( expr->arg->location,
                         Warning::RvalueToReferenceConversion, toCString( expr->arg ) );
-
 
                 // allowing conversion in the rvalue to const ref case
@@ -366 +365 @@
                         ret = new ast::AddressExpr( ret->location, ret );
                 }
-                if ( expr->arg->get_lvalue() &&
-                                !ResolvExpr::typesCompatible(
-                                        srcType,
-                                        strict_dynamic_cast<ast::ReferenceType const *>( dstType )->base ) ) {
+                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 );
@@ -384 +382 @@
                 }
                 // Must keep cast if types are different.
-                if ( !ResolvExpr::typesCompatibleIgnoreQualifiers(
+                if ( !ResolvExpr::typesCompatible(
                                 dstType->stripReferences(),
                                 srcType->stripReferences() ) ) {
@@ -397 +395 @@
         } else {
                 assert( 0 == diff );
-                // Remove useless generated casts.
-                if ( expr->isGenerated == ast::GeneratedFlag::GeneratedCast &&
-                                ResolvExpr::typesCompatible(
+                // Must keep cast if types are different. (Or it is explicit.)
+                if ( ast::ExplicitCast == expr->isGenerated ||
+                                !ResolvExpr::typesCompatible(
                                         expr->result,
                                         expr->arg->result ) ) {
-                        PRINT(
-                                std::cerr << "types are compatible, removing cast: " << expr << '\n';
-                                std::cerr << "-- " << expr->result << '\n';
-                                std::cerr << "-- " << expr->arg->result << std::endl;
-                        )
-                        auto argAsEnum = expr->arg.as<ast::EnumInstType>();
-                        auto resultAsEnum = expr->result.as<ast::EnumInstType>();
-                        if (argAsEnum && resultAsEnum) {
-                                if (argAsEnum->base->name != resultAsEnum->base->name) {
-                                        return expr;
-                                }
-                        }
-                        return ast::mutate_field( expr->arg.get(),
-                                        &ast::Expr::env, expr->env.get() );
-                }
-                return expr;
+                        return expr;
+                }
+                PRINT(
+                        std::cerr << "types are compatible, removing cast: " << expr << '\n';
+                        std::cerr << "-- " << expr->result << '\n';
+                        std::cerr << "-- " << expr->arg->result << std::endl;
+                )
+                return ast::mutate_field( expr->arg.get(),
+                                &ast::Expr::env, expr->env.get() );
         }
 }