Changeset bc07190 for src/ResolvExpr/CommonType.cpp

Timestamp:

Jun 29, 2024, 7:33:28 AM (18 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

011c29e

Parents:

62a38e7 (diff), 115ac1ce (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/CommonType.cpp (modified) (2 diffs)

src/ResolvExpr/CommonType.cpp

@@ -386 +386 @@
                 } else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( type2 ) ) {
                         const ast::EnumDecl* enumDecl = enumInst->base;
-                        if ( !enumDecl->base ) {
+                        if ( !enumDecl->isCfa  ) {
                                 ast::BasicKind kind = commonTypes[ basic->kind ][ ast::BasicKind::SignedInt ];
                                 if (
@@ -642 +642 @@
                         const ast::EnumDecl* argDecl = argAsEnumInst->base;
                         if (argDecl->isSubTypeOf(paramDecl)) result = param;
-                } else if ( param->base && !param->base->isTyped ) {
+                } else if ( param->base && !param->base->isCfa ) {
                         auto basicType = new ast::BasicType( ast::BasicKind::UnsignedInt );
                         result = commonType( basicType, type2, tenv, need, have, open, widen);