Changeset 2a301ff for src/Validate/Autogen.cpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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/Validate/Autogen.cpp (modified) (1 diff)

src/Validate/Autogen.cpp

@@ -532 +532 @@
                 )
         );
-        return genImplicitCall(
+        auto stmt = genImplicitCall(
                 srcParam, dstSelect, location, func->name,
                 field, direction
         );
+        // This could return the above directly, except the generated code is
+        // built using the structure's members and that means all the scoped
+        // names (the forall parameters) are incorrect. This corrects them.
+        if ( stmt && !decl->params.empty() ) {
+                ast::DeclReplacer::TypeMap oldToNew;
+                for ( auto pair : group_iterate( decl->params, func->type_params ) ) {
+                        oldToNew.emplace( std::get<0>(pair), std::get<1>(pair) );
+                }
+                auto node = ast::DeclReplacer::replace( stmt, oldToNew );
+                stmt = strict_dynamic_cast<const ast::Stmt *>( node );
+        }
+        return stmt;
 }