Changeset c7f834e

Timestamp:

Jun 18, 2020, 4:56:20 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

1cf2a9b

Parents:

d2de1be9

Message:

fix destructed return value in TypeSubstitution?

Location:

src

Files:

• AST/TypeSubstitution.hpp (modified) (1 diff)
• ResolvExpr/Unify.cc (modified) (1 diff)

src/AST/TypeSubstitution.hpp

@@ -46 +46 @@
         template< typename SynTreeClass >
         struct ApplyResult {
-                const SynTreeClass * node;
+                // const SynTreeClass * node;
+                ast::ptr<SynTreeClass> node;
                 int count;
         };

src/ResolvExpr/Unify.cc

@@ -170 +170 @@
                 ast::ptr< ast::Type > t2_(newSecond);
 
+                ast::ptr< ast::Type > subFirst = env.apply(newFirst).node;
+                ast::ptr< ast::Type > subSecond = env.apply(newSecond).node;
+
                 return unifyExact(
-                        env.apply( newFirst  ).node,
-                        env.apply( newSecond ).node,
+                        subFirst,
+                        subSecond,
                         newEnv, need, have, open, noWiden(), symtab );
         }