Changeset fea7ca7 for src/InitTweak

Timestamp:

Apr 29, 2016, 12:26:50 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:

d8ba086

Parents:

a0fdbd5

Message:

Account for lvalue returning functions in FixCopyCtor?, removed ConditionalExpr?, CommaExpr?, Logical Expr mutates from Specialize, added before box debug flag

File:

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

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 12:25:14 2016
+// Last Modified On : Fri Apr 29 12:25:40 2016
 // Update Count     : 30
 //
@@ -231 +231 @@
                 callExpr->set_env( impCpCtorExpr->get_env()->clone() );
                 for ( Type * result : appExpr->get_results() ) {
-                        ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result->clone(), 0 );
+                        result = result->clone();
+                        impCpCtorExpr->get_env()->apply( result );
+                        ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
                         ret->get_type()->set_isConst( false );
                         impCpCtorExpr->get_returnDecls().push_back( ret );
@@ -285 +287 @@
                         // add that onto the assignment expression so that later steps have the necessary information
                         assign->add_result( returnDecl->get_type()->clone() );
-                        // return new CommaExpr( assign, new VariableExpr( returnDecl ) );
-                        return assign;
+
+                        Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
+                        if ( callExpr->get_results().front()->get_isLvalue() ) {
+                                // lvalue returning functions are funny. Lvalue.cc inserts a *? in front of any
+                                // lvalue returning non-intrinsic function. Add an AddressExpr to the call to negate
+                                // the derefence and change the type of the return temporary from T to T* to properly
+                                // capture the return value. Then dereference the result of the comma expression, since
+                                // the lvalue returning call was originally wrapped with an AddressExpr.
+                                // Effectively, this turns
+                                //   lvalue T f();
+                                //   &*f()
+                                // into
+                                //   T * tmp_cp_retN;
+                                //   tmp_cp_ret_N = &*(tmp_cp_ret_N = &*f(), tmp_cp_ret);
+                                // which work out in terms of types, but is pretty messy. It would be nice to find a better way.
+                                assign->get_args().back() = new AddressExpr( assign->get_args().back() );
+
+                                Type * resultType = returnDecl->get_type()->clone();
+                                returnDecl->set_type( new PointerType( Type::Qualifiers(), returnDecl->get_type() ) );
+                                UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
+                                deref->get_args().push_back( retExpr );
+                                deref->add_result( resultType );
+                                retExpr = deref;
+                        }
+                        return retExpr;
                 } else {
                         return callExpr;