Changeset 54cd1a51 for src/ResolvExpr

Timestamp:

Feb 11, 2025, 6:08:19 PM (8 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

502ff9e, a8404d9

Parents:

4d5c5b6a (diff), 691bf0a (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/CandidateFinder.cpp (modified) (3 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -1486 +1486 @@
 
         void Finder::postvisit( const ast::SizeofExpr * sizeofExpr ) {
+                const ast::Type * type = resolveTypeof( sizeofExpr->type, context );
+                const ast::Type * sizeType = context.global.sizeType.get();
                 addCandidate(
-                        new ast::SizeofExpr{
-                                sizeofExpr->location, resolveTypeof( sizeofExpr->type, context ) },
+                        new ast::SizeofExpr( sizeofExpr->location, type, sizeType ),
+                        tenv );
+        }
+
+        void Finder::postvisit( const ast::AlignofExpr * alignofExpr ) {
+                const ast::Type * type = resolveTypeof( alignofExpr->type, context );
+                const ast::Type * sizeType = context.global.sizeType.get();
+                addCandidate(
+                        new ast::AlignofExpr( alignofExpr->location, type, sizeType ),
                         tenv );
         }
@@ -1516 +1525 @@
         }
 
-        void Finder::postvisit( const ast::AlignofExpr * alignofExpr ) {
-                addCandidate(
-                        new ast::AlignofExpr{
-                                alignofExpr->location, resolveTypeof( alignofExpr->type, context ) },
-                        tenv );
-        }
-
         void Finder::postvisit( const ast::UntypedOffsetofExpr * offsetofExpr ) {
                 const ast::BaseInstType * aggInst;
@@ -1529 +1531 @@
                 else return;
 
+                const ast::Type * sizeType = context.global.sizeType.get();
                 for ( const ast::Decl * member : aggInst->lookup( offsetofExpr->member ) ) {
                         auto dwt = strict_dynamic_cast< const ast::DeclWithType * >( member );
                         addCandidate(
-                                new ast::OffsetofExpr{ offsetofExpr->location, aggInst, dwt }, tenv );
+                                new ast::OffsetofExpr( offsetofExpr->location, aggInst, dwt, sizeType ), tenv );
                 }
         }