Changes in src/InitTweak/GenInit.cc [c6976ba:9ff56e7]

File:

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

src/InitTweak/GenInit.cc

@@ -54 +54 @@
 
           protected:
-                FunctionType * ftype = nullptr;
+                FunctionType * ftype;
                 std::string funcName;
         };
@@ -71 +71 @@
                 // that need to be constructed or destructed
                 void previsit( StructDecl *aggregateDecl );
-                void previsit( UnionDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( EnumDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( TraitDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( TypeDecl *typeDecl ) { visit_children = false; }
-                void previsit( TypedefDecl *typeDecl ) { visit_children = false; }
-
-                void previsit( FunctionType *funcType ) { visit_children = false; }
+                void previsit( __attribute__((unused)) UnionDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) EnumDecl     * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TraitDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TypeDecl     * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) TypedefDecl  * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) FunctionType * funcType )      { visit_children = false; }
 
                 void previsit( CompoundStmt * compoundStmt );
@@ -138 +137 @@
                 std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
-                // hands off if the function returns a reference - we don't want to allocate a temporary if a variable's address
+                // hands off if the function returns an lvalue - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                if ( returnStmt->get_expr() && returnVals.size() == 1 && ! dynamic_cast< ReferenceType * >( returnVals.front()->get_type() ) ) {
+                if ( returnStmt->get_expr() && returnVals.size() == 1 && ! returnVals.front()->get_type()->get_lvalue() ) {
                         // 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() );
-
-                        stmtsToAddBefore.push_back( genCtorDtor( "?{}", dynamic_cast< ObjectDecl *>( returnVals.front() ), returnStmt->get_expr() ) );
+                        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));
 
                         // return the retVal object
@@ -211 +212 @@
 
         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() );
@@ -239 +238 @@
                         std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
                         assert( ! params.empty() );
-                        Type * type = InitTweak::getPointerBase( params.front()->get_type() );
-                        assert( type );
-                        managedTypes.insert( SymTab::Mangler::mangle( type ) );
+                        PointerType * type = safe_dynamic_cast< PointerType * >( params.front()->get_type() );
+                        managedTypes.insert( SymTab::Mangler::mangle( type->get_base() ) );
                 }
         }
@@ -337 +335 @@
         }
 
-        void CtorDtor::previsit( CompoundStmt * compoundStmt ) {
+        void CtorDtor::previsit( __attribute__((unused)) CompoundStmt * compoundStmt ) {
                 GuardScope( managedTypes );
         }