Changeset 36982fc for src/ControlStruct
- Timestamp:
- Nov 29, 2017, 2:50:33 PM (8 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- 875a72f
- Parents:
- 8a0a64d9
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/ControlStruct/ExceptTranslate.cc
r8a0a64d9 r36982fc 211 211 ThrowStmt *throwStmt ) { 212 212 // __throw_terminate( `throwStmt->get_name()` ); } 213 return create_given_throw( "__cfa ehm__throw_terminate", throwStmt );213 return create_given_throw( "__cfaabi_ehm__throw_terminate", throwStmt ); 214 214 } 215 215 … … 232 232 result->push_back( new ExprStmt( 233 233 noLabels, 234 new UntypedExpr( new NameExpr( "__cfa ehm__rethrow_terminate" ) )234 new UntypedExpr( new NameExpr( "__cfaabi_ehm__rethrow_terminate" ) ) 235 235 ) ); 236 236 delete throwStmt; … … 241 241 ThrowStmt *throwStmt ) { 242 242 // __throw_resume( `throwStmt->get_name` ); 243 return create_given_throw( "__cfa ehm__throw_resume", throwStmt );243 return create_given_throw( "__cfaabi_ehm__throw_resume", throwStmt ); 244 244 } 245 245 … … 309 309 local_except->get_attributes().push_back( new Attribute( 310 310 "cleanup", 311 { new NameExpr( "__cfa ehm__cleanup_terminate" ) }311 { new NameExpr( "__cfaabi_ehm__cleanup_terminate" ) } 312 312 ) ); 313 313 … … 432 432 FunctionDecl * terminate_catch, 433 433 FunctionDecl * terminate_match ) { 434 // { __cfa ehm__try_terminate(`try`, `catch`, `match`); }434 // { __cfaabi_ehm__try_terminate(`try`, `catch`, `match`); } 435 435 436 436 UntypedExpr * caller = new UntypedExpr( new NameExpr( 437 "__cfa ehm__try_terminate" ) );437 "__cfaabi_ehm__try_terminate" ) ); 438 438 std::list<Expression *>& args = caller->get_args(); 439 439 args.push_back( nameOf( try_wrapper ) ); … … 489 489 490 490 // struct __try_resume_node __resume_node 491 // __attribute__((cleanup( __cfa ehm__try_resume_cleanup )));491 // __attribute__((cleanup( __cfaabi_ehm__try_resume_cleanup ))); 492 492 // ** unwinding of the stack here could cause problems ** 493 493 // ** however I don't think that can happen currently ** 494 // __cfa ehm__try_resume_setup( &__resume_node, resume_handler );494 // __cfaabi_ehm__try_resume_setup( &__resume_node, resume_handler ); 495 495 496 496 std::list< Attribute * > attributes; … … 498 498 std::list< Expression * > attr_params; 499 499 attr_params.push_back( new NameExpr( 500 "__cfa ehm__try_resume_cleanup" ) );500 "__cfaabi_ehm__try_resume_cleanup" ) ); 501 501 attributes.push_back( new Attribute( "cleanup", attr_params ) ); 502 502 } … … 517 517 518 518 UntypedExpr *setup = new UntypedExpr( new NameExpr( 519 "__cfa ehm__try_resume_setup" ) );519 "__cfaabi_ehm__try_resume_setup" ) ); 520 520 setup->get_args().push_back( new AddressExpr( nameOf( obj ) ) ); 521 521 setup->get_args().push_back( nameOf( resume_handler ) ); … … 542 542 ObjectDecl * ExceptionMutatorCore::create_finally_hook( 543 543 FunctionDecl * finally_wrapper ) { 544 // struct __cfa ehm__cleanup_hook __finally_hook544 // struct __cfaabi_ehm__cleanup_hook __finally_hook 545 545 // __attribute__((cleanup( finally_wrapper ))); 546 546 … … 596 596 // Skip children? 597 597 return; 598 } else if ( structDecl->get_name() == "__cfa ehm__base_exception_t" ) {598 } else if ( structDecl->get_name() == "__cfaabi_ehm__base_exception_t" ) { 599 599 assert( nullptr == except_decl ); 600 600 except_decl = structDecl; 601 601 init_func_types(); 602 } else if ( structDecl->get_name() == "__cfa ehm__try_resume_node" ) {602 } else if ( structDecl->get_name() == "__cfaabi_ehm__try_resume_node" ) { 603 603 assert( nullptr == node_decl ); 604 604 node_decl = structDecl; 605 } else if ( structDecl->get_name() == "__cfa ehm__cleanup_hook" ) {605 } else if ( structDecl->get_name() == "__cfaabi_ehm__cleanup_hook" ) { 606 606 assert( nullptr == hook_decl ); 607 607 hook_decl = structDecl;
Note:
See TracChangeset
for help on using the changeset viewer.