Changeset 2162c2c for src/InitTweak

Timestamp:

Jan 11, 2017, 4:11:02 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:

075734f

Parents:

bb82c03 (diff), d3a85240 (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:

• FixInit.cc (modified) (3 diffs)
• InitTweak.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -38 +38 @@
 #include "SynTree/AddStmtVisitor.h"
 #include "CodeGen/GenType.h"  // for warning/error messages
+#include "Tuples/Tuples.h"
 
 bool ctordtorp = false; // print all debug
@@ -392 +393 @@
 
                 bool ResolveCopyCtors::skipCopyConstruct( Type * type ) {
-                        return dynamic_cast< VarArgsType * >( type ) || GenPoly::getFunctionType( type );
+                        return dynamic_cast< VarArgsType * >( type ) || GenPoly::getFunctionType( type ) || Tuples::isTtype( type );
                 }
 
@@ -1099 +1100 @@
                         addDeclaration( tmp );
 
+                        // xxx - this can be TupleAssignExpr now. Need to properly handle this case.
                         ApplicationExpr * callExpr = safe_dynamic_cast< ApplicationExpr * > ( ctorExpr->get_callExpr() );
                         TypeSubstitution * env = ctorExpr->get_env();

src/InitTweak/InitTweak.cc

@@ -487 +487 @@
                 virtual void visit( UntypedValofExpr *valofExpr ) { isConstExpr = false; }
                 virtual void visit( CompoundLiteralExpr *compLitExpr ) { isConstExpr = false; }
+                virtual void visit( UntypedTupleExpr *tupleExpr ) { isConstExpr = false; }
                 virtual void visit( TupleExpr *tupleExpr ) { isConstExpr = false; }
                 virtual void visit( TupleAssignExpr *tupleExpr ) { isConstExpr = false; }