Changeset 97392b69 for src/ControlStruct/ExceptTranslate.cc

Timestamp:

Jun 10, 2020, 4:19:30 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ab8a023

Parents:

a5873bd (diff), ee06db5c (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' into relaxed_ready

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (5 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 21 13:18:00 2020
-// Update Count     : 15
+// Last Modified On : Tue May 26 10:56:00 2020
+// Update Count     : 16
 //
 
@@ -107 +107 @@
                         nameOf( terminate_handler_except ),
                         new ConstantExpr( Constant::null(
-                                //new PointerType(
-                                //      noQualifiers,
-                                        terminate_handler_except->get_type()->clone()
-                                //      )
+                                terminate_handler_except->get_type()->clone()
                                 ) )
                         ) ) );
@@ -137 +134 @@
                 ObjectDecl * decl = dynamic_cast<ObjectDecl *>( catchStmt->get_decl() );
                 // Also checking the type would be nice.
-                if ( decl ) {
-                        // Pass.
-                } else if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
-                        SemanticError(catchStmt->location, "catch must have exception type");
-                } else {
-                        SemanticError(catchStmt->location, "catchResume must have exception type");
+                if ( !decl || !dynamic_cast<PointerType *>( decl->type ) ) {
+                        std::string kind = (CatchStmt::Terminate == catchStmt->kind) ? "catch" : "catchResume";
+                        SemanticError( catchStmt->location, kind + " must have pointer to an exception type" );
                 }
 
@@ -232 +226 @@
 
                 void premutate( StructDecl *structDecl );
-                Statement * postmutate( ThrowStmt *throwStmt );
                 Statement * postmutate( TryStmt *tryStmt );
         };
@@ -621 +614 @@
         }
 
-        Statement * TryMutatorCore::postmutate( ThrowStmt * ) {
-                // All throws should be removed by this point.
-                assert( false );
-        }
-
         Statement * TryMutatorCore::postmutate( TryStmt *tryStmt ) {
                 assert( except_decl );