Changeset 6cf27a07 for src/main.cc

Timestamp:

Jul 21, 2016, 2:07:01 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

ccb447e

Parents:

b81adcc4

Message:

reorganize global init so that it is simpler and generates less unnecessary code

File:

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

src/main.cc

@@ -42 +42 @@
 #include "InitTweak/GenInit.h"
 #include "InitTweak/FixInit.h"
-#include "InitTweak/FixGlobalInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -282 +281 @@
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "fixGlobalInit" );
-                InitTweak::fixGlobalInit( translationUnit, filename, libcfap || treep );
                 OPTPRINT( "tweakInit" )
                 InitTweak::genInit( translationUnit );
@@ -304 +301 @@
                 }
 
+                // 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 );