Changeset 9d6317f

Timestamp:

Jan 22, 2020, 3:40:27 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

69e398f

Parents:

5518719

Message:

Added checks for returning from a finally clause. And breaking from a nested function.

Files:

• src/ControlStruct/LabelFixer.cc (modified) (1 diff)
• src/ControlStruct/MLEMutator.cc (modified) (3 diffs)
• src/ControlStruct/MLEMutator.h (modified) (4 diffs)
• tests/.expect/except-finally-error.txt (modified) (1 diff)
• tests/except-finally-error.cfa (modified) (1 diff)

src/ControlStruct/LabelFixer.cc

@@ -45 +45 @@
         void LabelFixer::postvisit( FunctionDecl * functionDecl ) {
                 PassVisitor<MultiLevelExitMutator> mlem( resolveJumps(), generator );
-                functionDecl->acceptMutator( mlem );
+                // We start in the body so we can stop when we hit another FunctionDecl.
+                maybeMutate( functionDecl->statements, mlem );
         }
 

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jan 21 10:33:00 2020
-// Update Count     : 222
+// Last Modified On : Wed Jan 22 11:50:00 2020
+// Update Count     : 223
 //
 
@@ -60 +60 @@
                 }
         } // namespace
+
+        void MultiLevelExitMutator::premutate( FunctionDecl * ) {
+                visit_children = false;
+        }
 
         // break labels have to come after the statement they break out of, so mutate a statement, then if they inform us
@@ -352 +356 @@
                 });
                 enclosingControlStructures = std::list<Entry>();
+                GuardValue( inFinally );
+                inFinally = true;
+        }
+
+        void MultiLevelExitMutator::premutate( ReturnStmt *returnStmt ) {
+                if ( inFinally ) {
+                        SemanticError( returnStmt->location, "'return' may not appear in a finally clause" );
+                }
         }
 

src/ControlStruct/MLEMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jan 21 10:33:00 2020
-// Update Count     : 47
+// Last Modified On : Wed Jan 22 11:50:00 2020
+// Update Count     : 48
 //
 
@@ -38 +38 @@
                 ~MultiLevelExitMutator();
 
+                void premutate( FunctionDecl * );
+
                 void premutate( CompoundStmt *cmpndStmt );
                 Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException );
@@ -49 +51 @@
                 void premutate( SwitchStmt *switchStmt );
                 Statement * postmutate( SwitchStmt *switchStmt );
+                void premutate( ReturnStmt *returnStmt );
                 void premutate( TryStmt *tryStmt );
                 Statement * postmutate( TryStmt *tryStmt );
@@ -113 +116 @@
                 Label breakLabel;
                 LabelGenerator *generator;
+                bool inFinally = false;
 
                 template< typename LoopClass >

tests/.expect/except-finally-error.txt

@@ -11 +11 @@
 except-finally-error.cfa:111:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
 except-finally-error.cfa:124:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
+except-finally-error.cfa:133:1 error: 'return' may not appear in a finally clause
+except-finally-error.cfa:139:1 error: 'return' may not appear in a finally clause
+except-finally-error.cfa:148:1 error: 'break' outside a loop, 'switch', or labelled block

tests/except-finally-error.cfa

@@ -142 +142 @@
 }
 
+// Checked in the same place, make sure it does't break.
+void break_in_function() {
+        while (true) {
+                void inner() {
+                        break;
+                }
+        }
+}
+
 void main() {
         // Should not compile.