Changeset 24d6572 for src/ResolvExpr/ConversionCost.cc

Timestamp:

Jun 12, 2023, 2:45:32 PM (23 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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' into ast-experimental

File:

• src/ResolvExpr/ConversionCost.cc (modified) (5 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -22 +22 @@
 #include "ResolvExpr/Cost.h"             // for Cost
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
-#include "ResolvExpr/Unify.h"
+#include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
+#include "ResolvExpr/PtrsAssignable.hpp" // for ptrsAssignable
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for TypeDecl, NamedTypeDecl
 #include "SynTree/Type.h"                // for Type, BasicType, TypeInstType
-#include "typeops.h"                     // for typesCompatibleIgnoreQualifiers
 
 
@@ -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;