Changes in / [62194cb:178e4ec]

Location:

src

Files:

• GenPoly/Box.cc (modified) (5 diffs)
• GenPoly/InstantiateGeneric.cc (modified) (4 diffs)
• InitTweak/FixInit.cc (modified) (7 diffs)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• InitTweak/InitTweak.h (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (33 diffs)
• ResolvExpr/AlternativeFinder.h (modified) (3 diffs)
• ResolvExpr/PtrsAssignable.cc (modified) (1 diff)
• ResolvExpr/TypeEnvironment.cc (modified) (1 diff)
• ResolvExpr/TypeEnvironment.h (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (5 diffs)
• SymTab/Autogen.h (modified) (6 diffs)
• SymTab/Indexer.cc (modified) (1 diff)
• SymTab/Indexer.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (5 diffs)
• SynTree/Expression.cc (modified) (1 diff)
• libcfa/concurrency/kernel (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (1 diff)
• libcfa/stdhdr/stddef.h (modified) (2 diffs)
• libcfa/stdlib (modified) (6 diffs)
• prelude/prelude.cf (modified) (4 diffs)
• tests/.expect/alloc-ERROR.txt (added)
• tests/.expect/completeTypeError.txt (modified) (5 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/alloc.c (modified) (4 diffs)
• tests/completeTypeError.c (modified) (2 diffs)
• tests/dtor-early-exit.c (modified) (1 diff)
• tests/init_once.c (modified) (1 diff)
• tests/multiDimension.c (modified) (3 diffs)
• tests/tupleVariadic.c (modified) (1 diff)
• tests/vector/vector_int.c (modified) (4 diffs)

src/GenPoly/Box.cc

@@ -167 +167 @@
                         Expression *postmutate( OffsetofExpr *offsetofExpr );
                         Expression *postmutate( OffsetPackExpr *offsetPackExpr );
+                        void premutate( StructDecl * );
+                        void premutate( UnionDecl * );
 
                         void beginScope();
@@ -178 +180 @@
                         /// adds type parameters to the layout call; will generate the appropriate parameters if needed
                         void addOtypeParamsToLayoutCall( UntypedExpr *layoutCall, const std::list< Type* > &otypeParams );
+                        /// change the type of generic aggregate members to char[]
+                        void mutateMembers( AggregateDecl * aggrDecl );
 
                         /// Enters a new scope for type-variables, adding the type variables from ty
@@ -1414 +1418 @@
 
                 void PolyGenericCalculator::premutate( TypedefDecl *typedefDecl ) {
+                        assert(false);
                         beginTypeScope( typedefDecl->get_base() );
                 }
@@ -1460 +1465 @@
                 }
 
+                /// converts polymorphic type T into a suitable monomorphic representation, currently: __attribute__((aligned(8)) char[size_T]
+                Type * polyToMonoType( Type * declType ) {
+                        Type * charType = new BasicType( Type::Qualifiers(), BasicType::Kind::Char);
+                        Expression * size = new NameExpr( sizeofName( mangleType(declType) ) );
+                        Attribute * aligned = new Attribute( "aligned", std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } );
+                        return new ArrayType( Type::Qualifiers(), charType, size,
+                                true, false, std::list<Attribute *>{ aligned } );
+                }
+
+                void PolyGenericCalculator::mutateMembers( AggregateDecl * aggrDecl ) {
+                        std::set< std::string > genericParams;
+                        for ( TypeDecl * td : aggrDecl->parameters ) {
+                                genericParams.insert( td->name );
+                        }
+                        for ( Declaration * decl : aggrDecl->members ) {
+                                if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( decl ) ) {
+                                        Type * ty = replaceTypeInst( field->type, env );
+                                        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( ty ) ) {
+                                                // do not try to monomorphize generic parameters
+                                                if ( scopeTyVars.find( typeInst->get_name() ) != scopeTyVars.end() && ! genericParams.count( typeInst->name ) ) {
+                                                        // polymorphic aggregate members should be converted into monomorphic members.
+                                                        // Using char[size_T] here respects the expected sizing rules of an aggregate type.
+                                                        Type * newType = polyToMonoType( field->type );
+                                                        delete field->type;
+                                                        field->type = newType;
+                                                }
+                                        }
+                                }
+                        }
+                }
+
+                void PolyGenericCalculator::premutate( StructDecl * structDecl ) {
+                        mutateMembers( structDecl );
+                }
+
+                void PolyGenericCalculator::premutate( UnionDecl * unionDecl ) {
+                        mutateMembers( unionDecl );
+                }
+
                 void PolyGenericCalculator::premutate( DeclStmt *declStmt ) {
                         if ( ObjectDecl *objectDecl = dynamic_cast< ObjectDecl *>( declStmt->get_decl() ) ) {
@@ -1465 +1509 @@
                                         // change initialization of a polymorphic value object to allocate via a VLA
                                         // (alloca was previously used, but can't be safely used in loops)
-                                        Type *declType = objectDecl->get_type();
-                                        ObjectDecl *newBuf = new ObjectDecl( bufNamer.newName(), Type::StorageClasses(), LinkageSpec::C, 0,
-                                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ),
-                                                true, false, std::list<Attribute*>{ new Attribute( "aligned", std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
+                                        ObjectDecl *newBuf = ObjectDecl::newObject( bufNamer.newName(), polyToMonoType( objectDecl->type ), nullptr );
                                         stmtsToAddBefore.push_back( new DeclStmt( noLabels, newBuf ) );
 

src/GenPoly/InstantiateGeneric.cc

@@ -27 +27 @@
 #include "Common/utility.h"            // for deleteAll, cloneAll
 #include "GenPoly.h"                   // for isPolyType, typesPolyCompatible
+#include "ResolvExpr/typeops.h"
 #include "ScopedSet.h"                 // for ScopedSet, ScopedSet<>::iterator
 #include "ScrubTyVars.h"               // for ScrubTyVars
@@ -151 +152 @@
                 return gt;
         }
+
+        /// Add cast to dtype-static member expressions so that type information is not lost in GenericInstantiator
+        struct FixDtypeStatic final {
+                Expression * postmutate( MemberExpr * memberExpr );
+
+                template<typename AggrInst>
+                Expression * fixMemberExpr( AggrInst * inst, MemberExpr * memberExpr );
+        };
 
         /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
@@ -198 +207 @@
 
         void instantiateGeneric( std::list< Declaration* > &translationUnit ) {
+                PassVisitor<FixDtypeStatic> fixer;
                 PassVisitor<GenericInstantiator> instantiator;
+
+                mutateAll( translationUnit, fixer );
                 mutateAll( translationUnit, instantiator );
+        }
+
+        bool isDtypeStatic( const std::list< TypeDecl* >& baseParams ) {
+                return std::all_of( baseParams.begin(), baseParams.end(), []( TypeDecl * td ) { return ! td->isComplete(); } );
         }
 
@@ -479 +495 @@
         }
 
+        template< typename AggrInst >
+        Expression * FixDtypeStatic::fixMemberExpr( AggrInst * inst, MemberExpr * memberExpr ) {
+                // need to cast dtype-static member expressions to their actual type before that type is erased.
+                auto & baseParams = *inst->get_baseParameters();
+                if ( isDtypeStatic( baseParams ) ) {
+                        if ( ! ResolvExpr::typesCompatible( memberExpr->result, memberExpr->member->get_type(), SymTab::Indexer() ) ) {
+                                // type of member and type of expression differ, so add cast to actual type
+                                return new CastExpr( memberExpr, memberExpr->result->clone() );
+                        }
+                }
+                return memberExpr;
+        }
+
+        Expression * FixDtypeStatic::postmutate( MemberExpr * memberExpr ) {
+                Type * aggrType = memberExpr->aggregate->result;
+                if ( isGenericType( aggrType ) ) {
+                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( aggrType ) ) {
+                                return fixMemberExpr( inst, memberExpr );
+                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( aggrType ) ) {
+                                return fixMemberExpr( inst, memberExpr );
+                        }
+                }
+                return memberExpr;
+        }
+
 } // namespace GenPoly
 

src/InitTweak/FixInit.cc

@@ -393 +393 @@
                         if ( skipCopyConstruct( result ) ) return; // skip certain non-copyable types
 
-                        // type may involve type variables, so apply type substitution to get temporary variable's actual type.
+                        // type may involve type variables, so apply type substitution to get temporary variable's actual type,
+                        // since result type may not be substituted (e.g., if the type does not appear in the parameter list)
                         // Use applyFree so that types bound in function pointers are not substituted, e.g. in forall(dtype T) void (*)(T).
-                        result = result->clone();
                         env->applyFree( result );
                         ObjectDecl * tmp = ObjectDecl::newObject( "__tmp", result, nullptr );
@@ -570 +570 @@
 
                         if ( returnDecl ) {
-                                UntypedExpr * assign = new UntypedExpr( new NameExpr( "?=?" ) );
-                                assign->get_args().push_back( new VariableExpr( returnDecl ) );
-                                assign->get_args().push_back( callExpr );
-                                // know the result type of the assignment is the type of the LHS (minus the pointer), so
-                                // add that onto the assignment expression so that later steps have the necessary information
-                                assign->set_result( returnDecl->get_type()->clone() );
-
+                                ApplicationExpr * assign = createBitwiseAssignment( new VariableExpr( returnDecl ), callExpr );
                                 Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
                                 // move env from callExpr to retExpr
@@ -943 +937 @@
                 }
 
-                void addIds( SymTab::Indexer & indexer, const std::list< DeclarationWithType * > & decls ) {
-                        for ( auto d : decls ) {
-                                indexer.addId( d );
-                        }
-                }
-
-                void addTypes( SymTab::Indexer & indexer, const std::list< TypeDecl * > & tds ) {
-                        for ( auto td : tds ) {
-                                indexer.addType( td );
-                                addIds( indexer, td->assertions );
-                        }
-                }
-
                 void GenStructMemberCalls::previsit( FunctionDecl * funcDecl ) {
                         GuardValue( function );
@@ -1012 +993 @@
                                 // need to explicitly re-add function parameters to the indexer in order to resolve copy constructors
                                 auto guard = makeFuncGuard( [this]() { indexer.enterScope(); }, [this]() { indexer.leaveScope(); } );
-                                addTypes( indexer, function->type->forall );
-                                addIds( indexer, function->type->returnVals );
-                                addIds( indexer, function->type->parameters );
+                                indexer.addFunctionType( function->type );
 
                                 // need to iterate through members in reverse in order for
@@ -1029 +1008 @@
                                         // insert and resolve default/copy constructor call for each field that's unhandled
                                         std::list< Statement * > stmt;
-                                        Expression * arg2 = 0;
+                                        Expression * arg2 = nullptr;
                                         if ( isCopyConstructor( function ) ) {
                                                 // if copy ctor, need to pass second-param-of-this-function.field
@@ -1161 +1140 @@
                         assert( ctorExpr->result && ctorExpr->get_result()->size() == 1 );
 
-                        // xxx - ideally we would reuse the temporary generated from the copy constructor passes from within firstArg if it exists and not generate a temporary if it's unnecessary.
-                        ObjectDecl * tmp = ObjectDecl::newObject( tempNamer.newName(), ctorExpr->get_result()->clone(), nullptr );
-                        declsToAddBefore.push_back( tmp );
-
                         // xxx - this can be TupleAssignExpr now. Need to properly handle this case.
                         ApplicationExpr * callExpr = strict_dynamic_cast< ApplicationExpr * > ( ctorExpr->get_callExpr() );
@@ -1170 +1145 @@
                         ctorExpr->set_callExpr( nullptr );
                         ctorExpr->set_env( nullptr );
+
+                        // xxx - ideally we would reuse the temporary generated from the copy constructor passes from within firstArg if it exists and not generate a temporary if it's unnecessary.
+                        ObjectDecl * tmp = ObjectDecl::newObject( tempNamer.newName(), callExpr->args.front()->result->clone(), nullptr );
+                        declsToAddBefore.push_back( tmp );
                         delete ctorExpr;
 

src/InitTweak/InitTweak.cc

@@ -12 +12 @@
 #include "Parser/LinkageSpec.h"    // for Spec, isBuiltin, Intrinsic
 #include "ResolvExpr/typeops.h"    // for typesCompatibleIgnoreQualifiers
+#include "SymTab/Autogen.h"
 #include "SymTab/Indexer.h"        // for Indexer
 #include "SynTree/Attribute.h"     // for Attribute
@@ -524 +525 @@
         }
 
+        ApplicationExpr * createBitwiseAssignment( Expression * dst, Expression * src ) {
+                static FunctionDecl * assign = nullptr;
+                if ( ! assign ) {
+                        // temporary? Generate a fake assignment operator to represent bitwise assignments.
+                        // This operator could easily exist as a real function, but it's tricky because nothing should resolve to this function.
+                        TypeDecl * td = new TypeDecl( "T", noStorageClasses, nullptr, TypeDecl::Dtype, true );
+                        assign = new FunctionDecl( "?=?", noStorageClasses, LinkageSpec::Intrinsic, SymTab::genAssignType( new TypeInstType( noQualifiers, td->name, td ) ), nullptr );
+                }
+                if ( dynamic_cast< ReferenceType * >( dst->result ) ) {
+                        dst = new AddressExpr( dst );
+                } else {
+                        dst = new CastExpr( dst, new ReferenceType( noQualifiers, dst->result->clone() ) );
+                }
+                if ( dynamic_cast< ReferenceType * >( src->result ) ) {
+                        src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
+                }
+                return new ApplicationExpr( VariableExpr::functionPointer( assign ), { dst, src } );
+        }
+
         class ConstExprChecker : public Visitor {
         public:

src/InitTweak/InitTweak.h

@@ -35 +35 @@
         /// returns the first parameter of a constructor/destructor/assignment function
         ObjectDecl * getParamThis( FunctionType * ftype );
+
+        /// generate a bitwise assignment operation.
+        ApplicationExpr * createBitwiseAssignment( Expression * dst, Expression * src );
 
         /// transform Initializer into an argument list that can be passed to a call expression

src/ResolvExpr/AlternativeFinder.cc

@@ -187 +187 @@
                 expr->accept( *this );
                 if ( failFast && alternatives.empty() ) {
+                        PRINT(
+                                std::cerr << "No reasonable alternatives for expression " << expr << std::endl;
+                        )
                         throw SemanticError( "No reasonable alternatives for expression ", expr );
                 }
@@ -579 +582 @@
         /// State to iteratively build a match of parameter expressions to arguments
         struct ArgPack {
-                std::size_t parent;                ///< Index of parent pack 
+                std::size_t parent;                ///< Index of parent pack
                 std::unique_ptr<Expression> expr;  ///< The argument stored here
                 Cost cost;                         ///< The cost of this argument
@@ -590 +593 @@
                 unsigned nextExpl;                 ///< Index of next exploded element
                 unsigned explAlt;                  ///< Index of alternative for nextExpl > 0
-                
+
                 ArgPack()
                         : parent(0), expr(), cost(Cost::zero), env(), need(), have(), openVars(), nextArg(0),
+
                           tupleStart(0), nextExpl(0), explAlt(0) {}
-                
-                ArgPack(const TypeEnvironment& env, const AssertionSet& need, const AssertionSet& have, 
+
+                ArgPack(const TypeEnvironment& env, const AssertionSet& need, const AssertionSet& have,
                                 const OpenVarSet& openVars)
-                        : parent(0), expr(), cost(Cost::zero), env(env), need(need), have(have), 
+                        : parent(0), expr(), cost(Cost::zero), env(env), need(need), have(have),
                           openVars(openVars), nextArg(0), tupleStart(0), nextExpl(0), explAlt(0) {}
-                
-                ArgPack(std::size_t parent, Expression* expr, TypeEnvironment&& env, AssertionSet&& need, 
-                                AssertionSet&& have, OpenVarSet&& openVars, unsigned nextArg, 
-                                unsigned tupleStart = 0, Cost cost = Cost::zero, unsigned nextExpl = 0, 
+
+                ArgPack(std::size_t parent, Expression* expr, TypeEnvironment&& env, AssertionSet&& need,
+                                AssertionSet&& have, OpenVarSet&& openVars, unsigned nextArg,
+                                unsigned tupleStart = 0, Cost cost = Cost::zero, unsigned nextExpl = 0,
                                 unsigned explAlt = 0 )
-                        : parent(parent), expr(expr->clone()), cost(cost), env(move(env)), need(move(need)), 
+                        : parent(parent), expr(expr->clone()), cost(cost), env(move(env)), need(move(need)),
                           have(move(have)), openVars(move(openVars)), nextArg(nextArg), tupleStart(tupleStart),
                           nextExpl(nextExpl), explAlt(explAlt) {}
-                
-                ArgPack(const ArgPack& o, TypeEnvironment&& env, AssertionSet&& need, AssertionSet&& have, 
+
+                ArgPack(const ArgPack& o, TypeEnvironment&& env, AssertionSet&& need, AssertionSet&& have,
                                 OpenVarSet&& openVars, unsigned nextArg, Cost added )
-                        : parent(o.parent), expr(o.expr ? o.expr->clone() : nullptr), cost(o.cost + added), 
-                          env(move(env)), need(move(need)), have(move(have)), openVars(move(openVars)), 
+                        : parent(o.parent), expr(o.expr ? o.expr->clone() : nullptr), cost(o.cost + added),
+                          env(move(env)), need(move(need)), have(move(have)), openVars(move(openVars)),
                           nextArg(nextArg), tupleStart(o.tupleStart), nextExpl(0), explAlt(0) {}
-                
+
                 /// true iff this pack is in the middle of an exploded argument
                 bool hasExpl() const { return nextExpl > 0; }
@@ -621 +625 @@
                         return args[nextArg-1][explAlt];
                 }
-                          
+
                 /// Ends a tuple expression, consolidating the appropriate actuals
                 void endTuple( const std::vector<ArgPack>& packs ) {
@@ -641 +645 @@
 
         /// Instantiates an argument to match a formal, returns false if no results left
-        bool instantiateArgument( Type* formalType, Initializer* initializer, 
-                        const ExplodedArgs& args, std::vector<ArgPack>& results, std::size_t& genStart, 
+        bool instantiateArgument( Type* formalType, Initializer* initializer,
+                        const ExplodedArgs& args, std::vector<ArgPack>& results, std::size_t& genStart,
                         const SymTab::Indexer& indexer, unsigned nTuples = 0 ) {
                 if ( TupleType* tupleType = dynamic_cast<TupleType*>( formalType ) ) {
@@ -649 +653 @@
                         for ( Type* type : *tupleType ) {
                                 // xxx - dropping initializer changes behaviour from previous, but seems correct
-                                if ( ! instantiateArgument( 
-                                                type, nullptr, args, results, genStart, indexer, nTuples ) ) 
+                                if ( ! instantiateArgument(
+                                                type, nullptr, args, results, genStart, indexer, nTuples ) )
                                         return false;
                                 nTuples = 0;
@@ -679 +683 @@
                                         if ( results[i].hasExpl() ) {
                                                 const ExplodedActual& expl = results[i].getExpl( args );
-                                                
+
                                                 unsigned nextExpl = results[i].nextExpl + 1;
                                                 if ( nextExpl == expl.exprs.size() ) {
@@ -686 +690 @@
 
                                                 results.emplace_back(
-                                                        i, expl.exprs[results[i].nextExpl].get(), copy(results[i].env), 
-                                                        copy(results[i].need), copy(results[i].have), 
-                                                        copy(results[i].openVars), nextArg, nTuples, Cost::zero, nextExpl, 
+                                                        i, expl.exprs[results[i].nextExpl].get(), copy(results[i].env),
+                                                        copy(results[i].need), copy(results[i].have),
+                                                        copy(results[i].openVars), nextArg, nTuples, Cost::zero, nextExpl,
                                                         results[i].explAlt );
-                                                
+
                                                 continue;
                                         }
-                                        
+
                                         // finish result when out of arguments
                                         if ( nextArg >= args.size() ) {
-                                                ArgPack newResult{ 
-                                                        results[i].env, results[i].need, results[i].have, 
+                                                ArgPack newResult{
+                                                        results[i].env, results[i].need, results[i].have,
                                                         results[i].openVars };
                                                 newResult.nextArg = nextArg;
@@ -717 +721 @@
 
                                                         if ( results[i].tupleStart > 0 && Tuples::isTtype( argType ) ) {
-                                                                // the case where a ttype value is passed directly is special, 
+                                                                // the case where a ttype value is passed directly is special,
                                                                 // e.g. for argument forwarding purposes
-                                                                // xxx - what if passing multiple arguments, last of which is 
+                                                                // xxx - what if passing multiple arguments, last of which is
                                                                 //       ttype?
-                                                                // xxx - what would happen if unify was changed so that unifying 
-                                                                //       tuple 
-                                                                // types flattened both before unifying lists? then pass in 
+                                                                // xxx - what would happen if unify was changed so that unifying
+                                                                //       tuple
+                                                                // types flattened both before unifying lists? then pass in
                                                                 // TupleType (ttype) below.
                                                                 --newResult.tupleStart;
@@ -734 +738 @@
 
                                                 // check unification for ttype before adding to final
-                                                if ( unify( ttype, argType, newResult.env, newResult.need, newResult.have, 
+                                                if ( unify( ttype, argType, newResult.env, newResult.need, newResult.have,
                                                                 newResult.openVars, indexer ) ) {
                                                         finalResults.push_back( move(newResult) );
                                                 }
-                                                
+
                                                 continue;
                                         }
@@ -745 +749 @@
                                         for ( std::size_t j = 0; j < args[nextArg].size(); ++j ) {
                                                 const ExplodedActual& expl = args[nextArg][j];
-                                        
+
                                                 // fresh copies of parent parameters for this iteration
                                                 TypeEnvironment env = results[i].env;
@@ -755 +759 @@
                                                 if ( expl.exprs.empty() ) {
                                                         results.emplace_back(
-                                                                results[i], move(env), copy(results[i].need), 
+                                                                results[i], move(env), copy(results[i].need),
                                                                 copy(results[i].have), move(openVars), nextArg + 1, expl.cost );
-                                                        
+
                                                         continue;
                                                 }
@@ -763 +767 @@
                                                 // add new result
                                                 results.emplace_back(
-                                                        i, expl.exprs.front().get(), move(env), copy(results[i].need), 
-                                                        copy(results[i].have), move(openVars), nextArg + 1, 
+                                                        i, expl.exprs.front().get(), move(env), copy(results[i].need),
+                                                        copy(results[i].have), move(openVars), nextArg + 1,
                                                         nTuples, expl.cost, expl.exprs.size() == 1 ? 0 : 1, j );
                                         }
@@ -790 +794 @@
                                 const ExplodedActual& expl = results[i].getExpl( args );
                                 Expression* expr = expl.exprs[results[i].nextExpl].get();
-                                
+
                                 TypeEnvironment env = results[i].env;
                                 AssertionSet need = results[i].need, have = results[i].have;
@@ -804 +808 @@
                                         std::cerr << std::endl;
                                 )
-                                
+
                                 if ( unify( formalType, actualType, env, need, have, openVars, indexer ) ) {
                                         unsigned nextExpl = results[i].nextExpl + 1;
@@ -810 +814 @@
                                                 nextExpl = 0;
                                         }
-                                        
-                                        results.emplace_back( 
-                                                i, expr, move(env), move(need), move(have), move(openVars), nextArg, 
+
+                                        results.emplace_back(
+                                                i, expr, move(env), move(need), move(have), move(openVars), nextArg,
                                                 nTuples, Cost::zero, nextExpl, results[i].explAlt );
                                 }
@@ -818 +822 @@
                                 continue;
                         }
-                        
+
                         // use default initializers if out of arguments
                         if ( nextArg >= args.size() ) {
@@ -827 +831 @@
                                                 OpenVarSet openVars = results[i].openVars;
 
-                                                if ( unify( formalType, cnst->get_type(), env, need, have, openVars, 
+                                                if ( unify( formalType, cnst->get_type(), env, need, have, openVars,
                                                                 indexer ) ) {
                                                         results.emplace_back(
-                                                                i, cnstExpr, move(env), move(need), move(have), 
+                                                                i, cnstExpr, move(env), move(need), move(have),
                                                                 move(openVars), nextArg, nTuples );
                                                 }
@@ -849 +853 @@
 
                                 env.addActual( expl.env, openVars );
-                                
+
                                 // skip empty tuple arguments by (near-)cloning parent into next gen
                                 if ( expl.exprs.empty() ) {
                                         results.emplace_back(
-                                                results[i], move(env), move(need), move(have), move(openVars), 
+                                                results[i], move(env), move(need), move(have), move(openVars),
                                                 nextArg + 1, expl.cost );
 
@@ -875 +879 @@
                                         // add new result
                                         results.emplace_back(
-                                                i, expr, move(env), move(need), move(have), move(openVars), nextArg + 1, 
+                                                i, expr, move(env), move(need), move(have), move(openVars), nextArg + 1,
                                                 nTuples, expl.cost, expl.exprs.size() == 1 ? 0 : 1, j );
                                 }
@@ -883 +887 @@
                 // reset for next parameter
                 genStart = genEnd;
-                
+
                 return genEnd != results.size();
         }
 
         template<typename OutputIterator>
-        void AlternativeFinder::validateFunctionAlternative( const Alternative &func, ArgPack& result, 
+        void AlternativeFinder::validateFunctionAlternative( const Alternative &func, ArgPack& result,
                         const std::vector<ArgPack>& results, OutputIterator out ) {
                 ApplicationExpr *appExpr = new ApplicationExpr( func.expr->clone() );
@@ -938 +942 @@
                 for ( DeclarationWithType* formal : funcType->get_parameters() ) {
                         ObjectDecl* obj = strict_dynamic_cast< ObjectDecl* >( formal );
-                        if ( ! instantiateArgument( 
+                        if ( ! instantiateArgument(
                                         obj->get_type(), obj->get_init(), args, results, genStart, indexer ) )
                                 return;
@@ -956 +960 @@
                                         if ( results[i].hasExpl() ) {
                                                 const ExplodedActual& expl = results[i].getExpl( args );
-                                                
+
                                                 unsigned nextExpl = results[i].nextExpl + 1;
                                                 if ( nextExpl == expl.exprs.size() ) {
@@ -963 +967 @@
 
                                                 results.emplace_back(
-                                                        i, expl.exprs[results[i].nextExpl].get(), copy(results[i].env), 
-                                                        copy(results[i].need), copy(results[i].have), 
-                                                        copy(results[i].openVars), nextArg, 0, Cost::zero, nextExpl, 
+                                                        i, expl.exprs[results[i].nextExpl].get(), copy(results[i].env),
+                                                        copy(results[i].need), copy(results[i].have),
+                                                        copy(results[i].openVars), nextArg, 0, Cost::zero, nextExpl,
                                                         results[i].explAlt );
-                                                
+
                                                 continue;
                                         }
@@ -990 +994 @@
                                                 // skip empty tuple arguments by (near-)cloning parent into next gen
                                                 if ( expl.exprs.empty() ) {
-                                                        results.emplace_back( 
-                                                                results[i], move(env), copy(results[i].need), 
+                                                        results.emplace_back(
+                                                                results[i], move(env), copy(results[i].need),
                                                                 copy(results[i].have), move(openVars), nextArg + 1, expl.cost );
-                                                        
+
                                                         continue;
                                                 }
@@ -999 +1003 @@
                                                 // add new result
                                                 results.emplace_back(
-                                                        i, expl.exprs.front().get(), move(env), copy(results[i].need), 
-                                                        copy(results[i].have), move(openVars), nextArg + 1, 0, 
+                                                        i, expl.exprs.front().get(), move(env), copy(results[i].need),
+                                                        copy(results[i].have), move(openVars), nextArg + 1, 0,
                                                         expl.cost, expl.exprs.size() == 1 ? 0 : 1, j );
                                         }
@@ -1050 +1054 @@
                         auto& argE = argExpansions.back();
                         argE.reserve( arg.alternatives.size() );
-                        
+
                         for ( const Alternative& actual : arg ) {
                                 argE.emplace_back( actual, indexer );
@@ -1150 +1154 @@
                 findMinCost( candidates.begin(), candidates.end(), std::back_inserter( winners ) );
 
-                // function may return struct or union value, in which case we need to add alternatives 
-                // for implicitconversions to each of the anonymous members, must happen after findMinCost 
+                // function may return struct or union value, in which case we need to add alternatives
+                // for implicitconversions to each of the anonymous members, must happen after findMinCost
                 // since anon conversions are never the cheapest expression
                 for ( const Alternative & alt : winners ) {
@@ -1182 +1186 @@
                 for ( Alternative& alt : finder.alternatives ) {
                         if ( isLvalue( alt.expr ) ) {
-                                alternatives.push_back( 
+                                alternatives.push_back(
                                         Alternative{ new AddressExpr( alt.expr->clone() ), alt.env, alt.cost } );
                         } // if
@@ -1231 +1235 @@
 
                 AltList candidates;
-                for ( Alternative& alt : finder.alternatives ) {
+                for ( Alternative & alt : finder.alternatives ) {
                         AssertionSet needAssertions, haveAssertions;
                         OpenVarSet openVars;
@@ -1244 +1248 @@
                         // allow casting a tuple to an atomic type (e.g. (int)([1, 2, 3]))
                         // unification run for side-effects
-                        unify( castExpr->get_result(), alt.expr->get_result(), alt.env, needAssertions, 
+                        unify( castExpr->get_result(), alt.expr->get_result(), alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
-                        Cost thisCost = castCost( alt.expr->get_result(), castExpr->get_result(), indexer, 
+                        Cost thisCost = castCost( alt.expr->get_result(), castExpr->get_result(), indexer,
                                 alt.env );
+                        PRINT(
+                                std::cerr << "working on cast with result: " << castExpr->result << std::endl;
+                                std::cerr << "and expr type: " << alt.expr->result << std::endl;
+                                std::cerr << "env: " << alt.env << std::endl;
+                        )
                         if ( thisCost != Cost::infinity ) {
+                                PRINT(
+                                        std::cerr << "has finite cost." << std::endl;
+                                )
                                 // count one safe conversion for each value that is thrown away
                                 thisCost.incSafe( discardedValues );
-                                Alternative newAlt( restructureCast( alt.expr->clone(), toType ), alt.env, 
+                                Alternative newAlt( restructureCast( alt.expr->clone(), toType ), alt.env,
                                         alt.cost, thisCost );
-                                inferParameters( needAssertions, haveAssertions, newAlt, openVars, 
+                                inferParameters( needAssertions, haveAssertions, newAlt, openVars,
                                         back_inserter( candidates ) );
                         } // if
@@ -1542 +1554 @@
         void AlternativeFinder::visit( UntypedTupleExpr *tupleExpr ) {
                 std::vector< AlternativeFinder > subExprAlternatives;
-                findSubExprs( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end(), 
+                findSubExprs( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end(),
                         back_inserter( subExprAlternatives ) );
                 std::vector< AltList > possibilities;
-                combos( subExprAlternatives.begin(), subExprAlternatives.end(), 
+                combos( subExprAlternatives.begin(), subExprAlternatives.end(),
                         back_inserter( possibilities ) );
                 for ( const AltList& alts : possibilities ) {
@@ -1553 +1565 @@
                         TypeEnvironment compositeEnv;
                         simpleCombineEnvironments( alts.begin(), alts.end(), compositeEnv );
-                        alternatives.push_back( 
+                        alternatives.push_back(
                                 Alternative{ new TupleExpr( exprs ), compositeEnv, sumCost( alts ) } );
                 } // for

src/ResolvExpr/AlternativeFinder.h

@@ -32 +32 @@
 
 namespace ResolvExpr {
-        class ArgPack;
-        
-        /// First index is which argument, second index is which alternative for that argument, 
+        struct ArgPack;
+
+        /// First index is which argument, second index is which alternative for that argument,
         /// third index is which exploded element of that alternative
         using ExplodedArgs = std::vector< std::vector< ExplodedActual > >;
-        
+
         class AlternativeFinder : public Visitor {
           public:
@@ -43 +43 @@
 
                 AlternativeFinder( const AlternativeFinder& o )
-                        : indexer(o.indexer), alternatives(o.alternatives), env(o.env), 
+                        : indexer(o.indexer), alternatives(o.alternatives), env(o.env),
                           targetType(o.targetType) {}
-                
+
                 AlternativeFinder( AlternativeFinder&& o )
-                        : indexer(o.indexer), alternatives(std::move(o.alternatives)), env(o.env), 
+                        : indexer(o.indexer), alternatives(std::move(o.alternatives)), env(o.env),
                           targetType(o.targetType) {}
-                
+
                 AlternativeFinder& operator= ( const AlternativeFinder& o ) {
                         if (&o == this) return *this;
-                        
+
                         // horrific nasty hack to rebind references...
                         alternatives.~AltList();
@@ -61 +61 @@
                 AlternativeFinder& operator= ( AlternativeFinder&& o ) {
                         if (&o == this) return *this;
-                        
+
                         // horrific nasty hack to rebind references...
                         alternatives.~AltList();

src/ResolvExpr/PtrsAssignable.cc

@@ -68 +68 @@
 
         void PtrsAssignable::visit( __attribute((unused)) VoidType *voidType ) {
-                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
+                // T * = void * is disallowed - this is a change from C, where any
+                // void * can be assigned or passed to a non-void pointer without a cast.
         }
 

src/ResolvExpr/TypeEnvironment.cc

@@ -212 +212 @@
         }
 
+        std::ostream & operator<<( std::ostream & out, const TypeEnvironment & env ) {
+                env.print( out );
+                return out;
+        }
 } // namespace ResolvExpr
 

src/ResolvExpr/TypeEnvironment.h

@@ -86 +86 @@
                 TypeEnvironment *clone() const { return new TypeEnvironment( *this ); }
 
-                /// Iteratively adds the environment of a new actual (with allowWidening = false), 
+                /// Iteratively adds the environment of a new actual (with allowWidening = false),
                 /// and extracts open variables.
                 void addActual( const TypeEnvironment& actualEnv, OpenVarSet& openVars );
@@ -114 +114 @@
                 return sub.applyFree( type );
         }
+
+        std::ostream & operator<<( std::ostream & out, const TypeEnvironment & env );
 } // namespace ResolvExpr
 

src/SymTab/Autogen.cc

@@ -62 +62 @@
                 void previsit( FunctionDecl * functionDecl );
 
-                void previsit( FunctionType * ftype );
-                void previsit( PointerType * ptype );
-
                 void previsit( CompoundStmt * compoundStmt );
 
@@ -72 +69 @@
                 unsigned int functionNesting = 0;     // current level of nested functions
 
-                InitTweak::ManagedTypes managedTypes;
                 std::vector< FuncData > data;
         };
@@ -622 +618 @@
         // generate ctor/dtors/assign for typedecls, e.g., otype T = int *;
         void AutogenerateRoutines::previsit( TypeDecl * typeDecl ) {
-                visit_children = false;
                 if ( ! typeDecl->base ) return;
 
@@ -628 +623 @@
                 TypeFuncGenerator gen( typeDecl, &refType, data, functionNesting, indexer );
                 generateFunctions( gen, declsToAddAfter );
-        }
-
-        void AutogenerateRoutines::previsit( FunctionType *) {
-                // ensure that we don't add assignment ops for types defined as part of the function
-                visit_children = false;
-        }
-
-        void AutogenerateRoutines::previsit( PointerType *) {
-                // ensure that we don't add assignment ops for types defined as part of the pointer
-                visit_children = false;
+
         }
 
@@ -645 +631 @@
         }
 
-        void AutogenerateRoutines::previsit( FunctionDecl * functionDecl ) {
-                visit_children = false;
-                // record the existence of this function as appropriate
-                managedTypes.handleDWT( functionDecl );
-
-                maybeAccept( functionDecl->type, *visitor );
+        void AutogenerateRoutines::previsit( FunctionDecl * ) {
+                // Track whether we're currently in a function.
+                // Can ignore function type idiosyncrasies, because function type can never
+                // declare a new type.
                 functionNesting += 1;
-                maybeAccept( functionDecl->statements, *visitor );
-                functionNesting -= 1;
+                GuardAction( [this]()  { functionNesting -= 1; } );
         }
 
         void AutogenerateRoutines::previsit( CompoundStmt * ) {
-                GuardScope( managedTypes );
                 GuardScope( structsDone );
         }

src/SymTab/Autogen.h

@@ -56 +56 @@
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
         template< typename OutputIterator >
-        Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false, bool forward = true );
+        Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, Type * addCast = nullptr, bool forward = true );
 
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Should only be called with non-array types.
         /// optionally returns a statement which must be inserted prior to the containing loop, if there is one
         template< typename OutputIterator >
-        Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression * dstParam, std::string fname, OutputIterator out, Type * type, bool addCast = false ) {
+        Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression * dstParam, std::string fname, OutputIterator out, Type * type, Type * addCast = nullptr ) {
                 bool isReferenceCtorDtor = false;
                 if ( dynamic_cast< ReferenceType * >( type ) && CodeGen::isCtorDtor( fname ) ) {
@@ -68 +68 @@
                         fname = "?=?";
                         dstParam = new AddressExpr( dstParam );
-                        addCast = false;
+                        addCast = nullptr;
                         isReferenceCtorDtor = true;
                 }
@@ -83 +83 @@
                         // remove lvalue as a qualifier, this can change to
                         //   type->get_qualifiers() = Type::Qualifiers();
-                        assert( type );
-                        Type * castType = type->clone();
+                        Type * castType = addCast->clone();
                         castType->get_qualifiers() -= Type::Qualifiers( Type::Lvalue | Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
                         // castType->set_lvalue( true ); // xxx - might not need this
@@ -115 +114 @@
         /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
         template< typename OutputIterator >
-        void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, bool addCast = false, bool forward = true ) {
+        void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, Type * addCast = nullptr, bool forward = true ) {
                 static UniqueName indexName( "_index" );
 
                 // for a flexible array member nothing is done -- user must define own assignment
-                if ( ! array->get_dimension() ) return ;
+                if ( ! array->get_dimension() ) return;
+
+                if ( addCast ) {
+                        // peel off array layer from cast
+                        ArrayType * at = strict_dynamic_cast< ArrayType * >( addCast );
+                        addCast = at->base;
+                }
 
                 Expression * begin, * end, * update, * cmp;
@@ -171 +176 @@
 
         template< typename OutputIterator >
-        Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast, bool forward ) {
+        Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, Type * addCast, bool forward ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
                         genArrayCall( srcParam, dstParam, fname, out, at, addCast, forward );
@@ -191 +196 @@
                 if ( isUnnamedBitfield( obj ) ) return;
 
-                bool addCast = (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && ! obj->get_bitfieldWidth() ) );
+                Type * addCast = nullptr;
+                if ( (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && ! obj->get_bitfieldWidth() ) ) ) {
+                        assert( dstParam->result );
+                        addCast = dstParam->result;
+                }
                 std::list< Statement * > stmts;
                 genCall( srcParam, dstParam, fname, back_inserter( stmts ), obj->type, addCast, forward );

src/SymTab/Indexer.cc

@@ -567 +567 @@
         }
 
+        void Indexer::addIds( const std::list< DeclarationWithType * > & decls ) {
+                for ( auto d : decls ) {
+                        addId( d );
+                }
+        }
+
+        void Indexer::addTypes( const std::list< TypeDecl * > & tds ) {
+                for ( auto td : tds ) {
+                        addType( td );
+                        addIds( td->assertions );
+                }
+        }
+
+        void Indexer::addFunctionType( FunctionType * ftype ) {
+                addTypes( ftype->forall );
+                addIds( ftype->returnVals );
+                addIds( ftype->parameters );
+        }
+
         void Indexer::enterScope() {
                 ++scope;

src/SymTab/Indexer.h

@@ -76 +76 @@
                 void addTrait( TraitDecl *decl );
 
+                /// convenience function for adding a list of Ids to the indexer
+                void addIds( const std::list< DeclarationWithType * > & decls );
+
+                /// convenience function for adding a list of forall parameters to the indexer
+                void addTypes( const std::list< TypeDecl * > & tds );
+
+                /// convenience function for adding all of the declarations in a function type to the indexer
+                void addFunctionType( FunctionType * ftype );
+
                 bool doDebug = false; ///< Display debugging trace?
           private:

src/SymTab/Validate.cc

@@ -124 +124 @@
 
         /// Associates forward declarations of aggregates with their definitions
-        struct LinkReferenceToTypes final : public WithIndexer {
+        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards {
                 LinkReferenceToTypes( const Indexer *indexer );
                 void postvisit( TypeInstType *typeInst );
@@ -137 +137 @@
                 void postvisit( UnionDecl *unionDecl );
                 void postvisit( TraitDecl * traitDecl );
+
+                void previsit( StructDecl *structDecl );
+                void previsit( UnionDecl *unionDecl );
+
+                void renameGenericParams( std::list< TypeDecl * > & params );
 
           private:
@@ -147 +152 @@
                 ForwardStructsType forwardStructs;
                 ForwardUnionsType forwardUnions;
+                /// true if currently in a generic type body, so that type parameter instances can be renamed appropriately
+                bool inGeneric = false;
         };
 
@@ -561 +568 @@
         }
 
+        void LinkReferenceToTypes::renameGenericParams( std::list< TypeDecl * > & params ) {
+                // rename generic type parameters uniquely so that they do not conflict with user-defined function forall parameters, e.g.
+                //   forall(otype T)
+                //   struct Box {
+                //     T x;
+                //   };
+                //   forall(otype T)
+                //   void f(Box(T) b) {
+                //     ...
+                //   }
+                // The T in Box and the T in f are different, so internally the naming must reflect that.
+                GuardValue( inGeneric );
+                inGeneric = ! params.empty();
+                for ( TypeDecl * td : params ) {
+                        td->name = "__" + td->name + "_generic_";
+                }
+        }
+
+        void LinkReferenceToTypes::previsit( StructDecl * structDecl ) {
+                renameGenericParams( structDecl->parameters );
+        }
+
+        void LinkReferenceToTypes::previsit( UnionDecl * unionDecl ) {
+                renameGenericParams( unionDecl->parameters );
+        }
+
         void LinkReferenceToTypes::postvisit( StructDecl *structDecl ) {
                 // visit struct members first so that the types of self-referencing members are updated properly
@@ -588 +621 @@
 
         void LinkReferenceToTypes::postvisit( TypeInstType *typeInst ) {
+                // ensure generic parameter instances are renamed like the base type
+                if ( inGeneric && typeInst->baseType ) typeInst->name = typeInst->baseType->name;
                 if ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->get_name() ) ) {
                         if ( TypeDecl *typeDecl = dynamic_cast< TypeDecl * >( namedTypeDecl ) ) {

src/SynTree/Expression.cc

@@ -324 +324 @@
                         return makeSub( refType->get_base() );
                 } else if ( StructInstType * aggInst = dynamic_cast< StructInstType * >( t ) ) {
-                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
+                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->parameters.begin() );
                 } else if ( UnionInstType * aggInst = dynamic_cast< UnionInstType * >( t ) ) {
-                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
+                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->parameters.begin() );
                 } else {
                         assertf( false, "makeSub expects struct or union type for aggregate, but got: %s", toString( t ).c_str() );

src/libcfa/concurrency/kernel

@@ -120 +120 @@
 #ifdef __CFA_DEBUG__
         // Last function to enable preemption on this processor
-        char * last_enable;
+        const char * last_enable;
 #endif
 };

src/libcfa/concurrency/monitor.c

@@ -823 +823 @@
                 this.monitor_count = thrd->monitors.size;
 
-                this.monitors = malloc( this.monitor_count * sizeof( *this.monitors ) );
+                this.monitors = (monitor_desc **)malloc( this.monitor_count * sizeof( *this.monitors ) );
                 for( int i = 0; i < this.monitor_count; i++ ) {
                         this.monitors[i] = thrd->monitors.list[i];

src/libcfa/stdhdr/stddef.h

@@ -4 +4 @@
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// stddef.h -- 
-// 
+//
+// stddef.h --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Jul  4 23:25:26 2016
@@ -12 +12 @@
 // Last Modified On : Tue Jul  5 20:40:01 2016
 // Update Count     : 12
-// 
+//
 
 extern "C" {
-#include_next <stddef.h>                                                                // has internal check for multiple expansion
+#include_next <stddef.h>                // has internal check for multiple expansion
+#undef NULL
+#define NULL 0                          // define NULL as 0 rather than (void*)0 to take advantage of zero_t
 } // extern "C"
 

src/libcfa/stdlib

@@ -77 +77 @@
         //printf( "X8\n" );
         T * ptr = (T *)(void *)malloc( (size_t)sizeof(T) );     // C malloc
-    return memset( ptr, (int)fill, sizeof(T) );                 // initial with fill value
+    return (T *)memset( ptr, (int)fill, sizeof(T) );                    // initial with fill value
 } // alloc
 
@@ -87 +87 @@
         //printf( "X10\n" );
         T * ptr = (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C malloc
-    return memset( ptr, (int)fill, dim * sizeof(T) );
+    return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
 } // alloc
 
 static inline forall( dtype T | sized(T) ) T * alloc( T ptr[], size_t dim ) {
         //printf( "X11\n" );
-        return (void *)realloc( (void *)ptr, dim * (size_t)sizeof(T) ); // C realloc
+        return (T *)(void *)realloc( (void *)ptr, dim * (size_t)sizeof(T) ); // C realloc
 } // alloc
 forall( dtype T | sized(T) ) T * alloc( T ptr[], size_t dim, char fill );
@@ -103 +103 @@
         //printf( "X14\n" );
     T * ptr = (T *)memalign( align, sizeof(T) );
-    return memset( ptr, (int)fill, sizeof(T) );
+    return (T *)memset( ptr, (int)fill, sizeof(T) );
 } // align_alloc
 
@@ -113 +113 @@
         //printf( "X16\n" );
     T * ptr = (T *)memalign( align, dim * sizeof(T) );
-    return memset( ptr, (int)fill, dim * sizeof(T) );
+    return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
 } // align_alloc
 
@@ -120 +120 @@
 static inline forall( dtype T | sized(T) ) T * memset( T * dest, char c ) {
         //printf( "X17\n" );
-        return memset( dest, c, sizeof(T) );
+        return (T *)memset( dest, c, sizeof(T) );
 } // memset
 extern "C" { void * memcpy( void * dest, const void * src, size_t size ); } // use default C routine for void *
 static inline forall( dtype T | sized(T) ) T * memcpy( T * dest, const T * src ) {
         //printf( "X18\n" );
-        return memcpy( dest, src, sizeof(T) );
+        return (T *)memcpy( dest, src, sizeof(T) );
 } // memcpy
 
@@ -131 +131 @@
 static inline forall( dtype T | sized(T) ) T * memset( T dest[], size_t dim, char c ) {
         //printf( "X19\n" );
-        return (void *)memset( dest, c, dim * sizeof(T) );      // C memset
+        return (T *)(void *)memset( dest, c, dim * sizeof(T) ); // C memset
 } // memset
 static inline forall( dtype T | sized(T) ) T * memcpy( T dest[], const T src[], size_t dim ) {
         //printf( "X20\n" );
-        return (void *)memcpy( dest, src, dim * sizeof(T) ); // C memcpy
+        return (T *)(void *)memcpy( dest, src, dim * sizeof(T) ); // C memcpy
 } // memcpy
 

src/prelude/prelude.cf

@@ -403 +403 @@
 forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT * volatile &, const volatile    DT * );
 
-forall( dtype DT ) DT *                 ?=?(                 DT *          &,                   void * );
-forall( dtype DT ) DT *                 ?=?(                 DT * volatile &,                   void * );
-forall( dtype DT ) const DT *           ?=?( const           DT *          &,                   void * );
-forall( dtype DT ) const DT *           ?=?( const           DT * volatile &,                   void * );
-forall( dtype DT ) const DT *           ?=?( const           DT *          &, const             void * );
-forall( dtype DT ) const DT *           ?=?( const           DT * volatile &, const             void * );
-forall( dtype DT ) volatile DT *        ?=?(       volatile  DT *          &,                   void * );
-forall( dtype DT ) volatile DT *        ?=?(       volatile  DT * volatile &,                   void * );
-forall( dtype DT ) volatile DT *        ?=?(       volatile  DT *          &,       volatile    void * );
-forall( dtype DT ) volatile DT *        ?=?(       volatile  DT * volatile &,       volatile    void * );
-
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT *          &,                   void * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT * volatile &,                   void * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT *          &, const             void * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT * volatile &, const             void * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT *          &,       volatile    void * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT * volatile &,       volatile    void * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT *          &, const volatile    void * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile  DT * volatile &, const volatile    void * );
-
 forall( dtype DT ) void *                ?=?(                void *          &,                 DT * );
 forall( dtype DT ) void *                ?=?(                void * volatile &,                 DT * );
@@ -441 +421 @@
 forall( dtype DT ) const volatile void * ?=?( const volatile void *          &, const volatile  DT * );
 forall( dtype DT ) const volatile void * ?=?( const volatile void * volatile &, const volatile  DT * );
-
-void *                  ?=?(                void *          &,                void * );
-void *                  ?=?(                void * volatile &,                void * );
-const void *            ?=?( const          void *          &,                void * );
-const void *            ?=?( const          void * volatile &,                void * );
-const void *            ?=?( const          void *          &, const          void * );
-const void *            ?=?( const          void * volatile &, const          void * );
-volatile void *         ?=?(       volatile void *          &,                void * );
-volatile void *         ?=?(       volatile void * volatile &,                void * );
-volatile void *         ?=?(       volatile void *          &,       volatile void * );
-volatile void *         ?=?(       volatile void * volatile &,       volatile void * );
-const volatile void *   ?=?( const volatile void *          &,                void * );
-const volatile void *   ?=?( const volatile void * volatile &,                void * );
-const volatile void *   ?=?( const volatile void *          &, const          void * );
-const volatile void *   ?=?( const volatile void * volatile &, const          void * );
-const volatile void *   ?=?( const volatile void *          &,       volatile void * );
-const volatile void *   ?=?( const volatile void * volatile &,       volatile void * );
-const volatile void *   ?=?( const volatile void *          &, const volatile void * );
-const volatile void *   ?=?( const volatile void * volatile &, const volatile void * );
 
 //forall( dtype DT ) DT *                       ?=?(                DT *          &, zero_t );
@@ -781 +742 @@
 forall( dtype DT ) void ?{}( const volatile  DT *          &, const volatile    DT * );
 
-forall( dtype DT ) void ?{}(                 DT *          &,                   void * );
-forall( dtype DT ) void ?{}( const           DT *          &,                   void * );
-forall( dtype DT ) void ?{}( const           DT *          &, const             void * );
-forall( dtype DT ) void ?{}(       volatile  DT *          &,                   void * );
-forall( dtype DT ) void ?{}(       volatile  DT *          &,       volatile    void * );
-
-forall( dtype DT ) void ?{}( const volatile  DT *          &,                   void * );
-forall( dtype DT ) void ?{}( const volatile  DT *          &, const             void * );
-forall( dtype DT ) void ?{}( const volatile  DT *          &,       volatile    void * );
-forall( dtype DT ) void ?{}( const volatile  DT *          &, const volatile    void * );
-
 forall( dtype DT ) void ?{}(                 void *          &,                 DT * );
 forall( dtype DT ) void ?{}( const           void *          &,                 DT * );
@@ -802 +752 @@
 forall( dtype DT ) void ?{}( const volatile void *           &, const volatile  DT * );
 
-void    ?{}(                void *          &,                void * );
-void    ?{}( const          void *          &,                void * );
-void    ?{}( const          void *          &, const          void * );
-void    ?{}(       volatile void *          &,                void * );
-void    ?{}(       volatile void *          &,       volatile void * );
-void    ?{}( const volatile void *          &,                void * );
-void    ?{}( const volatile void *          &, const          void * );
-void    ?{}( const volatile void *          &,       volatile void * );
-void    ?{}( const volatile void *          &, const volatile void * );
-
 //forall( dtype DT ) void ?{}(              DT *          &, zero_t );
 //forall( dtype DT ) void ?{}(              DT * volatile &, zero_t );

src/tests/.expect/completeTypeError.txt

@@ -1 @@
-completeTypeError.c:34:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:33:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: *?
 ...to: 
   Name: v
 
+completeTypeError.c:34:1 error: No reasonable alternatives for expression Applying untyped: 
+  Name: *?
+...to: 
+  Name: y
+
+completeTypeError.c:35:1 error: No reasonable alternatives for expression Applying untyped: 
+  Name: foo
+...to: 
+  Name: v
 
 completeTypeError.c:36:1 error: No reasonable alternatives for expression Applying untyped: 
@@ -10 +19 @@
   Name: v
 
-
 completeTypeError.c:37:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: quux
 ...to: 
   Name: v
-
 
 completeTypeError.c:58:1 error: No reasonable alternatives for expression Applying untyped: 
@@ -22 +29 @@
   Name: y
 
-
 completeTypeError.c:59:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: quux
 ...to: 
   Name: y
-
 
 completeTypeError.c:60:1 error: No reasonable alternatives for expression Applying untyped: 
@@ -34 +39 @@
   Name: y
 
-
 completeTypeError.c:72:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: baz
@@ -40 +44 @@
   Name: z
 
-

src/tests/Makefile.am

@@ -141 +141 @@
 typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/Makefile.in

@@ -895 +895 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
+alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

src/tests/alloc.c

@@ -32 +32 @@
         // allocation, non-array types
 
-        p = (void *)malloc( sizeof(*p) );                   // C malloc, type unsafe
+        p = (int *)(void *)malloc( sizeof(*p) );                   // C malloc, type unsafe
         *p = 0xdeadbeef;
         printf( "C   malloc %#x\n", *p );
@@ -54 +54 @@
         printf( "\n" );
 
-        p = calloc( dim, sizeof( *p ) );                    // C array calloc, type unsafe
+        p = (int *)calloc( dim, sizeof( *p ) );                    // C array calloc, type unsafe
         printf( "C   array calloc, fill 0\n" );
         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
@@ -83 +83 @@
         printf( "\n" );
 
-        p = (void *)realloc( p, dim * sizeof(*p) );         // C realloc
+        p = (int *)(void *)realloc( p, dim * sizeof(*p) );         // C realloc
         for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
         printf( "C   realloc\n" );
@@ -256 +256 @@
         stp = malloc();
         printf( "\nSHOULD FAIL\n" );
+#ifdef ERR1
         p = alloc( stp, dim * sizeof(*stp) );
         p = memset( stp, 10 );
         p = memcpy( &st1, &st );
+#endif
 } // main
 

src/tests/completeTypeError.c

@@ -12 +12 @@
         void *v;
 
-        // A * x;
-        // A * y;
-        // B * x;
-        // B * z;
+        A * x;
+        A * y;
+        B * x;
+        B * z;
 
         // okay
         *i;
-        // *x; // picks B
-        // *z;
+        *x; // picks B
+        *z;
         foo(i);
         bar(i);
@@ -29 +29 @@
         bar(v);
         qux(v);
-        foo(v); // questionable, but works at the moment for C compatibility
 
         // bad
         *v;
-        // *y;
+        *y;
+        foo(v);
         baz(v);
         quux(v);

src/tests/dtor-early-exit.c

@@ -22 +22 @@
 
 struct A {
-        char * name;
+        const char * name;
         int * x;
 };

src/tests/init_once.c

@@ -72 +72 @@
         insert( &constructed, &x );
 
-        x.x = malloc(sizeof(int));
+        x.x = (int *)malloc(sizeof(int));
 }
 

src/tests/multiDimension.c

@@ -7 +7 @@
   printf("default constructing\n");
   (this.a){ 123 };
-  this.ptr = malloc(sizeof(int));
+  this.ptr = (int *)malloc(sizeof(int));
 }
 
@@ -13 +13 @@
   printf("copy constructing\n");
   (this.a){ other.a };
-  this.ptr = malloc(sizeof(int));
+  this.ptr = (int *)malloc(sizeof(int));
 }
 
@@ -19 +19 @@
   printf("constructing with %d\n", a);
   (this.a){ a };
-  this.ptr = malloc(sizeof(int));
+  this.ptr = (int *)malloc(sizeof(int));
 }
 

src/tests/tupleVariadic.c

@@ -73 +73 @@
         [a0, a1, a2, a3] = args;
         a.size = 4;
-        a.data = malloc(sizeof(int)*a.size);
+        a.data = (int *)malloc(sizeof(int)*a.size);
         a.data[0] = a0;
         a.data[1] = a1;

src/tests/vector/vector_int.c

@@ -27 +27 @@
         vec.last = -1;
         vec.capacity = reserve;
-        vec.data = malloc( sizeof( int ) * reserve );
+        vec.data = (int *)malloc( sizeof( int ) * reserve );
 }
 
@@ -33 +33 @@
         vec.last = other.last;
         vec.capacity = other.capacity;
-        vec.data = malloc( sizeof( int ) * other.capacity );
+        vec.data = (int *)malloc( sizeof( int ) * other.capacity );
         for (int i = 0; i < vec.last; i++) {
                 vec.data[i] = other.data[i];
@@ -45 +45 @@
 void reserve( vector_int *vec, int reserve ) {
         if ( reserve > vec->capacity ) {
-                vec->data = realloc( vec->data, sizeof( int ) * reserve );
+                vec->data = (int *)realloc( vec->data, sizeof( int ) * reserve );
                 vec->capacity = reserve;
         }
@@ -54 +54 @@
         if ( vec->last == vec->capacity ) {
                 vec->capacity *= 2;
-                vec->data = realloc( vec->data, sizeof( int ) * vec->capacity );
+                vec->data = (int *)realloc( vec->data, sizeof( int ) * vec->capacity );
         }
         vec->data[ vec->last ] = element;