Changeset d672350 for src/main.cc

Timestamp:

Mar 21, 2022, 1:44:06 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

a76202d

Parents:

ef3c383 (diff), dbe2533 (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/main.cc (modified) (5 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jan 26 14:09:00 2022
-// Update Count     : 670
+// Last Modified On : Fri Mar 11 10:39:00 2022
+// Update Count     : 671
 //
 
@@ -76 +76 @@
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
+#include "Validate/ForallPointerDecay.hpp"  // for decayForallPointers
 #include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
@@ -331 +332 @@
 
                 if( useNewAST ) {
-                        PASS( "Apply Concurrent Keywords", Concurrency::applyKeywords( translationUnit ) );
-                        PASS( "Forall Pointer Decay", SymTab::decayForallPointers( translationUnit ) );
                         CodeTools::fillLocations( translationUnit );
 
@@ -342 +341 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords( transUnit ) );
+
+                        // Must be after implement concurrent keywords; because uniqueIds
+                        //   must be set on declaration before resolution.
+                        // Must happen before autogen routines are added.
+                        PASS( "Forall Pointer Decay", Validate::decayForallPointers( transUnit ) );
 
                         // Must happen before autogen routines are added.
@@ -487 +493 @@
                         PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );
                 }
-
-                
 
                 PASS( "Gen Waitfor" , Concurrency::generateWaitFor( translationUnit ) );