Changeset 2a301ff for src/main.cc

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/main.cc (modified) (3 diffs)

src/main.cc

@@ -334 +334 @@
                 PASS( "Link Reference To Types", Validate::linkReferenceToTypes, transUnit );
 
+                PASS( "Forall Pointer Decay", Validate::decayForallPointers, transUnit );
                 PASS( "Fix Qualified Types", Validate::fixQualifiedTypes, transUnit );
                 PASS( "Eliminate Typedef", Validate::eliminateTypedef, transUnit );
@@ -342 +343 @@
                 PASS( "Fix Return Statements", InitTweak::fixReturnStatements, transUnit );
                 PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords, transUnit );
-                PASS( "Forall Pointer Decay", Validate::decayForallPointers, transUnit );
-        PASS( "Implement Waituntil", Concurrency::generateWaitUntil, transUnit  );
+                PASS( "Fix Unique Ids", Validate::fixUniqueIds, transUnit );
                 PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls, transUnit );
 
@@ -370 +370 @@
                 PASS( "Translate Throws", ControlStruct::translateThrows, transUnit );
                 PASS( "Fix Labels", ControlStruct::fixLabels, transUnit );
+                PASS( "Implement Waituntil", Concurrency::generateWaitUntil, transUnit  );
                 PASS( "Fix Names", CodeGen::fixNames, transUnit );
                 PASS( "Gen Init", InitTweak::genInit, transUnit );