Changeset 509ec82 for src/ResolvExpr/ResolveTypeof.cpp

Timestamp:

Dec 1, 2024, 9:04:12 PM (10 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

eae8b37

Parents:

3e2e9b2 (diff), 1c0a3a4 (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/ResolvExpr/ResolveTypeof.cpp (modified) (2 diffs)

src/ResolvExpr/ResolveTypeof.cpp

@@ -88 +88 @@
         FixArrayDimension(const ResolveContext & context) : context( context ) {}
 
-        const ast::ArrayType * previsit (const ast::ArrayType * arrayType) {
-                if (!arrayType->dimension) return arrayType;
-                auto mutType = mutate(arrayType);
+        template< typename PtrType >
+        const PtrType * previsitImpl( const PtrType * type ) {
+                // Note: resolving dimension expressions seems to require duplicate logic,
+                // here and Resolver.cpp: handlePtrType
+
+                if (!type->dimension) return type;
+                auto mutType = mutate(type);
                 auto globalSizeType = context.global.sizeType;
                 ast::ptr<ast::Type> sizetype = globalSizeType ? globalSizeType : new ast::BasicType( ast::BasicKind::LongUnsignedInt );
-                mutType->dimension = findSingleExpression(arrayType->dimension, sizetype, context );
+                mutType->dimension = findSingleExpression(type->dimension, sizetype, context );
 
                 if (InitTweak::isConstExpr(mutType->dimension)) {
@@ -102 +106 @@
                 }
                 return mutType;
+        }
+
+        const ast::ArrayType * previsit (const ast::ArrayType * arrayType) {
+                return previsitImpl( arrayType );
+        }
+
+        const ast::PointerType * previsit (const ast::PointerType * pointerType) {
+                return previsitImpl( pointerType );
         }
 };