Changes in src/InitTweak/FixInit.cc [31f379c:627f585]

File:

• src/InitTweak/FixInit.cc (modified) (4 diffs)

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
@@ -346 +347 @@
 
                         if ( VariableExpr * function = dynamic_cast< VariableExpr * > ( appExpr->get_function() ) ) {
-                                if ( function->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
+                                if ( LinkageSpec::isBuiltin( function->get_var()->get_linkage() ) ) {
                                         // optimization: don't need to copy construct in order to call intrinsic functions
                                         return appExpr;
@@ -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();