Changeset 957453d for src/GenPoly/Box.cc

Timestamp:

Jul 20, 2017, 2:05:44 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

c72f9fd

Parents:

d49bfa8 (diff), 8b28a52 (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

File:

• src/GenPoly/Box.cc (modified) (3 diffs)

src/GenPoly/Box.cc

@@ -202 +202 @@
                 };
 
-                /// Replaces initialization of polymorphic values with alloca, declaration of dtype/ftype with appropriate void expression, and sizeof expressions of polymorphic types with the proper variable
+                /// Replaces initialization of polymorphic values with alloca, declaration of dtype/ftype with appropriate void expression, sizeof expressions of polymorphic types with the proper variable, and strips fields from generic struct declarations.
                 class Pass3 final : public PolyMutator {
                   public:
@@ -210 +210 @@
                         using PolyMutator::mutate;
                         virtual DeclarationWithType *mutate( FunctionDecl *functionDecl ) override;
+                        virtual Declaration *mutate( StructDecl *structDecl ) override;
+                        virtual Declaration *mutate( UnionDecl *unionDecl ) override;
                         virtual ObjectDecl *mutate( ObjectDecl *objectDecl ) override;
                         virtual TypedefDecl *mutate( TypedefDecl *objectDecl ) override;
@@ -1868 +1870 @@
                 }
 
+                /// Strips the members from a generic aggregate
+                void stripGenericMembers(AggregateDecl* decl) {
+                        if ( ! decl->get_parameters().empty() ) decl->get_members().clear();
+                }
+
+                Declaration *Pass3::mutate( StructDecl *structDecl ) {
+                        stripGenericMembers( structDecl );
+                        return structDecl;
+                }
+                
+                Declaration *Pass3::mutate( UnionDecl *unionDecl ) {
+                        stripGenericMembers( unionDecl );
+                        return unionDecl;
+                }
+
                 TypeDecl * Pass3::mutate( TypeDecl *typeDecl ) {
 //   Initializer *init = 0;