Changes in / [a57cb58:b826e6b]

Location:

src

Files:

• Common/VectorMap.h (modified) (1 diff)
• GenPoly/Box.cc (modified) (3 diffs)

src/Common/VectorMap.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScopedMap.h --
+// VectorMap.h --
 //
 // Author           : Aaron B. Moss

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;