Changeset 4e13e2a

Timestamp:

Sep 17, 2019, 12:56:32 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8e1467d

Parents:

a6f26ca

Message:

Added setting of result in Comma expression.
Added asserts in candidate finder to catch null pointers earlier.
ForAll? substituter now properly uses ShallowCopy?.
Added missing makefile.in

Files:

• benchmark/Makefile.in (modified) (6 diffs)
• src/AST/Expr.hpp (modified) (1 diff)
• src/AST/ForallSubstitutionTable.cpp (modified) (3 diffs)
• src/ResolvExpr/Candidate.hpp (modified) (2 diffs)
• src/ResolvExpr/CandidateFinder.cpp (modified) (1 diff)
• src/ResolvExpr/RenameVars.cc (modified) (4 diffs)

benchmark/Makefile.in ¶

@@ -380 +380 @@
 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
-BENCH_V_QTHREAD = $(__bench_v_QTHREAD_$(__quiet))
 __quiet = verbose
 __bench_v_CC_quiet = @
@@ -394 +393 @@
 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
 __bench_v_UPP_verbose = $(AM_V_UPP)
-__bench_v_QTHREAD_verbose = $(AM_V_CC)
 TOOLSDIR = ${abs_top_builddir}/tools/
 REPEAT = ${abs_top_builddir}/tools/repeat
@@ -410 +408 @@
         ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
         ctxswitch-goroutine.run ctxswitch-java_thread.run \
-        ctxswitch-qthreads.run $(am__append_1)
+        $(am__append_1)
 testdir = $(top_srcdir)/tests
 all: all-am
@@ -860 +858 @@
         @chmod a+x a.out
 
-ctxswitch-qthreads$(EXEEXT):
-        $(BENCH_V_QTHREADS)$(COMPILE) -DBENCH_N=50000000 -I/u/pabuhr/software/qthreads/include -L/u/pabuhr/software/qthreads/lib -Xlinker -R/u/pabuhr/software/qthreads/lib $(srcdir)/ctxswitch/qthreads.c -lqthread
-
 mutex$(EXEEXT) :\
         loop.run                        \
@@ -950 +945 @@
         creation-upp_thread.run                 \
         creation-goroutine.run                  \
-        creation-java_thread.run                \
-        creation-qthreads.run
+        creation-java_thread.run
 
 creation-cfa_coroutine$(EXEEXT):
@@ -979 +973 @@
         @echo "java JavaThread" >> a.out
         @chmod a+x a.out
-
-creation-qthreads$(EXEEXT):
-        $(BENCH_V_QTHREADS)$(COMPILE) -DBENCH_N=50000000 -I/u/pabuhr/software/qthreads/include -L/u/pabuhr/software/qthreads/lib -Xlinker -R/u/pabuhr/software/qthreads/lib $(srcdir)/ctxswitch/qthreads.c -lqthread
 
 compile$(EXEEXT) :\

src/AST/Expr.hpp ¶

@@ -541 +541 @@
 
         CommaExpr( const CodeLocation & loc, const Expr * a1, const Expr * a2 )
-        : Expr( loc ), arg1( a1 ), arg2( a2 ) {}
+        : Expr( loc ), arg1( a1 ), arg2( a2 ) {
+                this->result = a2->result;
+        }
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/ForallSubstitutionTable.cpp ¶

@@ -19 +19 @@
 #include <vector>
 
+#include "Copy.hpp"                // for shallowCopy
 #include "Decl.hpp"
 #include "Node.hpp"
@@ -26 +27 @@
 namespace ast {
 
-std::vector< ptr< TypeDecl > > ForallSubstitutionTable::clone( 
-        const std::vector< ptr< TypeDecl > > & forall, Visitor & v 
+std::vector< ptr< TypeDecl > > ForallSubstitutionTable::clone(
+        const std::vector< ptr< TypeDecl > > & forall, Visitor & v
 ) {
         std::vector< ptr< TypeDecl > > new_forall;
@@ -34 +35 @@
         for ( const ast::TypeDecl * d : forall ) {
                 // create cloned type decl and insert into substitution map before further mutation
-                auto new_d = new ast::TypeDecl{
-                        d->location, d->name, d->storage, d->base, d->kind, d->sized, d->init };
+                auto new_d = shallowCopy( d );
                 decls.insert( d, new_d );
                 // perform other mutations and add to output

src/ResolvExpr/Candidate.hpp ¶

@@ -51 +51 @@
 
         Candidate( const ast::Expr * x, const ast::TypeEnvironment & e )
-        : expr( x ), cost( Cost::zero ), cvtCost( Cost::zero ), env( e ), open(), need() {}
+        : expr( x ), cost( Cost::zero ), cvtCost( Cost::zero ), env( e ), open(), need() {
+                assert(x->result);
+        }
 
         Candidate( const Candidate & o, const ast::Expr * x, const Cost & addedCost = Cost::zero )
         : expr( x ), cost( o.cost + addedCost ), cvtCost( Cost::zero ), env( o.env ), open( o.open ),
-          need( o.need ) {}
+          need( o.need ) {
+                assert(x->result);
+        }
 
         Candidate(
-                const ast::Expr * x, const ast::TypeEnvironment & e, const ast::OpenVarSet & o, 
+                const ast::Expr * x, const ast::TypeEnvironment & e, const ast::OpenVarSet & o,
                 const ast::AssertionSet & n, const Cost & c, const Cost & cvt = Cost::zero )
-        : expr( x ), cost( c ), cvtCost( cvt ), env( e ), open( o ), need( n.begin(), n.end() ) {}
+        : expr( x ), cost( c ), cvtCost( cvt ), env( e ), open( o ), need( n.begin(), n.end() ) {
+                assert(x->result);
+        }
 
         Candidate(
@@ -66 +72 @@
                 ast::AssertionSet && n, const Cost & c, const Cost & cvt = Cost::zero )
         : expr( x ), cost( c ), cvtCost( cvt ), env( std::move( e ) ), open( std::move( o ) ),
-          need( n.begin(), n.end() ) {}
+          need( n.begin(), n.end() ) {
+                assert(x->result);
+        }
 };
 

src/ResolvExpr/CandidateFinder.cpp ¶

@@ -1485 +1485 @@
                         {
                                 ast::ptr< ast::Type > newType = candidate->expr->result;
+                                assertf(candidate->expr->result, "Result of expression %p for candidate is null", candidate->expr.get());
                                 candidate->env.apply( newType );
                                 mangleName = Mangle::mangle( newType );

src/ResolvExpr/RenameVars.cc ¶

@@ -83 +83 @@
                         auto it = nameMap.find( type->name );
                         if ( it != nameMap.end() ) {
-                                // unconditionally mutate because map will *always* have different name, 
+                                // unconditionally mutate because map will *always* have different name,
                                 // if this mutates, will *always* have been mutated by ForallSubstitutor above
                                 ast::TypeInstType * mut = ast::mutate( type );
@@ -96 +96 @@
                 const NodeT * openLevel( const NodeT * type ) {
                         if ( type->forall.empty() ) return type;
-                        
+
                         nameMap.beginScope();
 
@@ -121 +121 @@
                 void closeLevel( const ast::ParameterizedType * type ) {
                         if ( type->forall.empty() ) return;
-                        
+
                         nameMap.endScope();
                 }
@@ -141 +141 @@
                 }
         };
-        
+
         struct RenameVars_new /*: public ast::WithForallSubstitutor*/ {
                 #warning when old RenameVars goes away, replace hack below with global pass inheriting from WithForallSubstitutor