Changeset add7117 for src/InitTweak/FixInit.cc

Timestamp:

Sep 10, 2016, 11:08:47 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

5af62f1

Parents:

f5e81d1 (diff), 03e3117 (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 tuples

Conflicts:

src/ResolvExpr/AlternativeFinder.cc
src/ResolvExpr/AlternativeFinder.h

File:

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

src/InitTweak/FixInit.cc

@@ -33 +33 @@
 #include "SymTab/Autogen.h"
 #include "GenPoly/PolyMutator.h"
+#include "GenPoly/DeclMutator.h"
 #include "SynTree/AddStmtVisitor.h"
 #include "CodeGen/GenType.h"  // for warnings
@@ -216 +217 @@
                         SymTab::Indexer & indexer;
                 };
+
+                class FixCtorExprs : public GenPoly::DeclMutator {
+                  public:
+                        /// expands ConstructorExpr nodes into comma expressions, using a temporary for the first argument
+                        static void fix( std::list< Declaration * > & translationUnit );
+
+                        virtual Expression * mutate( ConstructorExpr * ctorExpr );
+                };
         } // namespace
 
@@ -221 +230 @@
                 // fixes ConstructorInit for global variables. should happen before fixInitializers.
                 InitTweak::fixGlobalInit( translationUnit, filename, inLibrary );
+
 
                 InsertImplicitCalls::insert( translationUnit );
@@ -231 +241 @@
 
                 GenStructMemberCalls::generate( translationUnit );
+                // xxx - ctor expansion currently has to be after FixCopyCtors, because there is currently a
+                // hack in the way untyped assignments are generated, where the first argument cannot have
+                // its address taken because of the way codegeneration handles UntypedExpr vs. ApplicationExpr.
+                // Thus such assignment exprs must never pushed through expression resolution (and thus should
+                // not go through the FixCopyCtors pass), otherwise they will fail -- guaranteed.
+                // Also needs to happen after GenStructMemberCalls, since otherwise member constructors exprs
+                // don't look right, and a member can be constructed more than once.
+                FixCtorExprs::fix( translationUnit );
         }
 
@@ -283 +301 @@
                                 throw warner.errors;
                         }
+                }
+
+                void FixCtorExprs::fix( std::list< Declaration * > & translationUnit ) {
+                        FixCtorExprs fixer;
+                        fixer.mutateDeclarationList( translationUnit );
                 }
 
@@ -480 +503 @@
                                         retExpr = deref;
                                 } // if
-                                // xxx - might need to set env on retExpr...
-                                // retExpr->set_env( env->clone() );
+                                retExpr->set_env( env->clone() );
                                 return retExpr;
                         } else {
@@ -914 +936 @@
                         return safe_dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untypedExpr, indexer ) );
                 }
+
+                Expression * FixCtorExprs::mutate( ConstructorExpr * ctorExpr ) {
+                        static UniqueName tempNamer( "_tmp_ctor_expr" );
+                        assert( ctorExpr->get_results().size() == 1 );
+                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_results().front()->clone(), nullptr );
+                        addDeclaration( tmp );
+
+                        ApplicationExpr * callExpr = safe_dynamic_cast< ApplicationExpr * > ( ctorExpr->get_callExpr() );
+                        TypeSubstitution * env = ctorExpr->get_env();
+                        ctorExpr->set_callExpr( nullptr );
+                        ctorExpr->set_env( nullptr );
+
+                        Expression *& firstArg = callExpr->get_args().front();
+                        UntypedExpr * assign = new UntypedExpr( new NameExpr( "?=?" ) );
+                        assign->get_args().push_back( new VariableExpr( tmp ) );
+                        assign->get_args().push_back( firstArg );
+                        cloneAll( ctorExpr->get_results(), assign->get_results() );
+                        firstArg = assign;
+
+                        CommaExpr * commaExpr = new CommaExpr( callExpr, new VariableExpr( tmp ) );
+                        commaExpr->set_env( env );
+                        delete ctorExpr;
+                        return commaExpr;
+                }
         } // namespace
 } // namespace InitTweak