Changeset 01d433e

Timestamp:

Aug 18, 2021, 1:15:22 PM (4 years ago)

Author:

Henry Xue <y58xue@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

bb9924c

Parents:

6d63c14

Message:

Convert expandUniqueExpr pass to use new AST (NOT WORKING)

Currently not working due to unresolved issues with UniqueExpr?. See
page 5 of https://cforall.uwaterloo.ca/doc/Fangren_Yu_Report_S20.pdf
for more details.

Location:

src

Files:

• Tuples/TupleExpansionNew.cpp (added)
• Tuples/Tuples.h (modified) (1 diff)
• Tuples/module.mk (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/Tuples/Tuples.h ¶

@@ -45 +45 @@
         /// replaces UniqueExprs with a temporary variable and one call
         void expandUniqueExpr( std::list< Declaration * > & translationUnit );
+        void expandUniqueExpr( ast::TranslationUnit & translationUnit );
 
         /// returns VoidType if any of the expressions have Voidtype, otherwise TupleType of the Expression result types

src/Tuples/module.mk ¶

@@ -20 +20 @@
         Tuples/TupleAssignment.cc \
         Tuples/TupleExpansion.cc \
+        Tuples/TupleExpansionNew.cpp \
         Tuples/Tuples.cc \
         Tuples/Tuples.h

src/main.cc ¶

@@ -374 +374 @@
 
                         PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
+
+                        // fix ObjectDecl - replaces ConstructorInit nodes
+                        if ( ctorinitp ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        // Currently not working due to unresolved issues with UniqueExpr
+                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
                         translationUnit = convert( move( transUnit ) );
                 } else {
@@ -383 +392 @@
 
                         PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
+
+                        // fix ObjectDecl - replaces ConstructorInit nodes
+                        if ( ctorinitp ) {
+                                dump ( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
                 }
-
-                // fix ObjectDecl - replaces ConstructorInit nodes
-                if ( ctorinitp ) {
-                        dump ( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
 
                 PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );