Changeset 4ae78c1 for src/GenPoly/Specialize.cc

Timestamp:

Oct 30, 2020, 12:01:23 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

969e7ee7, f7e4f8e8

Parents:

6a77224 (diff), 3100754 (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/Specialize.cc (modified) (2 diffs)

src/GenPoly/Specialize.cc

@@ -218 +218 @@
                 thunkFunc->get_attributes().push_back( new Attribute( "unused" ) );
 
+                // Thunks at the global level must be static to avoid collisions between files.
+                // (Conversly thunks inside a function must be unique and not static.)
+                thunkFunc->storageClasses.is_static = !isInFunction();
+
                 // thread thunk parameters into call to actual function, naming thunk parameters as we go
                 UniqueName paramNamer( paramPrefix );
@@ -321 +325 @@
         }
 
-        // Fold it into Specialize if we find a good way.
-        struct StaticThunks final : public WithShortCircuiting {
-                void previsit( Declaration * ) {
-                        visit_children = false;
-                }
-                void postvisit( FunctionDecl * decl ) {
-                        if ( isPrefix( decl->name, "_thunk" ) ) {
-                                decl->storageClasses.is_static = true;
-                        }
-                }
-        };
-
         void convertSpecializations( std::list< Declaration* >& translationUnit ) {
                 PassVisitor<Specialize> spec;
                 mutateAll( translationUnit, spec );
-                PassVisitor<StaticThunks> staticThunks;
-                acceptAll( translationUnit, staticThunks );
         }
 } // namespace GenPoly