Changeset c84dd61 for src/ResolvExpr/CommonType.cc

Timestamp:

Jun 21, 2023, 2:38:55 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

92355883

Parents:

0b0a285 (diff), 2de175ce (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) (4 diffs)

src/ResolvExpr/CommonType.cc

@@ -697 +697 @@
                         if ( auto basic2 = dynamic_cast< const ast::BasicType * >( type2 ) ) {
                                 #warning remove casts when `commonTypes` moved to new AST
+                                
+                                /*
                                 ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)basic2->kind ];
                                 if (
@@ -706 +708 @@
                                         result = new ast::BasicType{ kind, basic->qualifiers | basic2->qualifiers };
                                 }
+                                */
+                                ast::BasicType::Kind kind;
+                                if (basic->kind != basic2->kind && !widen.first && !widen.second) return;
+                                else if (!widen.first) kind = basic->kind; // widen.second
+                                else if (!widen.second) kind = basic2->kind;
+                                else kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)basic2->kind ];
+                                // xxx - what does qualifiers even do here??
+                                if ( (basic->qualifiers >= basic2->qualifiers || widen.first)
+                                        && (basic->qualifiers <= basic2->qualifiers || widen.second) ) {
+                                        result = new ast::BasicType{ kind, basic->qualifiers | basic2->qualifiers };
+                                }
+                                
                         } else if (
                                 dynamic_cast< const ast::ZeroType * >( type2 )
@@ -712 +726 @@
                                 #warning remove casts when `commonTypes` moved to new AST
                                 ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)ast::BasicType::SignedInt ];
-                                if (
-                                        ( ( kind == basic->kind && basic->qualifiers >= type2->qualifiers )
+                                /*
+                                if ( // xxx - what does qualifier even do here??
+                                        ( ( basic->qualifiers >= type2->qualifiers )
                                                 || widen.first )
-                                        && ( ( kind != basic->kind && basic->qualifiers <= type2->qualifiers )
+                                         && ( ( /* kind != basic->kind && basic->qualifiers <= type2->qualifiers )
                                                 || widen.second )
-                                ) {
-                                        result = new ast::BasicType{ kind, basic->qualifiers | type2->qualifiers };
+                                ) 
+                                */
+                                if (widen.second) {
+                                        result = new ast::BasicType{ basic->kind, basic->qualifiers | type2->qualifiers };
                                 }
                         } else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( type2 ) ) {
@@ -746 +763 @@
                                 auto entry = open.find( *var );
                                 if ( entry != open.end() ) {
+                                // if (tenv.lookup(*var)) {
                                         ast::AssertionSet need, have;
                                         if ( ! tenv.bindVar(