Changeset b3b2077 for src/InitTweak/FixInit.cc

Timestamp:

Nov 9, 2016, 2:05:09 PM (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:

23bb1b9

Parents:

8780e30

Message:

refactor some code that generates dereference and assignment calls

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -509 +509 @@
                                         // an AddressExpr.  Effectively, this turns
                                         //   lvalue T f();
-                                        //   &*f()
+                                        //   &*f();
                                         // into
+                                        //   T * f();
                                         //   T * tmp_cp_retN;
-                                        //   tmp_cp_ret_N = &*(tmp_cp_ret_N = &*f(), tmp_cp_ret);
+                                        //   &*(tmp_cp_retN = &*f(), tmp_cp_retN);              // the first * and second & are generated here
                                         // 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->set_result( resultType );
-                                        retExpr = deref;
+                                        retExpr->set_result( new PointerType( Type::Qualifiers(), retExpr->get_result() ) );
+                                        retExpr = UntypedExpr::createDeref( retExpr );
                                 } // if
                                 retExpr->set_env( env->clone() );