Changeset 54cd1a51 for src/AST/Expr.cpp

Timestamp:

Feb 11, 2025, 6:08:19 PM (2 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/AST/Expr.cpp (modified) (3 diffs)

src/AST/Expr.cpp ¶

@@ -26 +26 @@
 #include "Stmt.hpp"
 #include "Type.hpp"
-#include "Util.hpp"                // for TranslationDeps
 #include "TypeSubstitution.hpp"
 #include "Common/Utility.hpp"
@@ -281 +280 @@
 // --- SizeofExpr
 
-SizeofExpr::SizeofExpr( const CodeLocation & loc, const Type * t )
-: Expr( loc, ast::TranslationDeps::getSizeType() ), type( t ) {}
+SizeofExpr::SizeofExpr( const CodeLocation & loc, const Type * type )
+: SizeofExpr( loc, type, nullptr ) {}
+
+SizeofExpr::SizeofExpr( const CodeLocation & loc, const Type * type, const Type * result )
+: Expr( loc, result ), type( type ) {}
 
 // --- AlignofExpr
 
-AlignofExpr::AlignofExpr( const CodeLocation & loc, const Type * t )
-: Expr( loc, ast::TranslationDeps::getSizeType() ), type( t ) {}
+AlignofExpr::AlignofExpr( const CodeLocation & loc, const Type * type )
+: AlignofExpr( loc, type, nullptr ) {}
+
+AlignofExpr::AlignofExpr( const CodeLocation & loc, const Type * type, const Type * result )
+: Expr( loc, result ), type( type ) {}
 
 // --- CountofExpr
 
 CountofExpr::CountofExpr( const CodeLocation & loc, const Type * t )
-: Expr( loc, ast::TranslationDeps::getSizeType() ), type( t ) {}
+: Expr( loc ), type( t ) {}
 
 // --- OffsetofExpr
 
 OffsetofExpr::OffsetofExpr( const CodeLocation & loc, const Type * ty, const DeclWithType * mem )
-: Expr( loc, ast::TranslationDeps::getSizeType() ), type( ty ), member( mem ) {
+: OffsetofExpr( loc, ty, mem, nullptr ) {}
+
+OffsetofExpr::OffsetofExpr( const CodeLocation & loc, const Type * ty, const DeclWithType * mem, const Type * res )
+: Expr( loc, res ), type( ty ), member( mem ) {
         assert( type );
         assert( member );
@@ -305 +313 @@
 
 OffsetPackExpr::OffsetPackExpr( const CodeLocation & loc, const StructInstType * ty )
-: Expr( loc, new ArrayType{
-        ast::TranslationDeps::getSizeType(), nullptr, FixedLen, DynamicDim }
-), type( ty ) {
+: Expr( loc ), type( ty ) {
         assert( type );
 }