Changeset def751f for src/Validate/ReplaceTypedef.cpp

Timestamp:

Jul 25, 2022, 3:17:25 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b0d9ff7

Parents:

4e2befe3 (diff), ffec1bf (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' into qualifiedEnum

File:

• src/Validate/ReplaceTypedef.cpp (modified) (7 diffs)

src/Validate/ReplaceTypedef.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ReplaceTypedef.cpp --
+// ReplaceTypedef.cpp -- Fill in all typedefs with the underlying type.
 //
 // Author           : Andrew Beach
 // Created On       : Tue Jun 29 14:59:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 12 14:17:00 2022
-// Update Count     : 0
+// Last Modified On : Wed Jul 13 14:45:00 2022
+// Update Count     : 1
 //
 
@@ -63 +63 @@
         void previsit( ast::TraitDecl const * );
 
-        void previsit( ast::FunctionType const * );
-
         template<typename AggrDecl>
         void addImplicitTypedef( AggrDecl * aggDecl );
@@ -78 +76 @@
         CodeLocation const * nearestLocation = nullptr;
         int scopeLevel;
-        bool inFunctionType = false;
+        bool isAtFunctionTop = false;
 };
 
@@ -105 +103 @@
                 ast::Type * ret = ast::deepCopy( def->second.first->base );
                 ret->qualifiers |= type->qualifiers;
-                // GCC ignores certain attributes if they arrive by typedef,
-                // this mimics that.
-                // TODO: This might cover too much, it should just cover arguments
-                //   and return values of a function.
-                if ( visitor->isInFunction() ) {
+                // We ignore certain attributes on function parameters if they arrive
+                // by typedef. GCC appears to do the same thing.
+                if ( isAtFunctionTop ) {
                         erase_if( ret->attributes, isNonParameterAttribute );
                 }
@@ -207 +203 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
+        GuardValue( isAtFunctionTop ) = true;
 }
 
@@ -262 +259 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
+        GuardValue( isAtFunctionTop ) = false;
         scopeLevel += 1;
 }
@@ -292 +290 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
-}
-
-void ReplaceTypedefCore::previsit( ast::FunctionType const * ) {
-        GuardValue( inFunctionType ) = true;
 }