Changeset 66ba544

Timestamp:

May 21, 2020, 1:43:59 PM (5 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:

99fea48

Parents:

8ad5752

Message:

Dead code elimination in the try block translation.

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (6 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 19 16:46:00 2020
-// Update Count     : 14
+// Last Modified On : Thr May 21 13:18:00 2020
+// Update Count     : 15
 //
 
@@ -182 +182 @@
         }
 
-        class TryMutatorCore : public WithGuards {
-                enum Context { NoHandler, TerHandler, ResHandler };
-
-                // Also need to handle goto, break & continue.
-                // They need to be cut off in a ResHandler, until we enter another
-                // loop, switch or the goto stays within the function.
-
-                Context cur_context;
-
-                // The current (innermost) termination handler exception declaration.
-                ObjectDecl * handler_except_decl;
-
+        class TryMutatorCore {
                 // The built in types used in translation.
                 StructDecl * except_decl;
@@ -234 +223 @@
         public:
                 TryMutatorCore() :
-                        cur_context( NoHandler ),
-                        handler_except_decl( nullptr ),
                         except_decl( nullptr ), node_decl( nullptr ), hook_decl( nullptr ),
                         try_func_t( noQualifiers, false ),
@@ -244 +231 @@
                 {}
 
-                void premutate( CatchStmt *catchStmt );
                 void premutate( StructDecl *structDecl );
                 Statement * postmutate( ThrowStmt *throwStmt );
@@ -579 +565 @@
         FunctionDecl * TryMutatorCore::create_finally_wrapper(
                         TryStmt * tryStmt ) {
-                // void finally() { <finally code> }
+                // void finally() { `finally->block` }
                 FinallyStmt * finally = tryStmt->get_finally();
                 CompoundStmt * body = finally->get_block();
@@ -618 +604 @@
 
         // Visiting/Mutating Functions
-        void TryMutatorCore::premutate( CatchStmt *catchStmt ) {
-                // Validate the Statement's form.
-                ObjectDecl * decl = dynamic_cast<ObjectDecl *>( catchStmt->get_decl() );
-                if ( decl && true /* check decl->get_type() */ ) {
-                        // 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");
-                }
-
-                // Track the handler context.
-                GuardValue( cur_context );
-                if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
-                        cur_context = TerHandler;
-
-                        GuardValue( handler_except_decl );
-                        handler_except_decl = decl;
-                } else {
-                        cur_context = ResHandler;
-                }
-        }
-
         void TryMutatorCore::premutate( StructDecl *structDecl ) {
                 if ( !structDecl->has_body() ) {