Changeset c68f6e6 for src/InitTweak/InitTweak.cc

Timestamp:

Jul 31, 2023, 4:38:35 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

07b59ec

Parents:

2e94f3e7 (diff), 17c13b9 (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/InitTweak/InitTweak.cc (modified) (2 diffs)

src/InitTweak/InitTweak.cc

@@ -891 +891 @@
                                 dst = new ast::AddressExpr(dst);
                         }
-                }
-                else {
+                } else {
                         dst = new ast::CastExpr(dst, new ast::ReferenceType(dst->result, {}));
                 }
@@ -900 +899 @@
                         }
                 }
-                return new ast::ApplicationExpr(dst->location, ast::VariableExpr::functionPointer(dst->location, assign), {dst, src});
+                auto var = ast::VariableExpr::functionPointer(dst->location, assign);
+                auto app = new ast::ApplicationExpr(dst->location, var, {dst, src});
+                // Skip the resolver, just set the result to the correct type.
+                app->result = ast::deepCopy( src->result );
+                return app;
         }