Changeset 4c03e63 for src/InitTweak

Timestamp:

Jun 23, 2017, 4:20:33 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

74e58ea3, 7bbba76

Parents:

e1c1829 (diff), 88177cf (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

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (1 diff)
• FixInit.cc (modified) (7 diffs)
• GenInit.cc (modified) (2 diffs)
• InitTweak.cc (modified) (1 diff)

src/InitTweak/FixGlobalInit.cc

@@ -26 +26 @@
 
 namespace InitTweak {
-        namespace {
-                const std::list<Label> noLabels;
-        }
-
         class GlobalFixer : public Visitor {
           public:

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:13:47 2017
-// Update Count     : 71
+// Last Modified On : Wed Jun 21 17:35:05 2017
+// Update Count     : 74
 //
 
@@ -56 +56 @@
                 typedef std::unordered_map< int, int > UnqCount;
 
-                class InsertImplicitCalls {
+                class InsertImplicitCalls : public WithTypeSubstitution {
                 public:
                         /// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
@@ -69 +69 @@
                         // collects environments for relevant nodes
                         EnvMap & envMap;
-                        TypeSubstitution * env; //Magically populated by the PassVisitor
                 };
 
@@ -192 +191 @@
                 };
 
-                class FixInit {
+                class FixInit : public WithStmtsToAdd {
                   public:
                         /// expand each object declaration to use its constructor after it is declared.
@@ -200 +199 @@
 
                         std::list< Declaration * > staticDtorDecls;
-                        std::list< Statement * > stmtsToAddAfter; // found by PassVisitor
                 };
 
@@ -726 +724 @@
                                                 // static bool __objName_uninitialized = true
                                                 BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
-                                                SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ), noDesignators );
+                                                SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant::from_int( 1 ) ), noDesignators );
                                                 ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
                                                 isUninitializedVar->fixUniqueId();
@@ -733 +731 @@
                                                 UntypedExpr * setTrue = new UntypedExpr( new NameExpr( "?=?" ) );
                                                 setTrue->get_args().push_back( new VariableExpr( isUninitializedVar ) );
-                                                setTrue->get_args().push_back( new ConstantExpr( Constant( boolType->clone(), "0" ) ) );
+                                                setTrue->get_args().push_back( new ConstantExpr( Constant::from_int( 0 ) ) );
 
                                                 // generate body of if

src/InitTweak/GenInit.cc

@@ -21 +21 @@
 
 #include "Common/PassVisitor.h"
+
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
+#include "GenPoly/ScopedSet.h"
+
+#include "ResolvExpr/typeops.h"
 
 #include "SynTree/Declaration.h"
@@ -31 +37 @@
 #include "SymTab/Autogen.h"
 #include "SymTab/Mangler.h"
-
-#include "GenPoly/DeclMutator.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/ScopedSet.h"
-
-#include "ResolvExpr/typeops.h"
 
 namespace InitTweak {

src/InitTweak/InitTweak.cc

@@ -474 +474 @@
         public:
                 ConstExprChecker() : isConstExpr( true ) {}
+
+                using Visitor::visit;
 
                 virtual void visit( __attribute((unused)) ApplicationExpr *applicationExpr ) { isConstExpr = false; }