Changeset 6b224a52 for src/InitTweak/GenInit.cc

Timestamp:

Aug 25, 2017, 12:11:53 PM (8 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:

bf7b9da7

Parents:

135b431 (diff), f676b84 (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

File:

• src/InitTweak/GenInit.cc (modified) (5 diffs)

src/InitTweak/GenInit.cc

@@ -21 +21 @@
 #include <list>                    // for _List_iterator, list
 
+#include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"    // for PassVisitor, WithGuards, WithShort...
 #include "Common/SemanticError.h"  // for SemanticError
@@ -57 +58 @@
 
           protected:
-                FunctionType * ftype;
+                FunctionType * ftype = nullptr;
                 std::string funcName;
         };
@@ -140 +141 @@
                 std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
-                // hands off if the function returns an lvalue - we don't want to allocate a temporary if a variable's address
+                // hands off if the function returns a reference - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                if ( returnStmt->get_expr() && returnVals.size() == 1 && ! returnVals.front()->get_type()->get_lvalue() ) {
+                if ( returnStmt->get_expr() && returnVals.size() == 1 && ! dynamic_cast< ReferenceType * >( returnVals.front()->get_type() ) ) {
                         // explicitly construct the return value using the return expression and the retVal object
                         assertf( returnVals.front()->get_name() != "", "Function %s has unnamed return value\n", funcName.c_str() );
-                        UntypedExpr *construct = new UntypedExpr( new NameExpr( "?{}" ) );
-                        construct->get_args().push_back( new AddressExpr( new VariableExpr( returnVals.front() ) ) );
-                        construct->get_args().push_back( returnStmt->get_expr() );
-                        stmtsToAddBefore.push_back(new ExprStmt(noLabels, construct));
+
+                        stmtsToAddBefore.push_back( genCtorDtor( "?{}", dynamic_cast< ObjectDecl *>( returnVals.front() ), returnStmt->get_expr() ) );
 
                         // return the retVal object
@@ -215 +214 @@
 
         bool CtorDtor::isManaged( Type * type ) const {
+                // at least for now, references are never constructed
+                if ( dynamic_cast< ReferenceType * >( type ) ) return false;
                 // need to clear and reset qualifiers when determining if a type is managed
                 ValueGuard< Type::Qualifiers > qualifiers( type->get_qualifiers() );
@@ -238 +239 @@
         void CtorDtor::handleDWT( DeclarationWithType * dwt ) {
                 // if this function is a user-defined constructor or destructor, mark down the type as "managed"
-                if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && isCtorDtor( dwt->get_name() ) ) {
+                if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && CodeGen::isCtorDtor( dwt->get_name() ) ) {
                         std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
                         assert( ! params.empty() );
-                        PointerType * type = safe_dynamic_cast< PointerType * >( params.front()->get_type() );
-                        managedTypes.insert( SymTab::Mangler::mangle( type->get_base() ) );
+                        Type * type = InitTweak::getPointerBase( params.front()->get_type() );
+                        assert( type );
+                        managedTypes.insert( SymTab::Mangler::mangle( type ) );
                 }
         }