Changeset 5c4a473

Timestamp:

Aug 15, 2019, 10:31:53 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6daaee3

Parents:

d65f92c (diff), 3c7f01b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into distcc

Files:

• Jenkins/FullBuild (modified) (1 diff)
• Jenkinsfile (modified) (3 diffs)
• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/Makefile.in (modified) (2 diffs)
• src/ResolvExpr/AlternativeFinder.cc (modified) (7 diffs)
• src/ResolvExpr/CastCost.cc (modified) (7 diffs)
• src/ResolvExpr/ConversionCost.cc (modified) (13 diffs)
• src/ResolvExpr/ConversionCost.h (modified) (4 diffs)
• src/ResolvExpr/ResolveAssertions.cc (modified) (2 diffs)
• src/ResolvExpr/typeops.h (modified) (4 diffs)
• src/SynTree/ApplicationExpr.cc (modified) (2 diffs)
• src/SynTree/CommaExpr.cc (modified) (2 diffs)
• src/SynTree/Expression.cc (modified) (9 diffs)
• src/SynTree/Expression.h (modified) (13 diffs)
• src/SynTree/TupleExpr.cc (modified) (3 diffs)
• src/main.cc (modified) (9 diffs)
• tests/Makefile.am (modified) (2 diffs)
• tests/Makefile.in (modified) (2 diffs)
• tests/pybin/settings.py (modified) (3 diffs)
• tests/pybin/tools.py (modified) (3 diffs)
• tests/test.py (modified) (3 diffs)

Jenkins/FullBuild

@@ -132 +132 @@
 
 <img src="https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/plot/Compilation/getPlot?index=0" >
+<img src="https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/plot/Compilation/getPlot?index=1" >
 
 <p>- Logs ----------------------------------------------------------------</p>

Jenkinsfile

@@ -197 +197 @@
                 if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
 
-                def groupCompile = new PlotGroup('Compilation', 'seconds', true)
-                def groupConcurrency = new PlotGroup('Concurrency', 'nanoseconds', false)
+                def groupCompile = new PlotGroup('Compilation', 'duration (s) - lower is better', true)
+                def groupConcurrency = new PlotGroup('Concurrency', 'duration (n) - lower is better', false)
 
                 //Then publish the results
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , 'Compilation')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'  , groupCompile    , 'Compilation Speed-Up')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, 'Context Switching')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff', groupConcurrency, 'Context Switching Speed-Up')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, 'Mutual Exclusion')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'    , groupConcurrency, 'Mutual Exclusion Speed-Up')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, 'Internal and External Scheduling')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal.diff'   , groupConcurrency, 'Internal and External Scheduling Speed-Up')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , false, 'Compilation')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'  , groupCompile    , true , 'Compilation (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, false, 'Context Switching')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff', groupConcurrency, true , 'Context Switching (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, false, 'Mutual Exclusion')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'    , groupConcurrency, true , 'Mutual Exclusion (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, false, 'Internal and External Scheduling')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal.diff'   , groupConcurrency, true , 'Internal and External Scheduling (relative)')
         }
 }
@@ -466 +466 @@
 }
 
-def do_plot(boolean new_data, String file, PlotGroup group, String title) {
+def do_plot(boolean new_data, String file, PlotGroup group, boolean relative, String title) {
 
         if(new_data) {
@@ -489 +489 @@
                         exclZero: false,
                         keepRecords: false,
-                        logarithmic: group.log,
+                        logarithmic: !relative && group.log,
                         numBuilds: '120',
                         useDescr: true,

libcfa/src/Makefile.am

@@ -26 +26 @@
 VPATH += :../prelude
 
+gdbwaittarget=""
+
 # AM_CFLAGS for all cfa source
 # AM_CFAFLAGS for only cfa source
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr  @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@

libcfa/src/Makefile.in

@@ -438 +438 @@
 am__v_UPP_1 = 
 lib_LTLIBRARIES = libcfa.la libcfathread.la
+gdbwaittarget = ""
 
 # AM_CFLAGS for all cfa source
@@ -443 +444 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr  @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@

src/ResolvExpr/AlternativeFinder.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 25 22:37:46 2019
-// Update Count     : 37
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:35:00 2019
+// Update Count     : 38
 //
 
@@ -377 +377 @@
         }
 
-        Cost computeConversionCost( Type * actualType, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
                 PRINT(
                         std::cerr << std::endl << "converting ";
@@ -387 +388 @@
                         std::cerr << std::endl;
                 )
-                Cost convCost = conversionCost( actualType, formalType, indexer, env );
+                Cost convCost = conversionCost( actualType, formalType, actualIsLvalue, indexer, env );
                 PRINT(
                         std::cerr << std::endl << "cost is " << convCost << std::endl;
@@ -402 +403 @@
 
         Cost computeExpressionConversionCost( Expression *& actualExpr, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
-                Cost convCost = computeConversionCost( actualExpr->result, formalType, indexer, env );
+                Cost convCost = computeConversionCost(
+                        actualExpr->result, formalType, actualExpr->get_lvalue(), indexer, env );
 
                 // if there is a non-zero conversion cost, ignoring poly cost, then the expression requires conversion.
@@ -1186 +1188 @@
                 assert( toType );
                 toType = resolveTypeof( toType, indexer );
+                assert(!dynamic_cast<TypeofType *>(toType));
                 SymTab::validateType( toType, &indexer );
                 adjustExprType( toType, env, indexer );
@@ -1212 +1215 @@
                         unify( castExpr->result, alt.expr->result, alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
-                        Cost thisCost = castCost( alt.expr->result, castExpr->result, indexer,
-                                alt.env );
+                        Cost thisCost = castCost( alt.expr->result, castExpr->result, alt.expr->get_lvalue(),
+                                indexer, alt.env );
                         PRINT(
                                 std::cerr << "working on cast with result: " << castExpr->result << std::endl;
@@ -1640 +1643 @@
                                 // xxx - do some inspecting on this line... why isn't result bound to initAlt.type?
 
-                                Cost thisCost = castCost( alt.expr->result, toType, indexer, newEnv );
+                                Cost thisCost = castCost( alt.expr->result, toType, alt.expr->get_lvalue(),
+                                        indexer, newEnv );
                                 if ( thisCost != Cost::infinity ) {
                                         // count one safe conversion for each value that is thrown away

src/ResolvExpr/CastCost.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  2 15:34:36 2016
-// Update Count     : 7
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:12:00 2019
+// Update Count     : 8
 //
 
@@ -37 +37 @@
         struct CastCost_old : public ConversionCost {
           public:
-                CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
+                CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
 
                 using ConversionCost::previsit;
@@ -45 +46 @@
         };
 
-        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
-                                        return castCost( src, eqvClass->type, indexer, env );
+                                        return castCost( src, eqvClass->type, srcIsLvalue, indexer, env );
                                 } else {
                                         return Cost::infinity;
@@ -57 +59 @@
                                 const TypeDecl * type = strict_dynamic_cast< const TypeDecl * >( namedType );
                                 if ( type->base ) {
-                                        return castCost( src, type->base, indexer, env ) + Cost::safe;
+                                        return castCost( src, type->base, srcIsLvalue, indexer, env ) + Cost::safe;
                                 } // if
                         } // if
@@ -78 +80 @@
                 } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                        return convertToReferenceCost( src, refType, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
+                        return convertToReferenceCost( src, refType, srcIsLvalue, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
                                 return ptrsCastable( t1, t2, env, indexer );
                         });
                 } else {
                         PassVisitor<CastCost_old> converter(
-                                dest, indexer, env,
-                                (Cost (*)( const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment & ))
+                                dest, srcIsLvalue, indexer, env,
+                                (Cost (*)( const Type *, const Type *, bool, const SymTab::Indexer &, const TypeEnvironment & ))
                                         castCost );
                         src->accept( converter );
@@ -96 +98 @@
         }
 
-        CastCost_old::CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
-                : ConversionCost( dest, indexer, env, costFunc ) {
+        CastCost_old::CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : ConversionCost( dest, srcIsLvalue, indexer, env, costFunc ) {
         }
 
@@ -106 +109 @@
                         cost = Cost::unsafe;
                 } else {
-                        cost = conversionCost( basicType, dest, indexer, env );
+                        cost = conversionCost( basicType, dest, srcIsLvalue, indexer, env );
                 } // if
         }

src/ResolvExpr/ConversionCost.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 07:06:19 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 24 13:33:00 2019
-// Update Count     : 26
+// Last Modified On : Mon Aug 12 10:21:00 2019
+// Update Count     : 27
 //
 
@@ -46 +46 @@
 #endif
 
-        Cost conversionCost( const Type * src, const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+        Cost conversionCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         PRINT( std::cerr << "type inst " << destAsTypeInst->name; )
                         if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
-                                        return conversionCost( src, eqvClass->type, indexer, env );
+                                        return conversionCost( src, eqvClass->type, srcIsLvalue, indexer, env );
                                 } else {
                                         return Cost::infinity;
@@ -61 +62 @@
                                 assert( type );
                                 if ( type->base ) {
-                                        return conversionCost( src, type->base, indexer, env ) + Cost::safe;
+                                        return conversionCost( src, type->base, srcIsLvalue, indexer, env )
+                                                + Cost::safe;
                                 } // if
                         } // if
@@ -81 +83 @@
                 } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                        return convertToReferenceCost( src, refType, indexer, env, [](const Type * const t1, const Type * t2, const SymTab::Indexer &, const TypeEnvironment & env ){
+                        return convertToReferenceCost( src, refType, srcIsLvalue, indexer, env, [](const Type * const t1, const Type * t2, const SymTab::Indexer &, const TypeEnvironment & env ){
                                 return ptrsAssignable( t1, t2, env );
                         });
                 } else {
                         PassVisitor<ConversionCost> converter(
-                                dest, indexer, env,
-                                (Cost (*)(const Type *, const Type *, const SymTab::Indexer&, const TypeEnvironment&))
+                                dest, srcIsLvalue, indexer, env,
+                                (Cost (*)(const Type *, const Type *, bool, const SymTab::Indexer&, const TypeEnvironment&))
                                         conversionCost );
                         src->accept( converter );
@@ -98 +100 @@
         }
 
-        static Cost convertToReferenceCost( const Type * src, const Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
+        static Cost convertToReferenceCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 PRINT( std::cerr << "convert to reference cost... diff " << diff << " " << src << " / " << dest << std::endl; )
                 if ( diff > 0 ) {
                         // TODO: document this
-                        Cost cost = convertToReferenceCost( strict_dynamic_cast< const ReferenceType * >( src )->base, dest, diff-1, indexer, env, func );
+                        Cost cost = convertToReferenceCost(
+                                strict_dynamic_cast< const ReferenceType * >( src )->base, dest, srcIsLvalue,
+                                diff-1, indexer, env, func );
                         cost.incReference();
                         return cost;
                 } else if ( diff < -1 ) {
                         // TODO: document this
-                        Cost cost = convertToReferenceCost( src, strict_dynamic_cast< const ReferenceType * >( dest )->base, diff+1, indexer, env, func );
+                        Cost cost = convertToReferenceCost(
+                                src, strict_dynamic_cast< const ReferenceType * >( dest )->base, srcIsLvalue,
+                                diff+1, indexer, env, func );
                         cost.incReference();
                         return cost;
@@ -138 +145 @@
                                 PRINT( std::cerr << "reference to rvalue conversion" << std::endl; )
                                 PassVisitor<ConversionCost> converter(
-                                        dest, indexer, env,
-                                        (Cost (*)(const Type *, const Type *, const SymTab::Indexer&, const TypeEnvironment&))
+                                        dest, srcIsLvalue, indexer, env,
+                                        (Cost (*)(const Type *, const Type *, bool, const SymTab::Indexer&, const TypeEnvironment&))
                                                 conversionCost );
                                 src->accept( converter );
@@ -150 +157 @@
                         if ( typesCompatibleIgnoreQualifiers( src, destAsRef->base, indexer, env ) ) {
                                 PRINT( std::cerr << "converting compatible base type" << std::endl; )
-                                if ( src->get_lvalue() ) {
+                                assert( src->get_lvalue() == srcIsLvalue );
+                                if ( srcIsLvalue ) {
                                         PRINT(
                                                 std::cerr << "lvalue to reference conversion" << std::endl;
@@ -178 +186 @@
         }
 
-        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
+        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
+                        const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 int sdepth = src->referenceDepth(), ddepth = dest->referenceDepth();
-                Cost cost = convertToReferenceCost( src, dest, sdepth-ddepth, indexer, env, func );
+                Cost cost = convertToReferenceCost( src, dest, srcIsLvalue, sdepth-ddepth, indexer, env, func );
                 PRINT( std::cerr << "convertToReferenceCost result: " << cost << std::endl; )
                 return cost;
         }
 
-        ConversionCost::ConversionCost( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
-                : dest( dest ), indexer( indexer ), cost( Cost::infinity ), env( env ), costFunc( costFunc ) {
+        ConversionCost::ConversionCost( const Type * dest, bool srcIsLvalue, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : dest( dest ), srcIsLvalue( srcIsLvalue ), indexer( indexer ), cost( Cost::infinity ), env( env ), costFunc( costFunc ) {
         }
 
@@ -371 +380 @@
                 // recursively compute conversion cost from T1 to T2.
                 // cv can be safely dropped because of 'implicit dereference' behavior.
-                cost = costFunc( refType->base, dest, indexer, env );
+                cost = costFunc( refType->base, dest, srcIsLvalue, indexer, env );
                 if ( refType->base->tq == dest->tq ) {
                         cost.incReference();  // prefer exact qualifiers
@@ -403 +412 @@
                 static Type::Qualifiers q;
                 static BasicType integer( q, BasicType::SignedInt );
-                cost = costFunc( &integer, dest, indexer, env );  // safe if dest >= int
+                cost = costFunc( &integer, dest, srcIsLvalue, indexer, env );  // safe if dest >= int
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();
@@ -413 +422 @@
         void ConversionCost::postvisit( const TypeInstType * inst ) {
                 if ( const EqvClass * eqvClass = env.lookup( inst->name ) ) {
-                        cost = costFunc( eqvClass->type, dest, indexer, env );
+                        cost = costFunc( eqvClass->type, dest, srcIsLvalue, indexer, env );
                 } else if ( const TypeInstType * destAsInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
@@ -423 +432 @@
                         assert( type );
                         if ( type->base ) {
-                                cost = costFunc( type->base, dest, indexer, env ) + Cost::safe;
+                                cost = costFunc( type->base, dest, srcIsLvalue, indexer, env ) + Cost::safe;
                         } // if
                 } // if
@@ -434 +443 @@
                         std::list< Type * >::const_iterator destIt = destAsTuple->types.begin();
                         while ( srcIt != tupleType->types.end() && destIt != destAsTuple->types.end() ) {
-                                Cost newCost = costFunc( * srcIt++, * destIt++, indexer, env );
+                                Cost newCost = costFunc( * srcIt++, * destIt++, srcIsLvalue, indexer, env );
                                 if ( newCost == Cost::infinity ) {
                                         return;

src/ResolvExpr/ConversionCost.h

@@ -10 +10 @@
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 24 10:00:00 2019
-// Update Count     : 5
+// Last Modified On : Thu Aug  8 16:13:00 2019
+// Update Count     : 6
 //
 
@@ -33 +33 @@
         class TypeEnvironment;
 
-        typedef std::function<Cost(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+        typedef std::function<Cost(const Type *, const Type *, bool,
+                const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+
         struct ConversionCost : public WithShortCircuiting {
           public:
-                ConversionCost( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
+                ConversionCost( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
 
                 Cost get_cost() const { return cost; }
@@ -59 +62 @@
           protected:
                 const Type * dest;
+                bool srcIsLvalue;
                 const SymTab::Indexer &indexer;
                 Cost cost;
@@ -66 +70 @@
 
         typedef std::function<int(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
-        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
+        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
 
 // Some function pointer types, differ in return type.

src/ResolvExpr/ResolveAssertions.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Oct 05 13:46:00 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 10 16:10:37 2019
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:47:00 2019
+// Update Count     : 3
 //
 
@@ -156 +156 @@
                         for ( const auto& assn : x.assns ) {
                                 // compute conversion cost from satisfying decl to assertion
+                                assert( !assn.match.adjType->get_lvalue() );
                                 k += computeConversionCost(
-                                        assn.match.adjType, assn.decl->get_type(), indexer, x.env );
+                                        assn.match.adjType, assn.decl->get_type(), false, indexer, x.env );
 
                                 // mark vars+specialization cost on function-type assertions

src/ResolvExpr/typeops.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 07:28:22 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  8 09:30:34 2019
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:36:00 2019
+// Update Count     : 5
 //
 
@@ -80 +80 @@
 
         // in CastCost.cc
-        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
         Cost castCost(
                 const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
@@ -86 +87 @@
 
         // in ConversionCost.cc
-        Cost conversionCost( const Type * src, const Type * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost conversionCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
         Cost conversionCost(
                 const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
@@ -92 +94 @@
 
         // in AlternativeFinder.cc
-        Cost computeConversionCost( Type * actualType, Type * formalType,
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
                 const SymTab::Indexer & indexer, const TypeEnvironment & env );
 

src/SynTree/ApplicationExpr.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 12:41:06 2016
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Aug 12 14:28:00 2019
+// Update Count     : 5
 //
 
@@ -76 +76 @@
 }
 
+bool ApplicationExpr::get_lvalue() const {
+        return result->get_lvalue();
+}
+
 void ApplicationExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Application of" << std::endl << indent+1;

src/SynTree/CommaExpr.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 02 15:19:44 2016
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Arg 12 16:11:00 2016
+// Update Count     : 2
 //
 
@@ -39 +39 @@
 }
 
+bool CommaExpr::get_lvalue() const {
+        // xxx - as above, shouldn't be an lvalue but that information is used anyways.
+        return result->get_lvalue();
+}
+
 void CommaExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Comma Expression:" << std::endl;

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  7 17:03:00 2019
-// Update Count     : 62
+// Last Modified On : Tue Aug 13 11:31:00 2019
+// Update Count     : 63
 //
 
@@ -64 +64 @@
 
 bool Expression::get_lvalue() const {
-        return result->get_lvalue();
+        assert( !result->get_lvalue() );
+        return false;
 }
 
@@ -138 +139 @@
 }
 
+bool VariableExpr::get_lvalue() const {
+        return result->get_lvalue();
+}
+
 VariableExpr * VariableExpr::functionPointer( FunctionDecl * func ) {
         VariableExpr * funcExpr = new VariableExpr( func );
@@ -269 +274 @@
 CastExpr::~CastExpr() {
         delete arg;
+}
+
+bool CastExpr::get_lvalue() const {
+        return result->get_lvalue();
 }
 
@@ -380 +389 @@
         // don't delete the member declaration, since it points somewhere else in the tree
         delete aggregate;
+}
+
+bool MemberExpr::get_lvalue() const {
+        assert( result->get_lvalue() );
+        return true;
 }
 
@@ -432 +446 @@
 }
 
+bool UntypedExpr::get_lvalue() const {
+        return result->get_lvalue();
+}
 
 void UntypedExpr::print( std::ostream & os, Indenter indent ) const {
@@ -490 +507 @@
         delete arg2;
         delete arg3;
+}
+
+bool ConditionalExpr::get_lvalue() const {
+        return result->get_lvalue();
 }
 
@@ -548 +569 @@
 }
 
+bool ConstructorExpr::get_lvalue() const {
+        return result->get_lvalue();
+}
+
 void ConstructorExpr::print( std::ostream & os, Indenter indent ) const {
         os <<  "Constructor Expression: " << std::endl << indent+1;
@@ -565 +590 @@
 CompoundLiteralExpr::~CompoundLiteralExpr() {
         delete initializer;
+}
+
+bool CompoundLiteralExpr::get_lvalue() const {
+        assert( result->get_lvalue() );
+        return true;
 }
 

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  7 16:56:00 2019
-// Update Count     : 51
+// Last Modified On : Wed Aug 14 14:24:00 2019
+// Update Count     : 53
 //
 
@@ -71 +71 @@
         const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
-        bool get_lvalue() const;
+        virtual bool get_lvalue() const;
 
         TypeSubstitution * get_env() const { return env; }
@@ -99 +99 @@
         virtual ~ApplicationExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_function() const { return function; }
         void set_function( Expression * newValue ) { function = newValue; }
@@ -121 +123 @@
         UntypedExpr( const UntypedExpr & other );
         virtual ~UntypedExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_function() const { return function; }
@@ -209 +213 @@
         virtual ~CastExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_arg() const { return arg; }
         void set_arg( Expression * newValue ) { arg = newValue; }
@@ -292 +298 @@
         virtual ~MemberExpr();
 
+        bool get_lvalue() const final;
+
         DeclarationWithType * get_member() const { return member; }
         void set_member( DeclarationWithType * newValue ) { member = newValue; }
@@ -314 +322 @@
         VariableExpr( const VariableExpr & other );
         virtual ~VariableExpr();
+
+        bool get_lvalue() const final;
 
         DeclarationWithType * get_var() const { return var; }
@@ -501 +511 @@
         virtual ~ConditionalExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_arg1() const { return arg1; }
         void set_arg1( Expression * newValue ) { arg1 = newValue; }
@@ -525 +537 @@
         virtual ~CommaExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_arg1() const { return arg1; }
         void set_arg1( Expression * newValue ) { arg1 = newValue; }
@@ -611 +625 @@
         ~ConstructorExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_callExpr() const { return callExpr; }
         void set_callExpr( Expression * newValue ) { callExpr = newValue; }
@@ -629 +645 @@
         CompoundLiteralExpr( const CompoundLiteralExpr & other );
         virtual ~CompoundLiteralExpr();
+
+        bool get_lvalue() const final;
 
         Initializer * get_initializer() const { return initializer; }
@@ -687 +705 @@
         virtual ~TupleExpr();
 
+        bool get_lvalue() const final;
+
         std::list<Expression*>& get_exprs() { return exprs; }
 
@@ -705 +725 @@
         TupleIndexExpr( const TupleIndexExpr & other );
         virtual ~TupleIndexExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_tuple() const { return tuple; }

src/SynTree/TupleExpr.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:42:29 2017
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug 14 14:34:00 2019
+// Update Count     : 5
 //
 
@@ -57 +57 @@
 }
 
+bool TupleExpr::get_lvalue() const {
+        return result->get_lvalue();
+}
+
 void TupleExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Tuple:" << std::endl;
@@ -76 +80 @@
 TupleIndexExpr::~TupleIndexExpr() {
         delete tuple;
+}
+
+bool TupleIndexExpr::get_lvalue() const {
+        assert( result->get_lvalue() );
+        return true;
 }
 

src/main.cc

@@ -17 +17 @@
 #include <execinfo.h>                       // for backtrace, backtrace_symbols
 #include <getopt.h>                         // for no_argument, optind, geto...
-#include <signal.h>                         // for signal, SIGABRT, SIGSEGV
 #include <cassert>                          // for assertf
 #include <cstdio>                           // for fopen, FILE, fclose, stdin
 #include <cstdlib>                          // for exit, free, abort, EXIT_F...
+#include <csignal>                         // for signal, SIGABRT, SIGSEGV
 #include <cstring>                          // for index
 #include <fstream>                          // for ofstream
@@ -96 +96 @@
 DeclarationNode * parseTree = nullptr;                                  // program parse tree
 
+static bool waiting_for_gdb = false; // flag to set cfa-cpp to wait for gdb on start
+
 static std::string PreludeDirector = "";
 
@@ -167 +169 @@
 } // sigAbortHandler
 
-
 int main( int argc, char * argv[] ) {
         FILE * input;                                                                           // use FILE rather than istream because yyin is FILE
@@ -185 +186 @@
         parse_cmdline( argc, argv, filename );                          // process command-line arguments
         CodeGen::FixMain::setReplaceMain( !nomainp );
+
+        if(waiting_for_gdb) {
+                std::cerr << "Waiting for gdb" << std::endl;
+                std::cerr << "run :" << std::endl;
+                std::cerr << "  gdb attach " << getpid() << std::endl;
+                raise(SIGSTOP);
+        }
 
         try {
@@ -198 +206 @@
                 } else {                                                                                // no input file name
                         input = stdin;
+                        std::cerr << "Input from stdin" << std::endl;
                         // if running cfa-cpp directly, might forget to pass -F option. Since this takes from stdin, pass
                         // a fake name along
@@ -438 +447 @@
 
 
-static const char optstring[] = ":hlLmNnpP:S:twW:D:F:";
+static const char optstring[] = ":hlLmNnpP:S:tgwW:D:F:";
 
 enum { PreludeDir = 128 };
@@ -453 +462 @@
         { "statistics", required_argument, nullptr, 'S' },
         { "tree", no_argument, nullptr, 't' },
+        { "gdb", no_argument, nullptr, 'g' },
         { "", no_argument, nullptr, 0 },                                        // -w
         { "", no_argument, nullptr, 0 },                                        // -W
@@ -471 +481 @@
         "<directory> prelude directory for debug/nodebug",      // no flag
         "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
-        "build in tree",                                                                        // -t
+        "building cfa standard lib",                                                                    // -t
+        "wait for gdb to attach",                                                                       // -g
         "",                                                                                                     // -w
         "",                                                                                                     // -W
@@ -582 +593 @@
                         Stats::parse_params( optarg );
                         break;
-                  case 't':                                                                             // build in tree
+                  case 't':                                                                             // building cfa stdlib
                         treep = true;
+                        break;
+                  case 'g':                                                                             // wait for gdb
+                        waiting_for_gdb = true;
                         break;
                   case 'w':                                                                             // suppress all warnings, hidden

tests/Makefile.am

@@ -22 +22 @@
 debug=yes
 installed=no
+archiveerrors=
 
 INSTALL_FLAGS=-in-tree
@@ -58 +59 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :

tests/Makefile.in

@@ -378 +378 @@
 debug = yes
 installed = no
+archiveerrors = 
 INSTALL_FLAGS = -in-tree
 DEBUG_FLAGS = -debug -O0
@@ -777 +778 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :

tests/pybin/settings.py

@@ -4 +4 @@
 from . import tools
 
+global original_path
+
 try :
+        original_path = os.getcwd()
         testpath = os.path.dirname(os.path.abspath(os.path.join(os.getcwd(), sys.argv[0])))
         sys.path.append(testpath)
@@ -118 +121 @@
         global timeout
         global output_width
+<<<<<<< HEAD
         global distcc
+=======
+        global archive
+>>>>>>> master
 
         dry_run      = options.dry_run
@@ -128 +135 @@
         timeout      = Timeouts(options.timeout, options.global_timeout)
         output_width = 24
+<<<<<<< HEAD
         distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
+=======
+        archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
+>>>>>>> master
 
         if distribute and not os.environ.get('DISTCC_LOG'):

tests/pybin/tools.py

@@ -2 +2 @@
 import argparse
 import contextlib
+import datetime
 import fileinput
 import multiprocessing
@@ -289 +290 @@
         return out.strip()
 
+# get pretty string for time of day
+def pretty_now():
+        ts = time.time()
+        print(ts, file=sys.stderr)
+        return datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d_%H:%M:%S')
+
 # check if arguments is yes or no
 def yes_no(string):
@@ -320 +327 @@
         return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
 
+def core_archive(dst, name, exe):
+        # Get the files to copy
+        core = os.path.join(os.getcwd(), "core" )
+
+        # Uncomment if we want timestamps on coredumps
+        # dst  = os.path.join(dst, "%s_%s" % (name, pretty_now()))
+
+        # make a directory for this test
+        mkdir(os.path.join(dst, "dir"))
+
+        # moves the files
+        mv( core, os.path.join(dst, "core" ) )
+        mv( exe , os.path.join(dst, name   ) )
+
+        # return explanatory test
+        return "Archiving %s (executable and core) to %s" % (os.path.relpath(exe, settings.BUILDDIR), os.path.relpath(dst, settings.original_path))
+
 class Timed:
     def __enter__(self):

tests/test.py

@@ -91 +91 @@
         parser.add_argument('--all', help='Run all test available', action='store_true')
         parser.add_argument('--regenerate-expected', help='Regenerate the .expect by running the specified tets, can be used with --all option', action='store_true')
+        parser.add_argument('--archive-errors', help='If called with a valid path, on test crashes the test script will copy the core dump and the executable to the specified path.', type=str, default='')
         parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously', type=int)
         parser.add_argument('--list-comp', help='List all valide arguments', action='store_true')
@@ -179 +180 @@
                         error = error + info if error else info
 
+                        if settings.archive:
+                                error = error + '\n' + core_archive(settings.archive, test.target(), exe_file)
+
 
 
@@ -295 +299 @@
         # users may want to simply list the tests
         if options.list_comp :
-                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --install --timeout --global-timeout -j --jobs ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --archive-errors --install --timeout --global-timeout -j --jobs ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))