Changeset 121ac13 for src/ResolvExpr

Timestamp:

Nov 6, 2017, 10:28:17 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

bbeb908

Parents:

59a0bde (diff), 9f4524b (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:

• AdjustExprType.cc (modified) (2 diffs)
• AlternativeFinder.cc (modified) (9 diffs)
• CommonType.cc (modified) (2 diffs)
• ConversionCost.cc (modified) (12 diffs)
• PolyCost.cc (modified) (3 diffs)
• PtrsAssignable.cc (modified) (6 diffs)
• PtrsCastable.cc (modified) (4 diffs)
• Resolver.cc (modified) (1 diff)
• Unify.cc (modified) (4 diffs)

src/ResolvExpr/AdjustExprType.cc

@@ -28 +28 @@
                 void premutate( BasicType * ) { visit_children = false; }
                 void premutate( PointerType * ) { visit_children = false; }
+                void premutate( ArrayType * ) { visit_children = false; }
                 void premutate( FunctionType * ) { visit_children = false; }
                 void premutate( StructInstType * ) { visit_children = false; }
@@ -59 +60 @@
 
         Type * AdjustExprType::postmutate( ArrayType * arrayType ) {
-                // need to recursively mutate the base type in order for multi-dimensional arrays to work.
                 PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base );
                 arrayType->base = nullptr;

src/ResolvExpr/AlternativeFinder.cc

@@ -122 +122 @@
                                                 )
                                                 mapPlace->second.isAmbiguous = true;
+                                        } else {
+                                                PRINT(
+                                                        std::cerr << "cost " << candidate->cost << " loses to " << mapPlace->second.candidate->cost << std::endl;
+                                                )
                                         }
                                 } else {
@@ -127 +131 @@
                                 }
                         }
-
-                        PRINT(
-                                std::cerr << "there are " << selected.size() << " alternatives before elimination" << std::endl;
-                        )
 
                         // accept the alternatives that were unambiguous
@@ -180 +180 @@
                         throw SemanticError( "No reasonable alternatives for expression ", expr );
                 }
-                for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
-                        if ( adjust ) {
-                                adjustExprType( i->expr->get_result(), i->env, indexer );
-                        }
-                }
                 if ( prune ) {
+                        auto oldsize = alternatives.size();
                         PRINT(
                                 std::cerr << "alternatives before prune:" << std::endl;
@@ -204 +200 @@
                         alternatives.erase( oldBegin, alternatives.end() );
                         PRINT(
+                                std::cerr << "there are " << oldsize << " alternatives before elimination" << std::endl;
+                        )
+                        PRINT(
                                 std::cerr << "there are " << alternatives.size() << " alternatives after elimination" << std::endl;
                         )
+                }
+                // adjust types after pruning so that types substituted by pruneAlternatives are correctly adjusted
+                for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
+                        if ( adjust ) {
+                                adjustExprType( i->expr->get_result(), i->env, indexer );
+                        }
                 }
 
@@ -318 +323 @@
         Cost computeExpressionConversionCost( Expression *& actualExpr, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
                 Cost convCost = computeConversionCost( actualExpr->result, formalType, indexer, env );
-                // if ( convCost != Cost::zero ) {
-
-                // xxx - temporary -- ignore poly cost, since this causes some polymorphic functions to be cast, which causes the specialize
-                // pass to try to specialize them, which currently does not work. Once that is fixed, remove the next 3 lines and uncomment the
-                // previous line.
+
+                // if there is a non-zero conversion cost, ignoring poly cost, then the expression requires conversion.
+                // ignore poly cost for now, since this requires resolution of the cast to infer parameters and this
+                // does not currently work for the reason stated below.
                 Cost tmpCost = convCost;
                 tmpCost.incPoly( -tmpCost.get_polyCost() );
                 if ( tmpCost != Cost::zero ) {
+                // if ( convCost != Cost::zero ) {
                         Type *newType = formalType->clone();
                         env.apply( newType );
@@ -631 +636 @@
                                         std::cerr << std::endl;
                                 )
-                                ApplicationExpr *appExpr = static_cast< ApplicationExpr* >( newerAlt.expr );
                                 // follow the current assertion's ID chain to find the correct set of inferred parameters to add the candidate to (i.e. the set of inferred parameters belonging to the entity which requested the assertion parameter).
-                                InferredParams * inferParameters = &appExpr->get_inferParams();
+                                InferredParams * inferParameters = &newerAlt.expr->get_inferParams();
                                 for ( UniqueId id : cur->second.idChain ) {
                                         inferParameters = (*inferParameters)[ id ].inferParams.get();
@@ -680 +684 @@
                 OpenVarSet openVars;
                 AssertionSet resultNeed, resultHave;
-                TypeEnvironment resultEnv;
+                TypeEnvironment resultEnv( func.env );
                 makeUnifiableVars( funcType, openVars, resultNeed );
                 resultEnv.add( funcType->get_forall() ); // add all type variables as open variables now so that those not used in the parameter list are still considered open
@@ -914 +918 @@
                                 thisCost.incSafe( discardedValues );
                                 Alternative newAlt( restructureCast( i->expr->clone(), toType ), i->env, i->cost, thisCost );
-                                // xxx - this doesn't work at the moment, since inferParameters requires an ApplicationExpr as the alternative.
-                                // Once this works, it should be possible to infer parameters on a cast expression and specialize any function.
-
-                                // inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( candidates ) );
-                                candidates.emplace_back( std::move( newAlt ) );
+                                inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( candidates ) );
                         } // if
                 } // for
@@ -1297 +1297 @@
                                         // count one safe conversion for each value that is thrown away
                                         thisCost.incSafe( discardedValues );
-                                        candidates.push_back( Alternative( new InitExpr( restructureCast( alt.expr->clone(), toType ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost ) );
+                                        Alternative newAlt( new InitExpr( restructureCast( alt.expr->clone(), toType ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost );
+                                        inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( candidates ) );
                                 }
                         }

src/ResolvExpr/CommonType.cc

@@ -61 +61 @@
         };
 
-        Type * handleReference( ReferenceType * refType, Type * other, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment & env, const OpenVarSet &openVars ) {
-                Type * result = nullptr, * common = nullptr;
+        Type * handleReference( Type * t1, Type * t2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment & env, const OpenVarSet &openVars ) {
+                Type * common = nullptr;
                 AssertionSet have, need;
                 OpenVarSet newOpen( openVars );
                 // need unify to bind type variables
-                if ( unify( refType->get_base(), other, env, have, need, newOpen, indexer, common ) ) {
-                        // std::cerr << "unify success" << std::endl;
-                        if ( widenSecond ) {
-                                // std::cerr << "widen second" << std::endl;
-                                if ( widenFirst || other->get_qualifiers() <= refType->get_qualifiers() ) {
-                                        result = new ReferenceType( refType->get_qualifiers(), common ); // refType->clone();
-                                        result->get_qualifiers() |= other->get_qualifiers();
-                                }
-                        } else if ( widenFirst ) {
-                                // std::cerr << "widen first" << std::endl;
-                                if ( widenSecond || refType->get_qualifiers() <= other->get_qualifiers() ) {
-                                        result = common;
-                                        result->get_qualifiers() |= refType->get_qualifiers();
-                                }
-                        }
-                } else {
-                        // std::cerr << "exact unify failed: " << refType << " " << other << std::endl;
-                }
-                // std::cerr << "common type of reference [" << refType << "] and non-reference [" << other << "] is [" << result << "]" << std::endl;
-                return result;
+                if ( unify( t1, t2, env, have, need, newOpen, indexer, common ) ) {
+                        // std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                        if ( (widenFirst || t2->get_qualifiers() <= t1->get_qualifiers()) && (widenSecond || t1->get_qualifiers() <= t2->get_qualifiers()) ) {
+                                // std::cerr << "widen okay" << std::endl;
+                                common->get_qualifiers() |= t1->get_qualifiers();
+                                common->get_qualifiers() |= t2->get_qualifiers();
+                                return common;
+                        }
+                }
+                // std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+                return nullptr;
         }
 
@@ -99 +90 @@
 
                         // special case where one type has a reference depth of 1 larger than the other
-                        if ( diff > 0 ) {
-                                return handleReference( strict_dynamic_cast<ReferenceType *>( type1 ), type2, widenFirst, widenSecond, indexer, env, openVars );
-                        } else if ( diff < 0 ) {
-                                return handleReference( strict_dynamic_cast<ReferenceType *>( type2 ), type1, widenSecond, widenFirst, indexer, env, openVars );
+                        if ( diff > 0 || diff < 0 ) {
+                                Type * result = nullptr;
+                                if ( ReferenceType * ref1 = dynamic_cast< ReferenceType * >( type1 ) ) {
+                                        // formal is reference, so result should be reference
+                                        result = handleReference( ref1->base, type2, widenFirst, widenSecond, indexer, env, openVars );
+                                        if ( result ) result = new ReferenceType( ref1->get_qualifiers(), result );
+                                } else {
+                                        // formal is value, so result should be value
+                                        ReferenceType * ref2 = strict_dynamic_cast< ReferenceType * > ( type2 );
+                                        result = handleReference( type1, ref2->base, widenFirst, widenSecond, indexer, env, openVars );
+                                }
+                                // std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
+                                return result;
                         }
                         // otherwise, both are reference types of the same depth and this is handled by the CommonType visitor.

src/ResolvExpr/ConversionCost.cc

@@ -28 +28 @@
 
 namespace ResolvExpr {
-        const Cost Cost::zero = Cost( 0, 0, 0, 0 );
-        const Cost Cost::infinity = Cost( -1, -1, -1, -1 );
-        const Cost Cost::unsafe = Cost( 1, 0, 0, 0 );
-        const Cost Cost::poly = Cost( 0, 1, 0, 0 );
-        const Cost Cost::safe = Cost( 0, 0, 1, 0 );
-        const Cost Cost::reference = Cost( 0, 0, 0, 1 );
+        const Cost Cost::zero =      Cost(  0,  0,  0,  0 );
+        const Cost Cost::infinity =  Cost( -1, -1, -1, -1 );
+        const Cost Cost::unsafe =    Cost(  1,  0,  0,  0 );
+        const Cost Cost::poly =      Cost(  0,  1,  0,  0 );
+        const Cost Cost::safe =      Cost(  0,  0,  1,  0 );
+        const Cost Cost::reference = Cost(  0,  0,  0,  1 );
 
 #if 0
@@ -113 +113 @@
                                         int assignResult = func( srcAsRef->get_base(), destAsRef->get_base(), env, indexer );
                                         PRINT( std::cerr << "comparing references: " << assignResult << " " << srcAsRef << " " << destAsRef << std::endl; )
-                                        if ( assignResult < 0 ) {
+                                        if ( assignResult > 0 ) {
                                                 return Cost::safe;
-                                        } else if ( assignResult > 0 ) {
+                                        } else if ( assignResult < 0 ) {
                                                 return Cost::unsafe;
                                         } // if
@@ -269 +269 @@
         }
 
-        void ConversionCost::visit(PointerType *pointerType) {
+        void ConversionCost::visit( PointerType * pointerType ) {
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
                         PRINT( std::cerr << pointerType << " ===> " << destAsPtr; )
@@ -284 +284 @@
                                 }
                         } else {  // xxx - this discards qualifiers from consideration -- reducing qualifiers is a safe conversion; is this right?
-                                int assignResult = ptrsAssignable( pointerType->get_base(), destAsPtr->get_base(), env );
+                                int assignResult = ptrsAssignable( pointerType->base, destAsPtr->base, env );
                                 PRINT( std::cerr << " :: " << assignResult << std::endl; )
-                                if ( assignResult < 0 && pointerType->get_base()->get_qualifiers() <= destAsPtr->get_qualifiers() ) {
+                                if ( assignResult > 0 && pointerType->get_base()->get_qualifiers() <= destAsPtr->get_qualifiers() ) {
                                         cost = Cost::safe;
-                                } else if ( assignResult > 0 ) {
+                                } else if ( assignResult < 0 ) {
                                         cost = Cost::unsafe;
                                 } // if
                                 // assignResult == 0 means Cost::Infinity
                         } // if
-                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
+                } else if ( dynamic_cast< ZeroType * >( dest ) ) {
                         cost = Cost::unsafe;
                 } // if
         }
 
-        void ConversionCost::visit(__attribute((unused)) ArrayType *arrayType) {}
-
-        void ConversionCost::visit(ReferenceType *refType) {
+        void ConversionCost::visit( ArrayType * ) {}
+
+        void ConversionCost::visit( ReferenceType * refType ) {
                 // Note: dest can never be a reference, since it would have been caught in an earlier check
                 assert( ! dynamic_cast< ReferenceType * >( dest ) );
@@ -317 +317 @@
         }
 
-        void ConversionCost::visit(__attribute((unused)) FunctionType *functionType) {}
-
-        void ConversionCost::visit(StructInstType *inst) {
+        void ConversionCost::visit( FunctionType * ) {}
+
+        void ConversionCost::visit( StructInstType * inst ) {
                 if ( StructInstType *destAsInst = dynamic_cast< StructInstType* >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
@@ -327 +327 @@
         }
 
-        void ConversionCost::visit(UnionInstType *inst) {
+        void ConversionCost::visit( UnionInstType * inst ) {
                 if ( UnionInstType *destAsInst = dynamic_cast< UnionInstType* >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
@@ -335 +335 @@
         }
 
-        void ConversionCost::visit( __attribute((unused)) EnumInstType *inst ) {
+        void ConversionCost::visit( EnumInstType * ) {
                 static Type::Qualifiers q;
                 static BasicType integer( q, BasicType::SignedInt );
@@ -344 +344 @@
         }
 
-        void ConversionCost::visit( __attribute((unused)) TraitInstType *inst) {
-        }
-
-        void ConversionCost::visit(TypeInstType *inst) {
+        void ConversionCost::visit( TraitInstType * ) {}
+
+        void ConversionCost::visit( TypeInstType *inst ) {
                 EqvClass eqvClass;
                 NamedTypeDecl *namedType;
@@ -366 +365 @@
         }
 
-        void ConversionCost::visit( __attribute((unused)) TupleType *tupleType) {
+        void ConversionCost::visit( TupleType * tupleType ) {
                 Cost c = Cost::zero;
-                if ( TupleType *destAsTuple = dynamic_cast< TupleType* >( dest ) ) {
-                        std::list< Type* >::const_iterator srcIt = tupleType->get_types().begin();
-                        std::list< Type* >::const_iterator destIt = destAsTuple->get_types().begin();
+                if ( TupleType * destAsTuple = dynamic_cast< TupleType * >( dest ) ) {
+                        std::list< Type * >::const_iterator srcIt = tupleType->get_types().begin();
+                        std::list< Type * >::const_iterator destIt = destAsTuple->get_types().begin();
                         while ( srcIt != tupleType->get_types().end() && destIt != destAsTuple->get_types().end() ) {
                                 Cost newCost = conversionCost( *srcIt++, *destIt++, indexer, env );
@@ -386 +385 @@
         }
 
-        void ConversionCost::visit( __attribute((unused)) VarArgsType *varArgsType) {
+        void ConversionCost::visit( VarArgsType * ) {
                 if ( dynamic_cast< VarArgsType* >( dest ) ) {
                         cost = Cost::zero;
@@ -392 +391 @@
         }
 
-        void ConversionCost::visit( __attribute((unused)) ZeroType *zeroType) {
-                if ( dynamic_cast< ZeroType* >( dest ) ) {
+        void ConversionCost::visit( ZeroType * ) {
+                if ( dynamic_cast< ZeroType * >( dest ) ) {
                         cost = Cost::zero;
                 } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
@@ -409 +408 @@
         }
 
-        void ConversionCost::visit( __attribute((unused)) OneType *oneType) {
-                if ( dynamic_cast< OneType* >( dest ) ) {
+        void ConversionCost::visit( OneType * ) {
+                if ( dynamic_cast< OneType * >( dest ) ) {
                         cost = Cost::zero;
                 } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {

src/ResolvExpr/PolyCost.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PolyCost.cc -- 
+// PolyCost.cc --
 //
 // Author           : Richard C. Bilson
@@ -31 +31 @@
         };
 
-        int polyCost( Type *type, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+        int polyCost( Type *type, const TypeEnvironment & env, const SymTab::Indexer &indexer ) {
                 PolyCost coster( env, indexer );
                 type->accept( coster );
@@ -37 +37 @@
         }
 
-        PolyCost::PolyCost( const TypeEnvironment &env, const SymTab::Indexer &indexer ) : result( 0 ), env( env ), indexer( indexer ) {
+        PolyCost::PolyCost( const TypeEnvironment & env, const SymTab::Indexer & indexer ) : result( 0 ), env( env ), indexer( indexer ) {
         }
 
-        void PolyCost::visit(TypeInstType *typeInst) {
+        void PolyCost::visit(TypeInstType * typeInst) {
                 EqvClass eqvClass;
-                if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
+                if ( env.lookup( typeInst->name, eqvClass ) ) {
                         if ( eqvClass.type ) {
-                                if ( TypeInstType *otherTypeInst = dynamic_cast< TypeInstType* >( eqvClass.type ) ) {
-                                        if ( indexer.lookupType( otherTypeInst->get_name() ) ) {
+                                if ( TypeInstType * otherTypeInst = dynamic_cast< TypeInstType* >( eqvClass.type ) ) {
+                                        if ( indexer.lookupType( otherTypeInst->name ) ) {
+                                                // bound to opaque type
                                                 result += 1;
                                         } // if
                                 } else {
+                                        // bound to concrete type
                                         result += 1;
                                 } // if

src/ResolvExpr/PtrsAssignable.cc

@@ -47 +47 @@
 
         int ptrsAssignable( Type *src, Type *dest, const TypeEnvironment &env ) {
+                // std::cerr << "assignable: " << src << " | " << dest << std::endl;
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
                         EqvClass eqvClass;
@@ -54 +55 @@
                 } // if
                 if ( dynamic_cast< VoidType* >( dest ) ) {
-                        return 1;
+                        // void * = T * for any T is unsafe
+                        // xxx - this should be safe, but that currently breaks the build
+                        return -1;
                 } else {
                         PtrsAssignable ptrs( dest, env );
@@ -65 +68 @@
 
         void PtrsAssignable::visit( __attribute((unused)) VoidType *voidType ) {
-                if ( dynamic_cast< FunctionType* >( dest ) ) {
-                        result = 0;
-                } else {
-                        result = -1;
+                if ( ! dynamic_cast< FunctionType* >( dest ) ) {
+                        // T * = void * is safe for any T that is not a function type.
+                        // xxx - this should be unsafe...
+                        result = 1;
                 } // if
         }
@@ -75 +78 @@
         void PtrsAssignable::visit( __attribute__((unused)) PointerType *pointerType ) {}
         void PtrsAssignable::visit( __attribute__((unused)) ArrayType *arrayType ) {}
-        void PtrsAssignable::visit( __attribute__((unused)) FunctionType *functionType ) {
-                result = -1;
-        }
+        void PtrsAssignable::visit( __attribute__((unused)) FunctionType *functionType ) {}
 
         void PtrsAssignable::visit(  __attribute__((unused)) StructInstType *inst ) {}
@@ -83 +84 @@
 
         void PtrsAssignable::visit( EnumInstType * ) {
-                if ( dynamic_cast< EnumInstType* >( dest ) ) {
+                if ( dynamic_cast< BasicType* >( dest ) ) {
+                        // int * = E *, etc. is safe. This isn't technically correct, as each
+                        // enum has one basic type that it is compatible with, an that type can
+                        // differ from enum to enum. Without replicating GCC's internal logic,
+                        // there is no way to know which type this particular enum is compatible
+                        // with, so punt on this for now.
                         result = 1;
-                } else if ( BasicType *bt = dynamic_cast< BasicType* >( dest ) ) {
-                        result = bt->get_kind() == BasicType::SignedInt;
                 }
         }
@@ -94 +98 @@
                 EqvClass eqvClass;
                 if ( env.lookup( inst->get_name(), eqvClass ) && eqvClass.type ) {
+                        // T * = S * for any S depends on the type bound to T
                         result = ptrsAssignable( eqvClass.type, dest, env );
-                } else {
-                        result = 0;
                 } // if
         }

src/ResolvExpr/PtrsCastable.cc

@@ -50 +50 @@
         };
 
-        int objectCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
-                if ( dynamic_cast< FunctionType* >( src ) ) {
-                        return -1;
-                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
-                        EqvClass eqvClass;
-                        if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
-                                if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
-                                        if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
+        namespace {
+                int objectCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                        if ( dynamic_cast< FunctionType* >( src ) ) {
+                                return -1;
+                        } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
+                                EqvClass eqvClass;
+                                if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
+                                        if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
+                                                if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
+                                                        return -1;
+                                                } // if
+                                        } //if
+                                } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
+                                        if ( eqvClass.data.kind == TypeDecl::Ftype ) {
                                                 return -1;
                                         } // if
-                                } //if
-                        } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
-                                if ( eqvClass.data.kind == TypeDecl::Ftype ) {
-                                        return -1;
                                 } // if
-                        } // if
-                } //if
-                return 1;
-        }
-        int functionCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
-                return -1 * objectCast( src, env, indexer );  // reverse the sense of objectCast
+                        } //if
+                        return 1;
+                }
+                int functionCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                        return -1 * objectCast( src, env, indexer );  // reverse the sense of objectCast
+                }
         }
 
@@ -93 +95 @@
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) VoidType *voidType) {
+        void PtrsCastable::visit( VoidType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) BasicType *basicType) {
+        void PtrsCastable::visit( BasicType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) PointerType *pointerType) {
+        void PtrsCastable::visit( PointerType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) ArrayType *arrayType) {
+        void PtrsCastable::visit( ArrayType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) FunctionType *functionType) {
+        void PtrsCastable::visit( FunctionType * ) {
                 // result = -1;
                 result = functionCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) StructInstType *inst) {
+        void PtrsCastable::visit( StructInstType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) UnionInstType *inst) {
+        void PtrsCastable::visit( UnionInstType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) EnumInstType *inst) {
+        void PtrsCastable::visit( EnumInstType * ) {
                 if ( dynamic_cast< EnumInstType* >( dest ) ) {
                         result = 1;
@@ -136 +138 @@
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) TraitInstType *inst ) {}
+        void PtrsCastable::visit( TraitInstType * ) {}
 
         void PtrsCastable::visit(TypeInstType *inst) {
@@ -143 +145 @@
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) TupleType *tupleType) {
+        void PtrsCastable::visit( TupleType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) VarArgsType *varArgsType) {
+        void PtrsCastable::visit( VarArgsType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) ZeroType *zeroType) {
+        void PtrsCastable::visit( ZeroType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) OneType *oneType) {
+        void PtrsCastable::visit( OneType * ) {
                 result = objectCast( dest, env, indexer );
         }

src/ResolvExpr/Resolver.cc

@@ -593 +593 @@
                 initExpr->expr = nullptr;
                 std::swap( initExpr->env, newExpr->env );
+                std::swap( initExpr->inferParams, newExpr->inferParams ) ;
                 delete initExpr;
 

src/ResolvExpr/Unify.cc

@@ -17 +17 @@
 #include <iterator>               // for back_insert_iterator, back_inserter
 #include <map>                    // for _Rb_tree_const_iterator, _Rb_tree_i...
-#include <memory>                 // for unique_ptr, auto_ptr
+#include <memory>                 // for unique_ptr
 #include <set>                    // for set
 #include <string>                 // for string, operator==, operator!=, bas...
@@ -138 +138 @@
         bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
                 switch ( data.kind ) {
-                  case TypeDecl::Any:
                   case TypeDecl::Dtype:
                         // to bind to an object type variable, the type must not be a function type.
@@ -170 +169 @@
                                 Type *common = 0;
                                 // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
-                                std::auto_ptr< Type > newType( curClass.type->clone() );
+                                std::unique_ptr< Type > newType( curClass.type->clone() );
                                 newType->get_qualifiers() = typeInst->get_qualifiers();
                                 if ( unifyInexact( newType.get(), other, env, needAssertions, haveAssertions, openVars, widenMode & WidenMode( curClass.allowWidening, true ), indexer, common ) ) {
@@ -459 +458 @@
                 if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) {
 
-                        // not positive this is correct in all cases, but it's needed for typedefs
-                        if ( arrayType->get_isVarLen() || otherArray->get_isVarLen() ) {
-                                return;
-                        }
-
                         if ( ! arrayType->get_isVarLen() && ! otherArray->get_isVarLen() &&
                                 arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0 ) {