Changeset 15215f02 for src/ResolvExpr/CommonType.cc

Timestamp:

Apr 22, 2024, 11:37:36 PM (5 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

13de4478

Parents:

0fe07be (diff), d7c0ad5 (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.cc (modified) (2 diffs)

src/ResolvExpr/CommonType.cc

@@ -397 +397 @@
                         }
                 } else if ( auto type2AsAttr = dynamic_cast< const ast::EnumAttrType * >( type2 ) ) {
-            if ( type2AsAttr->attr == ast::EnumAttribute::Posn ) {
-                            ast::BasicKind kind = commonTypes[ basic->kind ][ ast::BasicKind::SignedInt ];
-                            if (
-                                    ( ( kind == basic->kind && basic->qualifiers >= type2->qualifiers )
-                                            || widen.first )
-                                    && ( ( kind != basic->kind && basic->qualifiers <= type2->qualifiers )
-                                            || widen.second )
-                            ) {
-                                    result = new ast::BasicType{ kind, basic->qualifiers | type2->qualifiers };
-                            }
-            }
+                        if ( type2AsAttr->attr == ast::EnumAttribute::Posn ) {
+                                ast::BasicKind kind = commonTypes[ basic->kind ][ ast::BasicKind::SignedInt ];
+                                if (
+                                        ( ( kind == basic->kind && basic->qualifiers >= type2->qualifiers )
+                                                || widen.first )
+                                        && ( ( kind != basic->kind && basic->qualifiers <= type2->qualifiers )
+                                                || widen.second )
+                                ) {
+                                        result = new ast::BasicType{ kind, basic->qualifiers | type2->qualifiers };
+                                }
+                        }
                 }
         }
@@ -519 +519 @@
                                                                 // xxx - assume LHS is always the target type
 
-                                                                if ( ! ((widen.second && ref2->qualifiers.is_mutex) 
+                                                                if ( ! ((widen.second && ref2->qualifiers.is_mutex)
                                                                 || (ref1->qualifiers.is_mutex == ref2->qualifiers.is_mutex ))) return;