Changes in src/GenPoly/Lvalue.cpp [ecf3812:ed96731]

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
@@ -365 +366 @@
                         ret = new ast::AddressExpr( ret->location, ret );
                 }
-                if ( !ResolvExpr::typesCompatible(
-                                srcType,
-                                strict_dynamic_cast<ast::ReferenceType const *>( dstType )->base ) ) {
+                if ( expr->arg->get_lvalue() &&
+                                !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 );
@@ -382 +384 @@
                 }
                 // Must keep cast if types are different.
-                if ( !ResolvExpr::typesCompatible(
+                if ( !ResolvExpr::typesCompatibleIgnoreQualifiers(
                                 dstType->stripReferences(),
                                 srcType->stripReferences() ) ) {
@@ -395 +397 @@
         } else {
                 assert( 0 == diff );
-                // Must keep cast if types are different. (Or it is explicit.)
-                if ( ast::ExplicitCast == expr->isGenerated ||
-                                !ResolvExpr::typesCompatible(
+                // Remove useless generated casts.
+                if ( expr->isGenerated == ast::GeneratedFlag::GeneratedCast &&
+                                ResolvExpr::typesCompatible(
                                         expr->result,
                                         expr->arg->result ) ) {
-                        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() );
+                        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;
         }
 }