Changeset f53acdf8 for src/ResolvExpr/CastCost.cc

Timestamp:

Jul 19, 2019, 2:16:01 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4eb43fa

Parents:

1f1c102 (diff), 8ac3b0e (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 new-ast

File:

• src/ResolvExpr/CastCost.cc (modified) (10 diffs)

src/ResolvExpr/CastCost.cc

@@ -37 +37 @@
         struct CastCost_old : public ConversionCost {
           public:
-                CastCost_old( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
+                CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
 
                 using ConversionCost::previsit;
                 using ConversionCost::postvisit;
-                void postvisit( BasicType * basicType );
-                void postvisit( PointerType * pointerType );
+                void postvisit( const BasicType * basicType );
+                void postvisit( const PointerType * pointerType );
         };
 
-        Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
-                if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+                if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
+                        if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
                                         return castCost( src, eqvClass->type, indexer, env );
@@ -53 +53 @@
                                         return Cost::infinity;
                                 }
-                        } else if ( NamedTypeDecl *namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) {
+                        } else if ( const NamedTypeDecl * namedType = indexer.lookupType( destAsTypeInst->name ) ) {
                                 // all typedefs should be gone by this point
-                                TypeDecl *type = strict_dynamic_cast< TypeDecl* >( namedType );
+                                const TypeDecl * type = strict_dynamic_cast< const TypeDecl * >( namedType );
                                 if ( type->base ) {
                                         return castCost( src, type->base, indexer, env ) + Cost::safe;
@@ -74 +74 @@
                         PRINT( std::cerr << "compatible!" << std::endl; )
                         return Cost::zero;
-                } else if ( dynamic_cast< VoidType* >( dest ) ) {
+                } else if ( dynamic_cast< const VoidType * >( dest ) ) {
                         return Cost::safe;
-                } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
+                } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                        return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
+                        return convertToReferenceCost( src, refType, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
                                 return ptrsCastable( t1, t2, env, indexer );
                         });
                 } else {
-                        PassVisitor<CastCost_old> converter( 
-                                dest, indexer, env, 
-                                (Cost (*)( Type *, Type *, const SymTab::Indexer &, const TypeEnvironment & ))
+                        PassVisitor<CastCost_old> converter(
+                                dest, indexer, env,
+                                (Cost (*)( const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment & ))
                                         castCost );
                         src->accept( converter );
@@ -96 +96 @@
         }
 
-        CastCost_old::CastCost_old( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+        CastCost_old::CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
                 : ConversionCost( dest, indexer, env, costFunc ) {
         }
 
-        void CastCost_old::postvisit( BasicType *basicType ) {
-                PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
+        void CastCost_old::postvisit( const BasicType * basicType ) {
+                const PointerType * destAsPointer = dynamic_cast< const PointerType * >( dest );
                 if ( destAsPointer && basicType->isInteger() ) {
-                        // necessary for, e.g. unsigned long => void*
+                        // necessary for, e.g. unsigned long => void *
                         cost = Cost::unsafe;
                 } else {
@@ -110 +110 @@
         }
 
-        void CastCost_old::postvisit( PointerType *pointerType ) {
-                if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
-                        if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
+        void CastCost_old::postvisit( const PointerType * pointerType ) {
+                if ( const PointerType * destAsPtr = dynamic_cast< const PointerType * >( dest ) ) {
+                        if ( pointerType->tq <= destAsPtr->tq && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
                                 cost = Cost::safe;
                         } else {
@@ -125 +125 @@
                                 } // if
                         } // if
-                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
+                } else if ( const BasicType * destAsBasic = dynamic_cast< const BasicType * >( dest ) ) {
                         if ( destAsBasic->isInteger() ) {
-                                // necessary for, e.g. void* => unsigned long
+                                // necessary for, e.g. void * => unsigned long
                                 cost = Cost::unsafe;
                         } // if
@@ -138 +138 @@
                 using ConversionCost_new::postvisit;
 
-                CastCost_new( 
-                        const ast::Type * dst, const ast::SymbolTable & symtab, 
+                CastCost_new(
+                        const ast::Type * dst, const ast::SymbolTable & symtab,
                         const ast::TypeEnvironment & env, CostCalculation costFunc )
                 : ConversionCost_new( dst, symtab, env, costFunc ) {}
@@ -182 +182 @@
 } // anonymous namespace
 
-Cost castCost( 
-        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
-        const ast::TypeEnvironment & env 
+Cost castCost(
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+        const ast::TypeEnvironment & env
 ) {
         if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
@@ -220 +220 @@
                 PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
                 #warning cast on ptrsCastable artifact of having two functions, remove when port done
-                return convertToReferenceCost( 
-                        src, refType, symtab, env, 
-                        ( int (*)( 
-                                const ast::Type *, const ast::Type *, const ast::SymbolTable &, 
+                return convertToReferenceCost(
+                        src, refType, symtab, env,
+                        ( int (*)(
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
                                 const ast::TypeEnvironment & )
                         ) ptrsCastable );
@@ -229 +229 @@
                 #warning cast on castCost artifact of having two functions, remove when port done
                 ast::Pass< CastCost_new > converter{
-                        dst, symtab, env, 
-                        ( Cost (*)( 
-                                const ast::Type *, const ast::Type *, const ast::SymbolTable &, 
+                        dst, symtab, env,
+                        ( Cost (*)(
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
                                 const ast::TypeEnvironment & )
                         ) castCost };