Changeset 10a9479d for src/ResolvExpr/ConversionCost.cpp

Timestamp:

Nov 23, 2024, 8:28:37 PM (11 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

File:

• src/ResolvExpr/ConversionCost.cpp (modified) (2 diffs)

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;
                         }