Changeset 5da9d6a for src/ControlStruct
- Timestamp:
- Dec 1, 2017, 11:58:32 AM (7 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:
- 3ca540f, 86ad276
- Parents:
- d16d159 (diff), 3d560060 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/ControlStruct/ExceptTranslate.cc
rd16d159 r5da9d6a 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 ) ) ); 233 233 result->push_back( new ExprStmt( 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 … … 430 430 FunctionDecl * terminate_catch, 431 431 FunctionDecl * terminate_match ) { 432 // { __cfa ehm__try_terminate(`try`, `catch`, `match`); }432 // { __cfaabi_ehm__try_terminate(`try`, `catch`, `match`); } 433 433 434 434 UntypedExpr * caller = new UntypedExpr( new NameExpr( 435 "__cfa ehm__try_terminate" ) );435 "__cfaabi_ehm__try_terminate" ) ); 436 436 std::list<Expression *>& args = caller->get_args(); 437 437 args.push_back( nameOf( try_wrapper ) ); … … 487 487 488 488 // struct __try_resume_node __resume_node 489 // __attribute__((cleanup( __cfa ehm__try_resume_cleanup )));489 // __attribute__((cleanup( __cfaabi_ehm__try_resume_cleanup ))); 490 490 // ** unwinding of the stack here could cause problems ** 491 491 // ** however I don't think that can happen currently ** 492 // __cfa ehm__try_resume_setup( &__resume_node, resume_handler );492 // __cfaabi_ehm__try_resume_setup( &__resume_node, resume_handler ); 493 493 494 494 std::list< Attribute * > attributes; … … 496 496 std::list< Expression * > attr_params; 497 497 attr_params.push_back( new NameExpr( 498 "__cfa ehm__try_resume_cleanup" ) );498 "__cfaabi_ehm__try_resume_cleanup" ) ); 499 499 attributes.push_back( new Attribute( "cleanup", attr_params ) ); 500 500 } … … 515 515 516 516 UntypedExpr *setup = new UntypedExpr( new NameExpr( 517 "__cfa ehm__try_resume_setup" ) );517 "__cfaabi_ehm__try_resume_setup" ) ); 518 518 setup->get_args().push_back( new AddressExpr( nameOf( obj ) ) ); 519 519 setup->get_args().push_back( nameOf( resume_handler ) ); … … 540 540 ObjectDecl * ExceptionMutatorCore::create_finally_hook( 541 541 FunctionDecl * finally_wrapper ) { 542 // struct __cfa ehm__cleanup_hook __finally_hook542 // struct __cfaabi_ehm__cleanup_hook __finally_hook 543 543 // __attribute__((cleanup( finally_wrapper ))); 544 544 … … 594 594 // Skip children? 595 595 return; 596 } else if ( structDecl->get_name() == "__cfa ehm__base_exception_t" ) {596 } else if ( structDecl->get_name() == "__cfaabi_ehm__base_exception_t" ) { 597 597 assert( nullptr == except_decl ); 598 598 except_decl = structDecl; 599 599 init_func_types(); 600 } else if ( structDecl->get_name() == "__cfa ehm__try_resume_node" ) {600 } else if ( structDecl->get_name() == "__cfaabi_ehm__try_resume_node" ) { 601 601 assert( nullptr == node_decl ); 602 602 node_decl = structDecl; 603 } else if ( structDecl->get_name() == "__cfa ehm__cleanup_hook" ) {603 } else if ( structDecl->get_name() == "__cfaabi_ehm__cleanup_hook" ) { 604 604 assert( nullptr == hook_decl ); 605 605 hook_decl = structDecl;
Note: See TracChangeset
for help on using the changeset viewer.