Changeset c341b57 for src

Timestamp:

Feb 13, 2025, 5:52:15 PM (8 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ef9f11c

Parents:

502ff9e (diff), 53f4b55 (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

Location:

src

Files:

• AST/Expr.cpp (modified) (2 diffs)
• AST/Expr.hpp (modified) (1 diff)
• GenPoly/Box.cpp (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (1 diff)
• ResolvExpr/ConversionCost.cpp (modified) (1 diff)
• ResolvExpr/Cost.hpp (modified) (1 diff)
• Validate/EnumAndPointerDecay.cpp (modified) (1 diff)

src/AST/Expr.cpp

@@ -301 +301 @@
 // --- OffsetofExpr
 
-OffsetofExpr::OffsetofExpr( const CodeLocation & loc, const Type * ty, const DeclWithType * 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 ) {
@@ -324 +321 @@
 
 // --- CommaExpr
+
 bool CommaExpr::get_lvalue() const {
         // This is wrong by C, but the current implementation uses it.

src/AST/Expr.hpp

@@ -539 +539 @@
         readonly<DeclWithType> member;
 
-        OffsetofExpr( const CodeLocation & loc, const Type * ty, const DeclWithType * mem );
         OffsetofExpr( const CodeLocation & loc, const Type * ty, const DeclWithType * mem, const Type * res );
 

src/GenPoly/Box.cpp

@@ -2002 +2002 @@
                         new ast::OffsetofExpr( expr->location,
                                 deepCopy( type ),
-                                memberDecl
+                                memberDecl,
+                                getLayoutType( transUnit() )
                         )
                 ) );

src/ResolvExpr/CandidateFinder.cpp

@@ -2150 +2150 @@
 }
 
-const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src, 
-        const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
+const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src,
+                const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
         auto srcDecl = src->base;
         auto dstDecl = dst->base;
 
-        if (srcDecl->name == dstDecl->name) return expr;
-
-        for (auto& dstChild: dstDecl->inlinedDecl) {
+        if ( srcDecl->name == dstDecl->name ) return expr;
+
+        for ( auto& dstChild : dstDecl->inlinedDecl ) {
                 Cost c = castCost(src, dstChild, false, context.symtab, env);
-                ast::CastExpr * castToDst;
-                if (c<minCost) {
-                        unsigned offset = findChildOffset( dstDecl, dstChild.get()->base );
-                        if (offset > 0) {
-                                auto untyped = ast::UntypedExpr::createCall(
-                                        expr->location,
-                                        "?+?",
-                                        { new ast::CastExpr( expr->location,
-                                                expr,
-                                                new ast::BasicType(ast::BasicKind::SignedInt),
-                                                ast::GeneratedFlag::ExplicitCast ),
-                                                ast::ConstantExpr::from_int(expr->location, offset)} );
-                                CandidateFinder finder(context, env);
-                                finder.find( untyped );
-                                CandidateList winners = findMinCost( finder.candidates );
-                                CandidateRef & choice = winners.front();
-                                choice->expr = new ast::CastExpr(expr->location, choice->expr, dstChild, ast::GeneratedFlag::ExplicitCast);
-                                auto destExpr = makeEnumOffsetCast( src, dstChild, choice->expr, minCost );
-                                if ( !destExpr ) continue;
-                                castToDst = new ast::CastExpr( destExpr, dst );
-                        } else {
-                                castToDst = new ast::CastExpr( expr, dst );
-                        }
-                        return castToDst;
+                if ( minCost <= c ) continue;
+                unsigned offset = findChildOffset( dstDecl, dstChild.get()->base );
+                if ( offset <= 0 ) return new ast::CastExpr( expr, dst );
+
+                auto untyped = ast::UntypedExpr::createCall(
+                        expr->location,
+                        "?+?",
+                        { new ast::CastExpr( expr->location,
+                                expr,
+                                new ast::BasicType( ast::BasicKind::SignedInt ),
+                                ast::GeneratedFlag::ExplicitCast ),
+                                ast::ConstantExpr::from_int( expr->location, offset ) } );
+                CandidateFinder finder(context, env);
+                finder.find( untyped );
+                CandidateList winners = findMinCost( finder.candidates );
+                CandidateRef & choice = winners.front();
+                choice->expr = new ast::CastExpr( expr->location, choice->expr, dstChild, ast::GeneratedFlag::ExplicitCast );
+                if ( auto destExpr = makeEnumOffsetCast( src, dstChild, choice->expr, minCost ) ) {
+                        return new ast::CastExpr( destExpr, dst );
                 }
         }

src/ResolvExpr/ConversionCost.cpp

@@ -518 +518 @@
         auto srcDecl = src->base;
         auto dstDecl = dst->base;
-        if (srcDecl->name == dstDecl->name) return Cost::safe;
+        if ( srcDecl->name == dstDecl->name ) return Cost::safe;
         Cost minCost = Cost::infinity;
-        for (auto child: dstDecl->inlinedDecl) {
-                Cost c = enumCastCost(src, child, symtab, env) + Cost::safe;
-                if (c<minCost) minCost = c;
+        for ( auto child : dstDecl->inlinedDecl ) {
+                Cost c = enumCastCost( src, child, symtab, env ) + Cost::safe;
+                if ( c < minCost ) minCost = c;
         }
         return minCost;

src/ResolvExpr/Cost.hpp

@@ -169 +169 @@
 }
 
+inline bool operator<=( const Cost lhs, const Cost rhs ) {
+        return !(rhs < lhs);
+}
+
 inline Cost operator+( const Cost lhs, const Cost rhs ) {
         if ( lhs.all == Cost::infinity || rhs.all == Cost::infinity ) return Cost{ Cost::infinity };

src/Validate/EnumAndPointerDecay.cpp

@@ -48 +48 @@
                 } else if ( auto value = member.as<ast::InlineMemberDecl>() ) {
                         auto targetEnum = symtab.lookupEnum( value->name );
-                        // assert( targetEnum );
                         if (!targetEnum) {
                                 SemanticError(value, "Only another enum is allowed for enum inline syntax ");
                         }
                         const ast::EnumInstType * instType = new ast::EnumInstType(targetEnum);
-                        mut->inlinedDecl.push_back( std::move(instType) );
+                        mut->inlinedDecl.emplace_back( instType );
                         for ( auto enumMember : targetEnum->members ) {
                                 auto enumObject = enumMember.strict_as<ast::ObjectDecl>();