Changes in src/ControlStruct/ExceptTranslate.cc [c0b9f5d:ba3706f]

File:

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

src/ControlStruct/ExceptTranslate.cc

@@ -211 +211 @@
                         ThrowStmt *throwStmt ) {
                 // __throw_terminate( `throwStmt->get_name()` ); }
-                return create_given_throw( "__cfaabi_ehm__throw_terminate", throwStmt );
+                return create_given_throw( "__cfaehm__throw_terminate", throwStmt );
         }
 
@@ -232 +232 @@
                         ) ) );
                 result->push_back( new ExprStmt(
-                        new UntypedExpr( new NameExpr( "__cfaabi_ehm__rethrow_terminate" ) )
+                        new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
                         ) );
                 delete throwStmt;
@@ -241 +241 @@
                         ThrowStmt *throwStmt ) {
                 // __throw_resume( `throwStmt->get_name` );
-                return create_given_throw( "__cfaabi_ehm__throw_resume", throwStmt );
+                return create_given_throw( "__cfaehm__throw_resume", throwStmt );
         }
 
@@ -309 +309 @@
                         local_except->get_attributes().push_back( new Attribute(
                                 "cleanup",
-                                { new NameExpr( "__cfaabi_ehm__cleanup_terminate" ) }
+                                { new NameExpr( "__cfaehm__cleanup_terminate" ) }
                                 ) );
 
@@ -316 +316 @@
                                 VarExprReplacer::DeclMap mapping;
                                 mapping[ handler_decl ] = local_except;
-                                VarExprReplacer::replace( handler->body, mapping );
+                                VarExprReplacer mapper( mapping );
+                                handler->get_body()->accept( mapper );
                         }
 
@@ -429 +430 @@
                         FunctionDecl * terminate_catch,
                         FunctionDecl * terminate_match ) {
-                // { __cfaabi_ehm__try_terminate(`try`, `catch`, `match`); }
+                // { __cfaehm__try_terminate(`try`, `catch`, `match`); }
 
                 UntypedExpr * caller = new UntypedExpr( new NameExpr(
-                        "__cfaabi_ehm__try_terminate" ) );
+                        "__cfaehm__try_terminate" ) );
                 std::list<Expression *>& args = caller->get_args();
                 args.push_back( nameOf( try_wrapper ) );
@@ -486 +487 @@
 
                 // struct __try_resume_node __resume_node
-                //      __attribute__((cleanup( __cfaabi_ehm__try_resume_cleanup )));
+                //      __attribute__((cleanup( __cfaehm__try_resume_cleanup )));
                 // ** unwinding of the stack here could cause problems **
                 // ** however I don't think that can happen currently **
-                // __cfaabi_ehm__try_resume_setup( &__resume_node, resume_handler );
+                // __cfaehm__try_resume_setup( &__resume_node, resume_handler );
 
                 std::list< Attribute * > attributes;
@@ -495 +496 @@
                         std::list< Expression * > attr_params;
                         attr_params.push_back( new NameExpr(
-                                "__cfaabi_ehm__try_resume_cleanup" ) );
+                                "__cfaehm__try_resume_cleanup" ) );
                         attributes.push_back( new Attribute( "cleanup", attr_params ) );
                 }
@@ -514 +515 @@
 
                 UntypedExpr *setup = new UntypedExpr( new NameExpr(
-                        "__cfaabi_ehm__try_resume_setup" ) );
+                        "__cfaehm__try_resume_setup" ) );
                 setup->get_args().push_back( new AddressExpr( nameOf( obj ) ) );
                 setup->get_args().push_back( nameOf( resume_handler ) );
@@ -539 +540 @@
         ObjectDecl * ExceptionMutatorCore::create_finally_hook(
                         FunctionDecl * finally_wrapper ) {
-                // struct __cfaabi_ehm__cleanup_hook __finally_hook
+                // struct __cfaehm__cleanup_hook __finally_hook
                 //      __attribute__((cleanup( finally_wrapper )));
 
@@ -593 +594 @@
                         // Skip children?
                         return;
-                } else if ( structDecl->get_name() == "__cfaabi_ehm__base_exception_t" ) {
+                } else if ( structDecl->get_name() == "__cfaehm__base_exception_t" ) {
                         assert( nullptr == except_decl );
                         except_decl = structDecl;
                         init_func_types();
-                } else if ( structDecl->get_name() == "__cfaabi_ehm__try_resume_node" ) {
+                } else if ( structDecl->get_name() == "__cfaehm__try_resume_node" ) {
                         assert( nullptr == node_decl );
                         node_decl = structDecl;
-                } else if ( structDecl->get_name() == "__cfaabi_ehm__cleanup_hook" ) {
+                } else if ( structDecl->get_name() == "__cfaehm__cleanup_hook" ) {
                         assert( nullptr == hook_decl );
                         hook_decl = structDecl;