Changes in / [d997f8e:a933bcb3]

Files:

• Jenkins/FullBuild (modified) (1 diff)
• Jenkinsfile (modified) (1 diff)
• src/MakeLibCfa.cc (modified) (1 diff)
• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• src/ResolvExpr/CastCost.cc (modified) (3 diffs)
• src/ResolvExpr/ConversionCost.cc (modified) (1 diff)
• src/ResolvExpr/Resolver.cc (modified) (2 diffs)
• src/ResolvExpr/Unify.cc (modified) (2 diffs)
• src/SymTab/FixFunction.cc (modified) (1 diff)
• src/Tuples/TupleExpansion.cc (modified) (1 diff)
• src/libcfa/containers/maybe (deleted)
• src/libcfa/containers/maybe.c (deleted)
• src/libcfa/containers/result (deleted)
• src/libcfa/containers/result.c (deleted)
• src/prelude/prelude.cf (modified) (3 diffs)
• src/tests/test.py (modified) (1 diff)

Jenkins/FullBuild ¶

@@ -161 +161 @@
 """
 
-        def email_to = "cforall@lists.uwaterloo.ca"
+        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com, ajbeach@edu.uwaterloo.ca"
 
         //send email notification

Jenkinsfile ¶

@@ -374 +374 @@
 """
 
-        def email_to = "cforall@lists.uwaterloo.ca"
+        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com, ajbeach@edu.uwaterloo.ca"
 
         //send email notification

src/MakeLibCfa.cc ¶

@@ -75 +75 @@
                   case CodeGen::OT_POSTFIXASSIGN:
                   case CodeGen::OT_INFIXASSIGN:
-                  case CodeGen::OT_CTOR:
-                  case CodeGen::OT_DTOR:
                                 funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( std::list< Label >(), newExpr ) );
                                 break;
+                  case CodeGen::OT_CTOR:
+                        // ctors don't return a value
+                        if ( funcDecl->get_functionType()->get_parameters().size() == 1 ) {
+                                // intrinsic default constructors should do nothing
+                                // delete newExpr;
+                                break;
+                        } else {
+                                assert( funcDecl->get_functionType()->get_parameters().size() == 2 );
+                                // anything else is a single parameter constructor that is effectively a C-style assignment
+                                // delete newExpr->get_function();
+                                assert(newExpr->get_args().size()==2);
+                                newExpr->set_function( new NameExpr( "?=?" ) );
+                                funcDecl->get_statements()->get_kids().push_back( new ExprStmt( std::list< Label >(), newExpr ) );
+                        }
+                        break;
+                  case CodeGen::OT_DTOR:
+                        // intrinsic destructors should do nothing
+                        // delete newExpr;
+                        break;
                   case CodeGen::OT_CONSTANT:
                   case CodeGen::OT_LABELADDRESS:

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -627 +627 @@
                 TypeEnvironment resultEnv;
                 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
                 AltList instantiatedActuals; // filled by instantiate function
                 if ( targetType && ! targetType->isVoid() && ! funcType->get_returnVals().empty() ) {

src/ResolvExpr/CastCost.cc ¶

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CastCost.cc --
+// CastCost.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
           public:
                 CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-
+  
                 virtual void visit( BasicType *basicType );
                 virtual void visit( PointerType *pointerType );
@@ -36 +36 @@
                         NamedTypeDecl *namedType;
                         if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
-                                if ( eqvClass.type ) {
-                                        return castCost( src, eqvClass.type, indexer, env );
-                                } else {
-                                        return Cost::infinity;
-                                }
+                                return castCost( src, eqvClass.type, indexer, env );
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
                                 TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );

src/ResolvExpr/ConversionCost.cc ¶

@@ -30 +30 @@
 ///     std::cout << "type inst " << destAsTypeInst->get_name();
                         if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
-                                if ( eqvClass.type ) {
-                                        return conversionCost( src, eqvClass.type, indexer, env );
-                                } else {
-                                        return Cost::infinity;
-                                }
+                                return conversionCost( src, eqvClass.type, indexer, env );
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
 ///       std::cout << " found" << std::endl;

src/ResolvExpr/Resolver.cc ¶

@@ -124 +124 @@
                         } // if
 #endif
-                        assertf( finder.get_alternatives().size() == 1, "findSingleExpression: must have exactly one alternative at the end." );
+                        assert( finder.get_alternatives().size() == 1 );
                         Alternative &choice = finder.get_alternatives().front();
                         Expression *newExpr = choice.expr->clone();
@@ -397 +397 @@
                         // //   cerr << type << endl;
                         // // } // for
-
+                        
                         // // O(N^2) checks of d-types with f-types
                         // // find the minimum cost

src/ResolvExpr/Unify.cc ¶

@@ -344 +344 @@
                 std::cerr << "unifyInexact type 1 is ";
                 type1->print( std::cerr );
-                std::cerr << " type 2 is ";
+                std::cerr << "type 2 is ";
                 type2->print( std::cerr );
                 std::cerr << std::endl;
@@ -595 +595 @@
                         TypeExpr *otherParam = dynamic_cast< TypeExpr* >(*jt);
                         assertf(otherParam, "Aggregate parameters should be type expressions");
-
+                        
                         Type* paramTy = param->get_type();
                         Type* otherParamTy = otherParam->get_type();

src/SymTab/FixFunction.cc ¶

@@ -24 +24 @@
 
         DeclarationWithType * FixFunction::mutate(FunctionDecl *functionDecl) {
-                ObjectDecl *pointer = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClasses(), functionDecl->get_linkage(), 0, new PointerType( Type::Qualifiers(), functionDecl->get_type() ), 0, functionDecl->get_attributes() );
+                ObjectDecl *pointer = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClasses(), functionDecl->get_linkage(), 0, new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0, functionDecl->get_attributes() );
                 functionDecl->get_attributes().clear();
-                // can't delete function type because it may contain assertions, but can't transfer ownership without a clone since set_type checks for nullptr
-                functionDecl->set_type( functionDecl->get_type()->clone() );
                 delete functionDecl;
                 return pointer;

src/Tuples/TupleExpansion.cc ¶

@@ -332 +332 @@
         TypeInstType * isTtype( Type * type ) {
                 if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( type ) ) {
-                        if ( inst->get_baseType() && inst->get_baseType()->get_kind() == TypeDecl::Ttype ) {
+                        if ( inst->get_baseType()->get_kind() == TypeDecl::Ttype ) {
                                 return inst;
                         }

src/prelude/prelude.cf ¶

@@ -309 +309 @@
 // forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
 
-// forall( dtype DT ) signed int ?==?( const volatile DT *, zero_t );
-// forall( dtype DT ) signed int ?==?( zero_t, const volatile DT * );
-// forall( ftype FT ) signed int ?==?( FT *, zero_t );
-// forall( ftype FT ) signed int ?==?( zero_t, FT * );
-// forall( dtype DT ) signed int ?!=?( const volatile DT *, zero_t );
-// forall( dtype DT ) signed int ?!=?( zero_t, const volatile DT * );
-// forall( ftype FT ) signed int ?!=?( FT *, zero_t );
-// forall( ftype FT ) signed int ?!=?( zero_t, FT * );
+// forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );
+// forall( dtype DT ) signed int ?==?( forall( dtype DT2 )const DT2 *, const volatile DT * );
+// forall( ftype FT ) signed int ?==?( FT *, forall( ftype FT2 )FT2 * );
+// forall( ftype FT ) signed int ?==?( forall( ftype FT2 )FT2 *, FT * );
+// forall( dtype DT ) signed int ?!=?( const volatile DT *, forall( dtype DT2 )const DT2 * );
+// forall( dtype DT ) signed int ?!=?( forall( dtype DT2 )const DT2 *, const volatile DT * );
+// forall( ftype FT ) signed int ?!=?( FT *, forall( ftype FT2 )FT2 * );
+// forall( ftype FT ) signed int ?!=?( forall( ftype FT2 )FT2 *, FT * );
 
 // ------------------------------------------------------------
@@ -447 +447 @@
 const volatile void *   ?=?( const volatile void * volatile *, const volatile void * );
 
-// //forall( dtype DT ) DT *                    ?=?(                DT *          *, zero_t );
-// //forall( dtype DT ) DT *                    ?=?(                DT * volatile *, zero_t );
-// forall( dtype DT ) const DT *                ?=?( const          DT *          *, zero_t );
-// forall( dtype DT ) const DT *                ?=?( const          DT * volatile *, zero_t );
-// //forall( dtype DT ) volatile DT *   ?=?( volatile       DT *          *, zero_t );
-// //forall( dtype DT ) volatile DT *   ?=?( volatile       DT * volatile *,  );
-// forall( dtype DT ) const volatile DT *       ?=?( const volatile DT *          *, zero_t );
-// forall( dtype DT ) const volatile DT *       ?=?( const volatile DT * volatile *, zero_t );
-
-// forall( ftype FT ) FT *                      ?=?( FT *          *, zero_t );
-// forall( ftype FT ) FT *                      ?=?( FT * volatile *, zero_t );
+//forall( dtype DT ) DT *                       ?=?(                DT *          *, forall( dtype DT2 ) const DT2 * );
+//forall( dtype DT ) DT *                       ?=?(                DT * volatile *, forall( dtype DT2 ) const DT2 * );
+forall( dtype DT ) const DT *           ?=?( const          DT *          *, forall( dtype DT2 ) const DT2 * );
+forall( dtype DT ) const DT *           ?=?( const          DT * volatile *, forall( dtype DT2 ) const DT2 * );
+//forall( dtype DT ) volatile DT *      ?=?( volatile       DT *          *, forall( dtype DT2 ) const DT2 * );
+//forall( dtype DT ) volatile DT *      ?=?( volatile       DT * volatile *, forall( dtype DT2 ) const DT2 * );
+forall( dtype DT ) const volatile DT *  ?=?( const volatile DT *          *, forall( dtype DT2 ) const DT2 * );
+forall( dtype DT ) const volatile DT *  ?=?( const volatile DT * volatile *, forall( dtype DT2 ) const DT2 * );
+
+forall( ftype FT ) FT *                 ?=?( FT *          *, forall( ftype FT2 ) FT2 * );
+forall( ftype FT ) FT *                 ?=?( FT * volatile *, forall( ftype FT2 ) FT2 * );
 
 forall( dtype T | sized(T) ) T *                        ?+=?(                T *          *, ptrdiff_t );
@@ -799 +799 @@
 void    ?{}( const volatile void *          *, const volatile void * );
 
-// //forall( dtype DT ) void ?{}(                   DT *          *, zero_t );
-// //forall( dtype DT ) void ?{}(                   DT * volatile *, zero_t );
-// forall( dtype DT ) void ?{}( const       DT *          *, zero_t );
-// //forall( dtype DT ) void ?{}( volatile          DT *          *, zero_t );
-// //forall( dtype DT ) void ?{}( volatile          DT * volatile *, zero_t );
-// forall( dtype DT ) void ?{}( const volatile DT *       *, zero_t );
-
-// forall( ftype FT ) void      ?{}( FT *          *, zero_t );
+//forall( dtype DT ) void ?{}(              DT *          *, forall( dtype DT2 ) const DT2 * );
+//forall( dtype DT ) void ?{}(              DT * volatile *, forall( dtype DT2 ) const DT2 * );
+forall( dtype DT ) void ?{}( const          DT *          *, forall( dtype DT2 ) const DT2 * );
+//forall( dtype DT ) void ?{}( volatile     DT *          *, forall( dtype DT2 ) const DT2 * );
+//forall( dtype DT ) void ?{}( volatile     DT * volatile *, forall( dtype DT2 ) const DT2 * );
+forall( dtype DT ) void ?{}( const volatile DT *          *, forall( dtype DT2 ) const DT2 * );
+
+forall( ftype FT ) void ?{}( FT *          *, forall( ftype FT2 ) FT2 * );
 
 // default ctors

src/tests/test.py ¶

@@ -253 +253 @@
         # for each test to run
         try :
-                results = pool.map_async(partial(run_test_worker, generate=generate, dry_run=dry_run, debug=debug), tests, chunksize = 1 ).get(3600)
+                results = pool.map_async(partial(run_test_worker, generate=generate, dry_run=dry_run, debug=debug), tests ).get(3600)
         except KeyboardInterrupt:
                 pool.terminate()