Changeset 2ad4b49

Timestamp:

Jun 4, 2018, 4:29:23 PM (7 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, with_gc

Children:

41770ed1, d885a58, f77dbc0

Parents:

1ddbf3b (diff), ee3c93d (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

Location:

src

Files:

• Common/PassVisitor.impl.h (modified) (2 diffs)
• ControlStruct/ForExprMutator.cc (modified) (1 diff)
• ControlStruct/ForExprMutator.h (modified) (2 diffs)
• Parser/ParseNode.h (modified) (1 diff)
• Parser/StatementNode.cc (modified) (4 diffs)
• ResolvExpr/Resolver.cc (modified) (3 diffs)
• SymTab/Indexer.cc (modified) (3 diffs)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)
• tests/raii/.expect/ctor-autogen-ERR1.txt (modified) (1 diff)

src/Common/PassVisitor.impl.h ¶

@@ -828 +828 @@
         VISIT_START( node );
 
-        visitExpression( node->condition );
-        node->body = visitStatement( node->body );
+        {
+                // while statements introduce a level of scope (for the initialization)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->initialization, *this );
+                visitExpression ( node->condition );
+                node->body = visitStatement( node->body );
+        }
 
         VISIT_END( node );
@@ -838 +843 @@
         MUTATE_START( node );
 
-        node->condition = mutateExpression( node->condition );
-        node->body      = mutateStatement ( node->body      );
+        {
+                // while statements introduce a level of scope (for the initialization)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeMutate_impl( node->initialization, *this );
+                node->condition = mutateExpression( node->condition );
+                node->body      = mutateStatement ( node->body      );
+        }
+
 
         MUTATE_END( Statement, node );

src/ControlStruct/ForExprMutator.cc ¶

@@ -45 +45 @@
                 return hoist( forStmt, forStmt->initialization );
         }
+        Statement *ForExprMutator::postmutate( WhileStmt *whileStmt ) {
+                return hoist( whileStmt, whileStmt->initialization );
+        }
 } // namespace ControlStruct
 

src/ControlStruct/ForExprMutator.h ¶

@@ -18 +18 @@
 class IfStmt;
 class ForStmt;
+class WhileStmt;
 class Statement;
 
@@ -25 +26 @@
                 Statement *postmutate( IfStmt * );
                 Statement *postmutate( ForStmt * );
+                Statement *postmutate( WhileStmt * );
         };
 } // namespace ControlStruct

src/Parser/ParseNode.h ¶

@@ -403 +403 @@
 };
 
+Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init );
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );

src/Parser/StatementNode.cc ¶

@@ -80 +80 @@
 }
 
-Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
-        Statement * thenb, * elseb = 0;
-        std::list< Statement * > branches;
-        buildMoveList< Statement, StatementNode >( then_stmt, branches );
-        assert( branches.size() == 1 );
-        thenb = branches.front();
-
-        if ( else_stmt ) {
-                std::list< Statement * > branches;
-                buildMoveList< Statement, StatementNode >( else_stmt, branches );
-                assert( branches.size() == 1 );
-                elseb = branches.front();
-        } // if
-
-        std::list< Statement * > init;
+Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init ) {
         if ( ctl->init != 0 ) {
                 buildMoveList( ctl->init, init );
@@ -102 +88 @@
         if ( ctl->condition ) {
                 // compare the provided condition against 0
-                cond =  notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
+                cond = notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
         } else {
                 for ( Statement * stmt : init ) {
@@ -113 +99 @@
         }
         delete ctl;
+        return cond;
+}
+
+Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
+        Statement * thenb, * elseb = 0;
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( then_stmt, branches );
+        assert( branches.size() == 1 );
+        thenb = branches.front();
+
+        if ( else_stmt ) {
+                std::list< Statement * > branches;
+                buildMoveList< Statement, StatementNode >( else_stmt, branches );
+                assert( branches.size() == 1 );
+                elseb = branches.front();
+        } // if
+
+        std::list< Statement * > init;
+        Expression * cond = build_if_control( ctl, init );
         return new IfStmt( cond, thenb, elseb, init );
 }
@@ -144 +149 @@
         buildMoveList< Statement, StatementNode >( stmt, branches );
         assert( branches.size() == 1 );
-        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), kind );
+
+        std::list< Statement * > init;
+        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), init, kind );
 }
 

src/ResolvExpr/Resolver.cc ¶

@@ -207 +207 @@
                         Alternative & choice = winners.front();
                         if ( findDeletedExpr( choice.expr ) ) {
-                                SemanticError( choice.expr, "Unique best alternative includes deleted identifier in " );
+                                SemanticError( untyped->location, choice.expr, "Unique best alternative includes deleted identifier in " );
                         }
                         alt = std::move( choice );
@@ -242 +242 @@
 
                 static CastExpr untyped( nullptr ); // cast to void
+                untyped.location = expr->location;
 
                 // set up and resolve expression cast to void
@@ -274 +275 @@
         void findSingleExpression( Expression *& untyped, Type * type, const SymTab::Indexer & indexer ) {
                 assert( untyped && type );
+                // transfer location to generated cast for error purposes
+                CodeLocation location = untyped->location;
                 untyped = new CastExpr( untyped, type );
+                untyped->location = location;
                 findSingleExpression( untyped, indexer );
                 removeExtraneousCast( untyped, indexer );

src/SymTab/Indexer.cc ¶

@@ -106 +106 @@
                 if ( ! CodeGen::isCtorDtorAssign( id ) ) return;
 
-                // helpful data structure
+                // helpful data structure to organize properties for a type
                 struct ValueType {
-                        struct DeclBall {
+                        struct DeclBall { // properties for this particular decl
                                 IdData decl;
-                                bool isUserDefinedFunc; // properties for this particular decl
-                                bool isDefaultCtor;
-                                bool isDtor;
+                                bool isUserDefinedFunc;
                                 bool isCopyFunc;
                         };
                         // properties for this type
-                        bool existsUserDefinedFunc = false;    // any user-defined function found
-                        bool existsUserDefinedCtor = false;    // any user-defined constructor found
-                        bool existsUserDefinedDtor = false;    // any user-defined destructor found
                         bool existsUserDefinedCopyFunc = false;    // user-defined copy ctor found
-                        bool existsUserDefinedDefaultCtor = false; // user-defined default ctor found
+                        BaseSyntaxNode * deleteStmt = nullptr;     // non-null if a user-defined function is found
                         std::list< DeclBall > decls;
 
@@ -127 +122 @@
                         ValueType & operator+=( IdData data ) {
                                 DeclarationWithType * function = data.id;
-                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
-                                bool isDefaultCtor = InitTweak::isDefaultConstructor( function );
-                                bool isDtor = InitTweak::isDestructor( function );
-                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
-                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
-                                existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
-                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && CodeGen::isConstructor( function->get_name() ) );
-                                existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
+                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->linkage );
+                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->name );
+                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isCopyFunc } );
                                 existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
-                                existsUserDefinedDefaultCtor = existsUserDefinedDefaultCtor || (isUserDefinedFunc && isDefaultCtor);
+                                if ( isUserDefinedFunc && ! data.deleteStmt ) {
+                                        // any user-defined function can act as an implicit delete statement for generated constructors.
+                                        // a delete stmt should not act as an implicit delete statement.
+                                        deleteStmt = data.id;
+                                }
                                 return *this;
                         }
@@ -160 +154 @@
 
                 // if a type contains user defined ctor/dtor/assign, then special rules trigger, which determine
-                // the set of ctor/dtor/assign that are seen by the requester. In particular, if the user defines
-                // a default ctor, then the generated default ctor should never be seen, likewise for copy ctor
-                // and dtor. If the user defines any ctor/dtor, then no generated field ctors should be seen.
-                // If the user defines any ctor then the generated default ctor should not be seen (intrinsic default
-                // ctor must be overridden exactly).
+                // the set of ctor/dtor/assign that can be used  by the requester. In particular, if the user defines
+                // a default ctor, then the generated default ctor is unavailable, likewise for copy ctor
+                // and dtor. If the user defines any ctor/dtor, then no generated field ctors are available.
+                // If the user defines any ctor then the generated default ctor is unavailable (intrinsic default
+                // ctor must be overridden exactly). If the user defines anything that looks like a copy constructor,
+                // then the generated copy constructor is unavailable, and likewise for the assignment operator.
                 for ( std::pair< const std::string, ValueType > & pair : funcMap ) {
                         ValueType & val = pair.second;
                         for ( ValueType::DeclBall ball : val.decls ) {
-                                bool noUserDefinedFunc = ! val.existsUserDefinedFunc;
-                                bool isUserDefinedFunc = ball.isUserDefinedFunc;
-                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl.id->linkage == LinkageSpec::Intrinsic)) && ball.isDefaultCtor; // allow default constructors only when no user-defined constructors exist, except in the case of intrinsics, which require exact overrides
-                                bool isAcceptableCopyFunc = ! val.existsUserDefinedCopyFunc && ball.isCopyFunc; // handles copy ctor and assignment operator
-                                bool isAcceptableDtor = ! val.existsUserDefinedDtor && ball.isDtor;
-                                if ( noUserDefinedFunc || isUserDefinedFunc || isAcceptableDefaultCtor || isAcceptableCopyFunc || isAcceptableDtor ) {
-                                        // decl conforms to the rules described above, so it should be seen by the requester
-                                        out.push_back( ball.decl );
+                                bool isNotUserDefinedFunc = ! ball.isUserDefinedFunc && ball.decl.id->linkage != LinkageSpec::Intrinsic;
+                                bool isCopyFunc = ball.isCopyFunc;
+                                bool existsUserDefinedCopyFunc = val.existsUserDefinedCopyFunc;
+                                // only implicitly delete non-user defined functions that are  not intrinsic, and are
+                                // not copy functions (assignment or copy constructor), unless a user-defined copy function exists.
+                                // deleteStmt will be non-null only if a user-defined function is found.
+                                if (isNotUserDefinedFunc && (! isCopyFunc || existsUserDefinedCopyFunc)) {
+                                        ball.decl.deleteStmt = val.deleteStmt;
                                 }
+                                out.push_back( ball.decl );
                         }
                 }

src/SynTree/Statement.cc ¶

@@ -243 +243 @@
 }
 
-WhileStmt::WhileStmt( Expression *condition, Statement *body, bool isDoWhile ):
-        Statement(), condition( condition), body( body), isDoWhile( isDoWhile) {
+WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
+        Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
 }
 

src/SynTree/Statement.h ¶

@@ -220 +220 @@
         Expression *condition;
         Statement *body;
+        std::list<Statement *> initialization;
         bool isDoWhile;
 
         WhileStmt( Expression *condition,
-               Statement *body, bool isDoWhile = false );
+               Statement *body, std::list<Statement *> & initialization, bool isDoWhile = false );
         WhileStmt( const WhileStmt &other );
         virtual ~WhileStmt();

src/tests/raii/.expect/ctor-autogen-ERR1.txt ¶

@@ -1 @@
-raii/ctor-autogen.c:102:1 error: No reasonable alternatives for expression Applying untyped: 
-  Name: ?{}
-...to: 
-  Cast of:
-    Variable Expression: x: instance of struct Managed with body 1 
-  ... to:
-    reference to instance of struct Managed with body 1 
-  constant expression (123 123: signed int)
+raii/ctor-autogen.c:102:1 error: Unique best alternative includes deleted identifier in Cast of:
+  Application of
+    Deleted Expression
+      Variable Expression: ?{}: static inline function
+      ... with parameters
+        _dst: reference to instance of struct Managed with body 1 
+        x: signed int
+      ... returning nothing 
 
+      ... deleted by: ?{}: function
+      ... with parameters
+        m: reference to instance of struct Managed with body 1 
+      ... returning nothing 
+      ... with body 
+        CompoundStmt
+          Expression Statement:
+            Application of
+              Variable Expression: ?=?: function
+              ... with parameters
+                intrinsic reference to signed int
+                intrinsic signed int
+              ... returning 
+                _retval__operator_assign: signed int
+                ... with attributes: 
+                  Attribute with name: unused
+
+
+            ... to arguments
+              Cast of:
+                Member Expression, with field: 
+                  x: signed int
+                ... from aggregate: 
+                  Cast of:
+                    Variable Expression: m: reference to instance of struct Managed with body 1 
+                  ... to:
+                    instance of struct Managed with body 1 
+              ... to:
+                reference to signed int
+              Cast of:
+                constant expression (0 0: zero_t)
+              ... to:
+                signed int
+
+            ... with environment:
+              Types:
+              Non-types:
+
+
+  ... to arguments
+    Cast of:
+      Variable Expression: x: instance of struct Managed with body 1 
+    ... to:
+      reference to instance of struct Managed with body 1 
+    constant expression (123 123: signed int)
+
+... to: nothing