Changeset 8a930c03 for src/ResolvExpr/ConversionCost.cc

Timestamp:

Jun 12, 2023, 12:05:58 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

fec8bd1

Parents:

2b78949 (diff), 38e266ca (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.cc (modified) (4 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -532 +532 @@
                 }
         }
-        if ( typesCompatibleIgnoreQualifiers( src, dst, symtab, env ) ) {
+        if ( typesCompatibleIgnoreQualifiers( src, dst, env ) ) {
                 return Cost::zero;
         } else if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
@@ -566 +566 @@
                         ast::CV::Qualifiers tq2 = dstAsRef->base->qualifiers;
                         if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers(
-                                        srcAsRef->base, dstAsRef->base, symtab, env ) ) {
+                                        srcAsRef->base, dstAsRef->base, env ) ) {
                                 if ( tq1 == tq2 ) {
                                         return Cost::zero;
@@ -587 +587 @@
                 const ast::ReferenceType * dstAsRef = dynamic_cast< const ast::ReferenceType * >( dst );
                 assert( dstAsRef );
-                if ( typesCompatibleIgnoreQualifiers( src, dstAsRef->base, symtab, env ) ) {
+                if ( typesCompatibleIgnoreQualifiers( src, dstAsRef->base, env ) ) {
                         if ( srcIsLvalue ) {
                                 if ( src->qualifiers == dstAsRef->base->qualifiers ) {
@@ -653 +653 @@
                 ast::CV::Qualifiers tq2 = dstAsPtr->base->qualifiers;
                 if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers(
-                                pointerType->base, dstAsPtr->base, symtab, env ) ) {
+                                pointerType->base, dstAsPtr->base, env ) ) {
                         if ( tq1 == tq2 ) {
                                 cost = Cost::zero;