Changeset 06d75931 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Oct 26, 2024, 8:17:20 AM (3 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

14c31eb

Parents:

3a08cb1 (diff), d031f7f (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) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -2136 +2136 @@
 }
 
+/// If the target enum is a child, get the offset from the base to the target.
+static unsigned findChildOffset(
+                const ast::EnumDecl * decl, const ast::EnumDecl * target ) {
+        unsigned offset = 0;
+        for ( auto inlined : decl->inlinedDecl ) {
+                auto childDecl = inlined->base;
+                if ( childDecl == target ) {
+                        return offset;
+                }
+                offset += childDecl->members.size();
+        }
+        SemanticError( decl, "Cannot find the target enum." );
+}
+
 const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src, 
         const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
@@ -2147 +2161 @@
                 ast::CastExpr * castToDst;
                 if (c<minCost) {
-                        unsigned offset = dstDecl->calChildOffset(dstChild.get());
+                        unsigned offset = findChildOffset( dstDecl, dstChild.get()->base );
                         if (offset > 0) {
                                 auto untyped = ast::UntypedExpr::createCall(
-                                        expr->location, 
-                                        "?+?", 
+                                        expr->location,
+                                        "?+?",
                                         { new ast::CastExpr( expr->location,
                                                 expr,