Changeset d63eeb0 for src/InitTweak

Timestamp:

Feb 9, 2016, 3:25:05 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, gc_noraii, 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:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

Location:

src/InitTweak

Files:

• BasicInit.cc (modified) (1 diff)
• DeclarationHoister.cc (modified) (1 diff)
• InitExpander.cc (modified) (1 diff)
• InitExpander.h (modified) (1 diff)
• InitModel.h (modified) (2 diffs)
• RemoveInit.cc (modified) (2 diffs)

src/InitTweak/BasicInit.cc

@@ -20 +20 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 
 #include "SynTree/Type.h"

src/InitTweak/DeclarationHoister.cc

@@ -20 +20 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 
 #include "SynTree/Statement.h"

src/InitTweak/InitExpander.cc

@@ -19 +19 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "InitExpander.h"
 #include "InitModel.h"

src/InitTweak/InitExpander.h

@@ -19 +19 @@
 #include <string>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "SynTree/Mutator.h"
 #include "SymTab/Indexer.h"

src/InitTweak/InitModel.h

@@ -18 +18 @@
 
 #include "Association.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 #include "SynTree/Visitor.h"
 
@@ -73 +73 @@
                         void visit( SizeofExpr * ) { throw 0; }
                         void visit( AlignofExpr * ) { throw 0; }
+                        void visit( UntypedOffsetofExpr * ) { throw 0; }
+                        void visit( OffsetofExpr * ) { throw 0; }
                         void visit( AttrExpr * ) { throw 0; }
                         void visit( LogicalExpr * ) { throw 0; }

src/InitTweak/RemoveInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jan 19 11:12:49 2016
-// Update Count     : 165
+// Last Modified On : Tue Feb 09 15:12:29 2016
+// Update Count     : 166
 //
 
@@ -223 +223 @@
                 std::list< Statement * > &statements = ret->get_kids();
                 if ( ! destructorStmts.empty() ) {
+                        // TODO: adding to the end of a block isn't sufficient, since
+                        // return/break/goto should trigger destructor when block is left.
                         statements.splice( statements.end(), destructorStmts );
                 } // if