Changeset a065f1f for src/GenPoly

Timestamp:

Sep 20, 2022, 8:37:17 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct

Children:

53a768d

Parents:

4520b77e (diff), ef1da0e2 (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

Location:

src/GenPoly

Files:

• InstantiateGenericNew.cpp (modified) (3 diffs)
• Lvalue2.cc (modified) (1 diff)

src/GenPoly/InstantiateGenericNew.cpp

@@ -22 +22 @@
 
 #include "AST/Copy.hpp"                // for deepCopy
+#include "AST/Create.hpp"              // for asForward
 #include "AST/Pass.hpp"                // for Pass, WithGuard, WithShortCi...
 #include "AST/TranslationUnit.hpp"     // for TranslationUnit
@@ -255 +256 @@
 void stripInstParams( ast::BaseInstType * inst ) {
         inst->params.clear();
-}
-
-// TODO: I think this should become a generic helper.
-template<typename Aggr>
-Aggr * asForward( Aggr const * decl ) {
-        if ( !decl->body ) {
-                return nullptr;
-        }
-        Aggr * mut = ast::deepCopy( decl );
-        mut->body = false;
-        mut->members.clear();
-        return mut;
 }
 
@@ -553 +542 @@
                         // Forward declare before recursion. (TODO: Only when needed, #199.)
                         insert( inst, typeSubs, newDecl );
-                        if ( AggrDecl const * forwardDecl = asForward( newDecl ) ) {
+                        if ( AggrDecl const * forwardDecl = ast::asForward( newDecl ) ) {
                                 declsToAddBefore.push_back( forwardDecl );
                         }

src/GenPoly/Lvalue2.cc

@@ -23 +23 @@
 }
 
-
 }