Changeset 10a9479d for src/ResolvExpr

Timestamp:

Nov 23, 2024, 8:28:37 PM (14 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

956b389

Parents:

b006c51e (diff), de7b7a5 (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/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (1 diff)
• ConversionCost.cpp (modified) (2 diffs)
• Resolver.cpp (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -1220 +1220 @@
                         finder.allowVoid = true;
                 }
-                if ( castExpr->kind == ast::CastExpr::Return ) {
+                if ( ast::ReturnCast == castExpr->kind ) {
                         finder.strictMode = true;
                         finder.find( castExpr->arg, ResolveMode::withAdjustment() );

src/ResolvExpr/ConversionCost.cpp

@@ -250 +250 @@
                         newSrc = new ast::BasicType( ast::BasicKind::UnsignedInt );
                 }
+                if (dstAsRef->base->is_const() ) {
+                        auto cvtCost = conversionCost(newSrc, dstAsRef->base, srcIsLvalue, symtab, env) ;
+                        if (cvtCost == Cost::zero) { // exact match, may use a lvalue src
+                                if ( srcIsLvalue ) {
+                                        if ( src->qualifiers == dstAsRef->base->qualifiers ) {
+                                                return Cost::reference;
+                                        } else if ( src->qualifiers < dstAsRef->base->qualifiers ) {
+                                                return Cost::safe;
+                                        } else {
+                                                return Cost::unsafe;
+                                        }
+                                }
+                                else {
+                                        return Cost::reference;
+                                }
+                        }
+                        else { // not exact match, conversion is needed so lvalueness of src does not matter
+                                return cvtCost + Cost::reference;
+                        }
+                }
                 if ( typesCompatibleIgnoreQualifiers( newSrc, dstAsRef->base, env ) ) {
                         if ( srcIsLvalue ) {
@@ -259 +279 @@
                                         return Cost::unsafe;
                                 }
-                        } else if ( dstAsRef->base->is_const() ) {
-                                return Cost::safe;
-                        } else {
+                        } else { // rvalue-to-NC-ref conversion
                                 return Cost::unsafe;
                         }

src/ResolvExpr/Resolver.cpp

@@ -201 +201 @@
                                 && typesCompatible( castExpr->arg->result, castExpr->result )
                         ) {
-                                auto argAsEnum = castExpr->arg.as<ast::EnumInstType>();
-                                auto resultAsEnum = castExpr->result.as<ast::EnumInstType>();
-                                if (argAsEnum && resultAsEnum) {
-                                        if (argAsEnum->base->name != resultAsEnum->base->name) {
-                                                std::cerr << "Enum Cast: " << argAsEnum->base->name << " to " << resultAsEnum->base->name << std::endl;
-                                                return castExpr;
-                                        }
+                                ast::EnumInstType const * arg, * result;
+                                if ( ( result = castExpr->result.as<ast::EnumInstType>() ) &&
+                                                ( arg = castExpr->arg.as<ast::EnumInstType>() ) &&
+                                                arg->base->name != result->base->name) {
+                                        return castExpr;
                                 }
                                 // generated cast is the same type as its argument, remove it after keeping env
@@ -377 +375 @@
 : public ast::WithSymbolTable, public ast::WithGuards,
   public ast::WithVisitorRef<Resolver>, public ast::WithShortCircuiting,
-  public ast::WithStmtsToAdd<> {
+  public ast::WithStmtsToAdd {
 
         ast::ptr< ast::Type > functionReturn = nullptr;