Changeset 7f9968a

Timestamp:

Jun 24, 2020, 12:30:42 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

8b58bae

Parents:

a8a3485

Message:

Fixed a problem with 'throwResume;' translation and added some tests to check for similar problems.

Files:

• src/ControlStruct/ExceptTranslate.cc (modified) (8 diffs)
• tests/exceptions/.expect/resume.txt (modified) (1 diff)
• tests/exceptions/.expect/terminate.txt (modified) (1 diff)
• tests/exceptions/resume.cfa (modified) (2 diffs)
• tests/exceptions/terminate.cfa (modified) (2 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue May 26 10:56:00 2020
-// Update Count     : 16
+// Last Modified On : Wed Jun 24 11:18:00 2020
+// Update Count     : 17
 //
 
@@ -72 +72 @@
                         ThrowStmt * throwStmt, const char * throwFunc );
                 Statement * create_terminate_rethrow( ThrowStmt * throwStmt );
-                Statement * create_resume_rethrow( ThrowStmt * throwStmt );
 
         public:
@@ -113 +112 @@
                         new UntypedExpr( new NameExpr( "__cfaehm_rethrow_terminate" ) )
                         ) );
-                delete throwStmt;
-                return result;
-        }
-
-        Statement * ThrowMutatorCore::create_resume_rethrow(
-                        ThrowStmt *throwStmt ) {
-                // return false;
-                Statement * result = new ReturnStmt(
-                        new ConstantExpr( Constant::from_bool( false ) )
-                        );
-                result->labels = throwStmt->labels;
                 delete throwStmt;
                 return result;
@@ -167 +155 @@
                                 return create_either_throw( throwStmt, "$throwResume" );
                         } else if ( ResHandler == cur_context ) {
-                                return create_resume_rethrow( throwStmt );
+                                // This has to be handled later.
+                                return throwStmt;
                         } else {
                                 abort("Invalid throwResume in %s at %i\n",
@@ -196 +185 @@
                 FunctionDecl * create_finally_wrapper( TryStmt * tryStmt );
                 ObjectDecl * create_finally_hook( FunctionDecl * finally_wrapper );
+                Statement * create_resume_rethrow( ThrowStmt * throwStmt );
 
                 // Types used in translation, make sure to use clone.
@@ -227 +217 @@
                 void premutate( StructDecl *structDecl );
                 Statement * postmutate( TryStmt *tryStmt );
+                Statement * postmutate( ThrowStmt *throwStmt );
         };
 
@@ -594 +585 @@
                         attributes
                         );
+        }
+
+        Statement * TryMutatorCore::create_resume_rethrow( ThrowStmt *throwStmt ) {
+                // return false;
+                Statement * result = new ReturnStmt(
+                        new ConstantExpr( Constant::from_bool( false ) )
+                        );
+                result->labels = throwStmt->labels;
+                delete throwStmt;
+                return result;
         }
 
@@ -668 +669 @@
         }
 
+        Statement * TryMutatorCore::postmutate( ThrowStmt *throwStmt ) {
+                // Only valid `throwResume;` statements should remain. (2/3 checks)
+                assert( ThrowStmt::Resume == throwStmt->kind && ! throwStmt->expr );
+                return create_resume_rethrow( throwStmt );
+        }
+
         void translateThrows( std::list< Declaration *> & translationUnit ) {
                 PassVisitor<ThrowMutatorCore> translator;

tests/exceptions/.expect/resume.txt

@@ -31 +31 @@
 inner catch
 outer catch
+
+throw
+rethrow
+handle

tests/exceptions/.expect/terminate.txt

@@ -29 +29 @@
 inner catch
 outer catch
+
+throw
+rethrow
+handle

tests/exceptions/resume.cfa

@@ -8 +8 @@
 TRIVIAL_EXCEPTION(zen);
 TRIVIAL_EXCEPTION(moment_of, zen);
+
+void in_void(void);
 
 int main(int argc, char * argv[]) {
@@ -121 +123 @@
                 printf("outer catch\n");
         }
+        printf("\n");
+
+        in_void();
 }
+
+// Do a throw and rethrow in a void function.
+void in_void(void) {
+        try {
+                try {
+                        printf("throw\n");
+                        throwResume (zen){};
+                } catchResume (zen *) {
+                        printf("rethrow\n");
+                        throwResume;
+                }
+        } catchResume (zen *) {
+                printf("handle\n");
+        }
+}

tests/exceptions/terminate.cfa

@@ -8 +8 @@
 TRIVIAL_EXCEPTION(zen);
 TRIVIAL_EXCEPTION(moment_of, zen);
+
+void in_void(void);
 
 int main(int argc, char * argv[]) {
@@ -121 +123 @@
                 printf("outer catch\n");
         }
+        printf("\n");
+
+        in_void();
 }
+
+// Do a throw and rethrow in a void function.
+void in_void(void) {
+        try {
+                try {
+                        printf("throw\n");
+                        throw (zen){};
+                } catch (zen *) {
+                        printf("rethrow\n");
+                        throw;
+                }
+        } catch (zen *) {
+                printf("handle\n");
+        }
+}
+