Changes in src/InitTweak/FixInit.cc [0a81c3f:62423350]

File:

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

src/InitTweak/FixInit.cc

@@ -364 +364 @@
                                         assert( ftype );
                                         if ( isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
-                                                Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
+                                                Type * t1 = ftype->get_parameters().front()->get_type();
                                                 Type * t2 = ftype->get_parameters().back()->get_type();
-                                                assert( t1 );
-
-                                                if ( ResolvExpr::typesCompatible( t1, t2, SymTab::Indexer() ) ) {
+                                                PointerType * ptrType = safe_dynamic_cast< PointerType * > ( t1 );
+
+                                                if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
                                                         // optimization: don't need to copy construct in order to call a copy constructor
                                                         return appExpr;
@@ -401 +401 @@
 
                 bool ResolveCopyCtors::skipCopyConstruct( Type * type ) {
-                        return dynamic_cast< VarArgsType * >( type ) || dynamic_cast< ReferenceType * >( type ) || GenPoly::getFunctionType( type ) || Tuples::isTtype( type );
+                        return dynamic_cast< VarArgsType * >( type ) || GenPoly::getFunctionType( type ) || Tuples::isTtype( type );
                 }
 
@@ -489 +489 @@
                                 impCpCtorExpr->get_returnDecls().push_back( ret );
                                 CP_CTOR_PRINT( std::cerr << "makeCtorDtor for a return" << std::endl; )
-                                if ( ! dynamic_cast< ReferenceType * >( result ) ) {
+                                if ( ! result->get_lvalue() ) {
                                         // destructing lvalue returns is bad because it can cause multiple destructor calls to the same object - the returned object is not a temporary
                                         destructRet( ret, impCpCtorExpr );
@@ -997 +997 @@
                                 assert( ! type->get_parameters().empty() );
                                 thisParam = safe_dynamic_cast< ObjectDecl * >( type->get_parameters().front() );
-                                Type * thisType = getPointerBase( thisParam->get_type() );
-                                StructInstType * structType = dynamic_cast< StructInstType * >( thisType );
+                                PointerType * ptrType = safe_dynamic_cast< PointerType * > ( thisParam->get_type() );
+                                StructInstType * structType = dynamic_cast< StructInstType * >( ptrType->get_base() );
                                 if ( structType ) {
                                         structDecl = structType->get_baseStruct();
@@ -1046 +1046 @@
                                         // insert and resolve default/copy constructor call for each field that's unhandled
                                         std::list< Statement * > stmt;
+                                        UntypedExpr * deref = UntypedExpr::createDeref( new VariableExpr( thisParam ) );
+
                                         Expression * arg2 = 0;
                                         if ( isCopyConstructor( function ) ) {
@@ -1054 +1056 @@
                                         }
                                         InitExpander srcParam( arg2 );
-                                        SymTab::genImplicitCall( srcParam, new MemberExpr( field, new VariableExpr( thisParam ) ), function->get_name(), back_inserter( stmt ), field, isCtor );
+                                        SymTab::genImplicitCall( srcParam, new MemberExpr( field, deref ), function->get_name(), back_inserter( stmt ), field, isCtor );
 
                                         assert( stmt.size() <= 1 );