Changeset 7042c60 for src/ResolvExpr/CommonType.cc

Timestamp:

Apr 25, 2024, 3:48:17 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

eb7586e

Parents:

cf191ac (diff), 55c97e4 (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:

resolve conflict

File:

• src/ResolvExpr/CommonType.cc (modified) (5 diffs)

src/ResolvExpr/CommonType.cc

@@ -36 +36 @@
 namespace ResolvExpr {
 
+namespace {
+
         // GENERATED START, DO NOT EDIT
         // GENERATED BY BasicTypes-gen.cc
@@ -397 +399 @@
                         }
                 } 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 +521 @@
                                                                 // 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;
 
@@ -710 +712 @@
 // size_t CommonType::traceId = Stats::Heap::new_stacktrace_id("CommonType");
 
-namespace {
-        ast::ptr< ast::Type > handleReference(
-                const ast::ptr< ast::Type > & t1, const ast::ptr< ast::Type > & t2, WidenMode widen,
-                ast::TypeEnvironment & env,
-                const ast::OpenVarSet & open
-        ) {
-                ast::ptr<ast::Type> common;
-                ast::AssertionSet have, need;
-                ast::OpenVarSet newOpen{ open };
-
-                // need unify to bind type variables
-                if ( unify( t1, t2, env, have, need, newOpen, common ) ) {
-                        ast::CV::Qualifiers q1 = t1->qualifiers, q2 = t2->qualifiers;
+ast::ptr< ast::Type > handleReference(
+        const ast::ptr< ast::Type > & t1, const ast::ptr< ast::Type > & t2, WidenMode widen,
+        ast::TypeEnvironment & env,
+        const ast::OpenVarSet & open
+) {
+        ast::ptr<ast::Type> common;
+        ast::AssertionSet have, need;
+        ast::OpenVarSet newOpen( open );
+
+        // need unify to bind type variables
+        if ( unify( t1, t2, env, have, need, newOpen, common ) ) {
+                ast::CV::Qualifiers q1 = t1->qualifiers, q2 = t2->qualifiers;
+                PRINT(
+                        std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                )
+                if ( ( widen.first || q2 <= q1 ) && ( widen.second || q1 <= q2 ) ) {
                         PRINT(
-                                std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                                std::cerr << "widen okay" << std::endl;
                         )
-                        if ( ( widen.first || q2 <= q1 ) && ( widen.second || q1 <= q2 ) ) {
-                                PRINT(
-                                        std::cerr << "widen okay" << std::endl;
-                                )
-                                add_qualifiers( common, q1 | q2 );
-                                return common;
-                        }
-                }
-
-                PRINT(
-                        std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
-                )
-                return { nullptr };
-        }
+                        add_qualifiers( common, q1 | q2 );
+                        return common;
+                }
+        }
+
+        PRINT(
+                std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+        )
+        return { nullptr };
 }
+
+} // namespace
 
 ast::ptr< ast::Type > commonType(
@@ -781 +783 @@
         }
         // otherwise both are reference types of the same depth and this is handled by the visitor
-        ast::Pass<CommonType> visitor{ type2, widen, env, open, need, have };
-        type1->accept( visitor );
-        // ast::ptr< ast::Type > result = visitor.core.result;
-
-        return visitor.core.result;
+        return ast::Pass<CommonType>::read( type1.get(),
+                type2, widen, env, open, need, have );
 }