Changeset 4c03e63 for src/GenPoly

Timestamp:

Jun 23, 2017, 4:20:33 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

74e58ea3, 7bbba76

Parents:

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

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/GenPoly

Files:

• Box.cc (modified) (7 diffs)
• CopyParams.cc (modified) (1 diff)
• DeclMutator.cc (modified) (15 diffs)
• Lvalue.cc (modified) (1 diff)
• PolyMutator.cc (modified) (2 diffs)
• Specialize.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 13 09:26:38 2017
-// Update Count     : 341
+// Last Modified On : Wed Jun 21 15:49:59 2017
+// Update Count     : 346
 //
 
@@ -62 +62 @@
 namespace GenPoly {
         namespace {
-                const std::list<Label> noLabels;
-
                 FunctionType *makeAdapterType( FunctionType *adaptee, const TyVarMap &tyVars );
 
@@ -343 +341 @@
         Statement *makeAlignTo( Expression *lhs, Expression *rhs ) {
                 // check that the lhs is zeroed out to the level of rhs
-                Expression *ifCond = makeOp( "?&?", lhs, makeOp( "?-?", rhs, new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), "1" ) ) ) );
+                Expression *ifCond = makeOp( "?&?", lhs, makeOp( "?-?", rhs, new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
                 // if not aligned, increment to alignment
                 Expression *ifExpr = makeOp( "?+=?", lhs->clone(), makeOp( "?-?", rhs->clone(), ifCond->clone() ) );
@@ -386 +384 @@
 
                 // initialize size and alignment to 0 and 1 (will have at least one member to re-edit size)
-                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "0" ) ) ) );
-                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "1" ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant::from_ulong( 0 ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
                 unsigned long n_members = 0;
                 bool firstMember = true;
@@ -443 +441 @@
 
                 // calculate union layout in function body
-                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "1" ) ) ) );
-                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "1" ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
                 for ( std::list< Declaration* >::const_iterator member = unionDecl->get_members().begin(); member != unionDecl->get_members().end(); ++member ) {
                         DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *member );
@@ -1566 +1564 @@
                 /// Returns an index expression into the offset array for a type
                 Expression *makeOffsetIndex( Type *objectType, long i ) {
-                        std::stringstream offset_namer;
-                        offset_namer << i;
-                        ConstantExpr *fieldIndex = new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), offset_namer.str() ) );
+                        ConstantExpr *fieldIndex = new ConstantExpr( Constant::from_ulong( i ) );
                         UntypedExpr *fieldOffset = new UntypedExpr( new NameExpr( "?[?]" ) );
                         fieldOffset->get_args().push_back( new NameExpr( offsetofName( mangleType( objectType ) ) ) );
@@ -1781 +1777 @@
                                 // all union members are at offset zero
                                 delete offsetofExpr;
-                                return new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), "0" ) );
+                                return new ConstantExpr( Constant::from_ulong( 0 ) );
                         } else return offsetofExpr;
                 }

src/GenPoly/CopyParams.cc

@@ -45 +45 @@
 
         CopyParams::CopyParams() : namer( "_cp" ) {}
-
-        static const std::list< Label > noLabels;
 
         void CopyParams::visit( FunctionDecl *funcDecl ) {

src/GenPoly/DeclMutator.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Nov 27 14:44:00 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:16:43 2016
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 22 13:49:00 2017
+// Update Count     : 4
 //
 
@@ -20 +20 @@
 
 namespace GenPoly {
-        namespace {
-                const std::list<Label> noLabels;
-        }
-
         DeclMutator::DeclMutator() : Mutator(), declsToAdd(1), declsToAddAfter(1) {}
 
         DeclMutator::~DeclMutator() {}
-        
+
         void DeclMutator::mutateDeclarationList( std::list< Declaration* > &decls ) {
                 for ( std::list< Declaration* >::iterator decl = decls.begin(); ; ++decl ) {
@@ -34 +30 @@
 
                         if ( decl == decls.end() ) break;
-                        
+
                         // run mutator on declaration
                         *decl = maybeMutate( *decl, *this );
@@ -55 +51 @@
                 newBack->splice( newBack->end(), *back );
                 declsToAdd.pop_back();
-                
+
                 back = declsToAddAfter.rbegin();
                 newBack = back + 1;
@@ -66 +62 @@
                 CompoundStmt *compoundStmt = dynamic_cast< CompoundStmt* >(stmt);
                 if ( compoundStmt ) return mutate( compoundStmt );
-                
+
                 doBeginScope();
-                
+
                 // run mutator on statement
                 stmt = maybeMutate( stmt, *this );
@@ -102 +98 @@
                 doBeginScope();
 
-                
+
                 for ( std::list< Statement* >::iterator stmt = stmts.begin(); ; ++stmt ) {
                         // add any new declarations after the previous statement
@@ -112 +108 @@
 
                         if ( stmt == stmts.end() ) break;
-                        
+
                         // run mutator on statement
                         *stmt = maybeMutate( *stmt, *this );
@@ -123 +119 @@
                         declsToAdd.back().clear();
                 }
-                
+
                 doEndScope();
         }
@@ -139 +135 @@
                 return compoundStmt;
         }
-        
+
         Statement* DeclMutator::mutate(IfStmt *ifStmt) {
                 ifStmt->set_condition( maybeMutate( ifStmt->get_condition(), *this ) );
@@ -146 +142 @@
                 return ifStmt;
         }
-        
+
         Statement* DeclMutator::mutate(WhileStmt *whileStmt) {
                 whileStmt->set_condition( maybeMutate( whileStmt->get_condition(), *this ) );
@@ -152 +148 @@
                 return whileStmt;
         }
-        
+
         Statement* DeclMutator::mutate(ForStmt *forStmt) {
                 mutateAll( forStmt->get_initialization(), *this );
@@ -160 +156 @@
                 return forStmt;
         }
-        
+
         Statement* DeclMutator::mutate(SwitchStmt *switchStmt) {
                 switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
@@ -166 +162 @@
                 return switchStmt;
         }
-        
+
         Statement* DeclMutator::mutate(CaseStmt *caseStmt) {
                 caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
@@ -172 +168 @@
                 return caseStmt;
         }
-        
+
         Statement* DeclMutator::mutate(TryStmt *tryStmt) {
                 tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
@@ -179 +175 @@
                 return tryStmt;
         }
-        
+
         Statement* DeclMutator::mutate(CatchStmt *catchStmt) {
                 catchStmt->set_decl( maybeMutate( catchStmt->get_decl(), *this ) );
+                catchStmt->set_cond( maybeMutate( catchStmt->get_cond(), *this ) );
                 catchStmt->set_body( mutateStatement( catchStmt->get_body() ) );
                 return catchStmt;

src/GenPoly/Lvalue.cc

@@ -35 +35 @@
 namespace GenPoly {
         namespace {
-                const std::list<Label> noLabels;
-
                 /// Replace uses of lvalue returns with appropriate pointers
                 class Pass1 : public Mutator {

src/GenPoly/PolyMutator.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 : Thu Aug  4 11:26:22 2016
-// Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 22 13:47:00 2017
+// Update Count     : 17
 //
 
@@ -123 +123 @@
 
         Statement * PolyMutator::mutate(TryStmt *tryStmt) {
-                tryStmt->set_block(  maybeMutate( tryStmt->get_block(), *this ) );
+                tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
                 mutateAll( tryStmt->get_catchers(), *this );
+                tryStmt->set_finally( maybeMutate( tryStmt->get_finally(), *this ) );
                 return tryStmt;
         }
 
         Statement * PolyMutator::mutate(CatchStmt *cathStmt) {
-                cathStmt->set_body(  mutateStatement( cathStmt->get_body() ) );
-                cathStmt->set_decl(  maybeMutate( cathStmt->get_decl(), *this ) );
+                cathStmt->set_body( mutateStatement( cathStmt->get_body() ) );
+                cathStmt->set_cond( maybeMutate( cathStmt->get_cond(), *this ) );
+                cathStmt->set_decl( maybeMutate( cathStmt->get_decl(), *this ) );
                 return cathStmt;
         }

src/GenPoly/Specialize.cc

@@ -99 +99 @@
                 if ( FunctionType * fftype = getFunctionType( formalType ) ) {
                         if ( fftype->isTtype() ) return true;
+                        // conversion of 0 (null) to function type does not require tuple specialization
+                        if ( dynamic_cast< ZeroType * >( actualType ) ) return false;
                         FunctionType * aftype = getFunctionType( actualType );
                         assertf( aftype, "formal type is a function type, but actual type is not." );