Changeset e67a82d for src/ResolvExpr/CommonType.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

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

src/ResolvExpr/CommonType.cc

@@ -666 +666 @@
                 const ast::OpenVarSet & open;
         public:
+                static size_t traceId;
                 ast::ptr< ast::Type > result;
 
@@ -893 +894 @@
         };
 
+        // size_t CommonType_new::traceId = Stats::Heap::new_stacktrace_id("CommonType_new");
         namespace {
                 ast::ptr< ast::Type > handleReference(
@@ -939 +941 @@
                         ast::ptr< ast::Type > result;
                         const ast::ReferenceType * ref1 = type1.as< ast::ReferenceType >();
-                        const ast::ReferenceType * ref2 = type1.as< ast::ReferenceType >();
+                        const ast::ReferenceType * ref2 = type2.as< ast::ReferenceType >();
 
                         if ( depth1 > depth2 ) {
@@ -966 +968 @@
                 ast::Pass<CommonType_new> visitor{ type2, widen, symtab, env, open };
                 type1->accept( visitor );
-                ast::ptr< ast::Type > result = visitor.pass.result;
+                ast::ptr< ast::Type > result = visitor.core.result;
 
                 // handling for opaque type declarations (?)