Changeset c331406 for src/main.cc

Timestamp:

Aug 5, 2016, 11:03:04 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a2f920f

Parents:

5070fe4 (diff), 1b0020a (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 changes from master

File:

• src/main.cc (modified) (3 diffs)

src/main.cc

@@ -43 +43 @@
 #include "InitTweak/GenInit.h"
 #include "InitTweak/FixInit.h"
-#include "InitTweak/FixGlobalInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -283 +282 @@
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "fixGlobalInit" );
-                InitTweak::fixGlobalInit( translationUnit, filename, libcfap || treep );
                 OPTPRINT( "tweakInit" )
                 InitTweak::genInit( translationUnit );
@@ -305 +302 @@
                 }
 
+                // fix ObjectDecl - replaces ConstructorInit nodes
                 OPTPRINT( "fixInit" )
-                // fix ObjectDecl - replaces ConstructorInit nodes
-                InitTweak::fix( translationUnit );
+                InitTweak::fix( translationUnit, filename, libcfap || treep );
                 if ( ctorinitp ) {
                         dump ( translationUnit );