Changes in src/ControlStruct/ExceptTranslate.cc [7862059:bfc7811]

File:

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

src/ControlStruct/ExceptTranslate.cc

@@ -34 +34 @@
 #include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
 #include "SynTree/Type.h"             // for FunctionType, Type, noQualifiers
-#include "SynTree/DeclReplacer.h"     // for DeclReplacer
+#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
 #include "SynTree/Visitor.h"          // for acceptAll
 
@@ -104 +104 @@
                 // Types used in translation, make sure to use clone.
                 // void (*function)();
-                FunctionType try_func_t;
+                FunctionType * try_func_t;
                 // void (*function)(int, exception);
-                FunctionType catch_func_t;
+                FunctionType * catch_func_t;
                 // int (*function)(exception);
-                FunctionType match_func_t;
+                FunctionType * match_func_t;
                 // bool (*function)(exception);
-                FunctionType handle_func_t;
+                FunctionType * handle_func_t;
                 // void (*function)(__attribute__((unused)) void *);
-                FunctionType finally_func_t;
+                FunctionType * finally_func_t;
 
                 StructInstType * create_except_type() {
@@ -125 +125 @@
                         handler_except_decl( nullptr ),
                         except_decl( nullptr ), node_decl( nullptr ), hook_decl( nullptr ),
-                        try_func_t( noQualifiers, false ),
-                        catch_func_t( noQualifiers, false ),
-                        match_func_t( noQualifiers, false ),
-                        handle_func_t( noQualifiers, false ),
-                        finally_func_t( noQualifiers, false )
+                        try_func_t( new FunctionType(noQualifiers, false) ),
+                        catch_func_t( new FunctionType(noQualifiers, false) ),
+                        match_func_t( new FunctionType(noQualifiers, false) ),
+                        handle_func_t( new FunctionType(noQualifiers, false) ),
+                        finally_func_t( new FunctionType(noQualifiers, false) )
                 {}
 
@@ -141 +141 @@
                 assert( except_decl );
 
-                ObjectDecl index_obj(
+                auto index_obj = new ObjectDecl(
                         "__handler_index",
                         Type::StorageClasses(),
@@ -149 +149 @@
                         /*init*/ NULL
                         );
-                ObjectDecl exception_obj(
+                auto exception_obj = new ObjectDecl(
                         "__exception_inst",
                         Type::StorageClasses(),
@@ -160 +160 @@
                         /*init*/ NULL
                         );
-                ObjectDecl bool_obj(
+                auto bool_obj = new ObjectDecl(
                         "__ret_bool",
                         Type::StorageClasses(),
@@ -169 +169 @@
                         std::list<Attribute *>{ new Attribute( "unused" ) }
                         );
-                ObjectDecl voidptr_obj(
+                auto voidptr_obj = new ObjectDecl(
                         "__hook",
                         Type::StorageClasses(),
@@ -184 +184 @@
                         );
 
-                ObjectDecl * unused_index_obj = index_obj.clone();
+                ObjectDecl * unused_index_obj = index_obj->clone();
                 unused_index_obj->attributes.push_back( new Attribute( "unused" ) );
 
-                catch_func_t.get_parameters().push_back( index_obj.clone() );
-                catch_func_t.get_parameters().push_back( exception_obj.clone() );
-                match_func_t.get_returnVals().push_back( unused_index_obj );
-                match_func_t.get_parameters().push_back( exception_obj.clone() );
-                handle_func_t.get_returnVals().push_back( bool_obj.clone() );
-                handle_func_t.get_parameters().push_back( exception_obj.clone() );
-                finally_func_t.get_parameters().push_back( voidptr_obj.clone() );
+                catch_func_t->get_parameters().push_back( index_obj );
+                catch_func_t->get_parameters().push_back( exception_obj->clone() );
+                match_func_t->get_returnVals().push_back( unused_index_obj );
+                match_func_t->get_parameters().push_back( exception_obj->clone() );
+                handle_func_t->get_returnVals().push_back( bool_obj );
+                handle_func_t->get_parameters().push_back( exception_obj );
+                finally_func_t->get_parameters().push_back( voidptr_obj );
         }
 
@@ -204 +204 @@
                 call->get_args().push_back( throwStmt->get_expr() );
                 throwStmt->set_expr( nullptr );
-                delete throwStmt;
                 return new ExprStmt( call );
         }
@@ -234 +233 @@
                         new UntypedExpr( new NameExpr( "__cfaabi_ehm__rethrow_terminate" ) )
                         ) );
-                delete throwStmt;
                 return result;
         }
@@ -251 +249 @@
                         );
                 result->labels = throwStmt->labels;
-                delete throwStmt;
                 return result;
         }
@@ -267 +264 @@
 
                 return new FunctionDecl( "try", Type::StorageClasses(),
-                        LinkageSpec::Cforall, try_func_t.clone(), body );
+                        LinkageSpec::Cforall, try_func_t->clone(), body );
         }
 
@@ -274 +271 @@
                 std::list<CaseStmt *> handler_wrappers;
 
-                FunctionType *func_type = catch_func_t.clone();
+                FunctionType *func_type = catch_func_t->clone();
                 DeclarationWithType * index_obj = func_type->get_parameters().front();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
@@ -314 +311 @@
                         // Update variables in the body to point to this local copy.
                         {
-                                DeclReplacer::DeclMap mapping;
+                                VarExprReplacer::DeclMap mapping;
                                 mapping[ handler_decl ] = local_except;
-                                DeclReplacer::replace( handler->body, mapping );
+                                VarExprReplacer::replace( handler->body, mapping );
                         }
 
@@ -384 +381 @@
                 modded_handler->set_cond( nullptr );
                 modded_handler->set_body( nullptr );
-                delete modded_handler;
                 return block;
         }
@@ -396 +392 @@
                 CompoundStmt * body = new CompoundStmt();
 
-                FunctionType * func_type = match_func_t.clone();
+                FunctionType * func_type = match_func_t->clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
 
@@ -450 +446 @@
                 CompoundStmt * body = new CompoundStmt();
 
-                FunctionType * func_type = handle_func_t.clone();
+                FunctionType * func_type = handle_func_t->clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
 
@@ -530 +526 @@
                 CompoundStmt * body = finally->get_block();
                 finally->set_block( nullptr );
-                delete finally;
                 tryStmt->set_finally( nullptr );
 
                 return new FunctionDecl("finally", Type::StorageClasses(),
-                        LinkageSpec::Cforall, finally_func_t.clone(), body);
+                        LinkageSpec::Cforall, finally_func_t->clone(), body);
         }