Changeset 235b41f for src/GenPoly

Timestamp:

Sep 5, 2017, 3:41:04 PM (8 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, with_gc

Children:

416cc86

Parents:

800d275 (diff), 3f8dd01 (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)
• GenPoly.cc (modified) (4 diffs)

src/GenPoly/Box.cc

@@ -141 +141 @@
                         virtual StructDecl *mutate( StructDecl *structDecl ) override;
                         virtual UnionDecl *mutate( UnionDecl *unionDecl ) override;
+                        virtual TraitDecl *mutate( TraitDecl *unionDecl ) override;
                         virtual TypeDecl *mutate( TypeDecl *typeDecl ) override;
                         virtual TypedefDecl *mutate( TypedefDecl *typedefDecl ) override;
@@ -216 +217 @@
                   private:
                 };
-
         } // anonymous namespace
 
@@ -896 +896 @@
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
                                 bodyStmt = new ExprStmt( noLabels, adapteeApp );
-//                      } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
                         } else if ( isDynType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
                                 // return type T
@@ -1299 +1298 @@
                 }
 
-                /// determines if `pref` is a prefix of `str`
-                bool isPrefix( const std::string & str, const std::string & pref ) {
-                        if ( pref.size() > str.size() ) return false;
-                        auto its = std::mismatch( pref.begin(), pref.end(), str.begin() );
-                        return its.first == pref.end();
-                }
-
                 DeclarationWithType * Pass2::mutate( FunctionDecl *functionDecl ) {
                         functionDecl = safe_dynamic_cast< FunctionDecl * > ( handleDecl( functionDecl ) );
@@ -1352 +1344 @@
                 }
 
+                TraitDecl * Pass2::mutate( TraitDecl *aggDecl ) {
+                        return handleAggDecl( aggDecl );
+                }
+
                 TypeDecl * Pass2::mutate( TypeDecl *typeDecl ) {
                         addToTyVarMap( typeDecl, scopeTyVars );
@@ -1377 +1373 @@
                 Type *Pass2::mutate( FunctionType *funcType ) {
                         scopeTyVars.beginScope();
+
                         makeTyVarMap( funcType, scopeTyVars );
 
@@ -1550 +1547 @@
                                         // (alloca was previously used, but can't be safely used in loops)
                                         Type *declType = objectDecl->get_type();
-                                        std::string bufName = bufNamer.newName();
-                                        ObjectDecl *newBuf = new ObjectDecl( bufName, Type::StorageClasses(), LinkageSpec::C, 0,
+                                        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( std::string{"aligned"}, std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
+                                                true, false, std::list<Attribute*>{ new Attribute( "aligned", std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
                                         stmtsToAdd.push_back( new DeclStmt( noLabels, newBuf ) );
 
                                         delete objectDecl->get_init();
-
-                                        objectDecl->set_init( new SingleInit( new NameExpr( bufName ) ) );
+                                        objectDecl->set_init( new SingleInit( new VariableExpr( newBuf ) ) );
                                 }
                         }

src/GenPoly/GenPoly.cc

@@ -336 +336 @@
                                 assertf(bparam, "Aggregate parameters should be type expressions");
 
-                                // xxx - might need to let VoidType be a wildcard here too; could have some voids 
+                                // xxx - might need to let VoidType be a wildcard here too; could have some voids
                                 // stuffed in for dtype-statics.
                                 // if ( is<VoidType>( aparam->get_type() ) || is<VoidType>( bparam->get_type() ) ) continue;
                                 if ( ! typesPolyCompatible( aparam->get_type(), bparam->get_type() ) ) return false;
                         }
-                        
+
                         return true;
                 }
@@ -350 +350 @@
                 // polymorphic types always match
                 if ( aid == type_index{typeid(TypeInstType)} ) return true;
-                
+
                 type_index bid{ typeid(*b) };
                 // polymorphic types always match
                 if ( bid == type_index{typeid(TypeInstType)} ) return true;
-                
+
                 // can't match otherwise if different types
                 if ( aid != bid ) return false;
@@ -377 +377 @@
                                 ConstantExpr *ad = dynamic_cast<ConstantExpr*>( aa->get_dimension() );
                                 ConstantExpr *bd = dynamic_cast<ConstantExpr*>( ba->get_dimension() );
-                                if ( ad && bd 
+                                if ( ad && bd
                                                 && ad->get_constant()->get_value() != bd->get_constant()->get_value() )
                                         return false;
@@ -433 +433 @@
 
         void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap ) {
+                // xxx - should this actually be insert?
                 tyVarMap[ tyVar->get_name() ] = TypeDecl::Data{ tyVar };
         }