Index: src/ControlStruct/ExceptTranslateNew.cpp =================================================================== --- src/ControlStruct/ExceptTranslateNew.cpp (revision 33b7d490d37c1f84e96a85cdf1c8baad2b08aeb8) +++ src/ControlStruct/ExceptTranslateNew.cpp (revision 3b80db89ad8057ef837786b049cd89765ab7a20d) @@ -26,5 +26,5 @@ namespace { - typedef std::list CatchList; + typedef std::list CatchList; void appendDeclStmt( ast::CompoundStmt * block, ast::DeclWithType * item ) { @@ -45,5 +45,5 @@ {} - void previsit( const ast::CatchStmt * stmt ); + void previsit( const ast::CatchClause * stmt ); const ast::Stmt * postvisit( const ast::ThrowStmt * stmt ); }; @@ -88,5 +88,5 @@ } -void TranslateThrowsCore::previsit( const ast::CatchStmt * stmt ) { +void TranslateThrowsCore::previsit( const ast::CatchClause * stmt ) { // Validate the statement's form. const ast::ObjectDecl * decl = stmt->decl.as(); @@ -147,5 +147,5 @@ ast::FunctionDecl * create_terminate_catch( CatchList &handlers ); ast::CompoundStmt * create_single_matcher( - const ast::DeclWithType * except_obj, ast::CatchStmt * modded_handler ); + const ast::DeclWithType * except_obj, ast::CatchClause * modded_handler ); ast::FunctionDecl * create_terminate_match( CatchList &handlers ); ast::CompoundStmt * create_terminate_caller( CodeLocation loc, ast::FunctionDecl * try_wrapper, @@ -338,5 +338,5 @@ ast::FunctionDecl * TryMutatorCore::create_terminate_catch( CatchList &handlers ) { - std::vector> handler_wrappers; + std::vector> handler_wrappers; assert (!handlers.empty()); @@ -352,5 +352,5 @@ for ( ; it != handlers.end() ; ++it ) { ++index; - ast::CatchStmt * handler = *it; + ast::CatchClause * handler = *it; const CodeLocation loc = handler->location; @@ -390,5 +390,5 @@ // handler->body = nullptr; - handler_wrappers.push_back( new ast::CaseStmt(loc, + handler_wrappers.push_back( new ast::CaseClause(loc, ast::ConstantExpr::from_int(loc, index) , { block, new ast::ReturnStmt( loc, nullptr ) } @@ -410,5 +410,5 @@ // except_obj is referenced, modded_handler will be freed. ast::CompoundStmt * TryMutatorCore::create_single_matcher( - const ast::DeclWithType * except_obj, ast::CatchStmt * modded_handler ) { + const ast::DeclWithType * except_obj, ast::CatchClause * modded_handler ) { // { // `modded_handler.decl` @@ -465,5 +465,5 @@ for ( it = handlers.begin() ; it != handlers.end() ; ++it ) { ++index; - ast::CatchStmt * handler = *it; + ast::CatchClause * handler = *it; // Body should have been taken by create_terminate_catch. @@ -520,5 +520,5 @@ CatchList::iterator it; for ( it = handlers.begin() ; it != handlers.end() ; ++it ) { - ast::CatchStmt * handler = *it; + ast::CatchClause * handler = *it; const CodeLocation loc = handler->location; // Modifiy body. @@ -587,5 +587,5 @@ ast::TryStmt * tryStmt ) { // void finally() { `finally->block` } - const ast::FinallyStmt * finally = tryStmt->finally; + const ast::FinallyClause * finally = tryStmt->finally; const ast::CompoundStmt * body = finally->body; Index: src/ControlStruct/LabelGeneratorNew.cpp =================================================================== --- src/ControlStruct/LabelGeneratorNew.cpp (revision 33b7d490d37c1f84e96a85cdf1c8baad2b08aeb8) +++ src/ControlStruct/LabelGeneratorNew.cpp (revision 3b80db89ad8057ef837786b049cd89765ab7a20d) @@ -5,11 +5,11 @@ // file "LICENCE" distributed with Cforall. // -// LabelGenerator.cc -- +// LabelGeneratorNew.cpp -- // // Author : Peter A. Buhr // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 2 09:11:17 2022 -// Update Count : 72 +// Last Modified By : Andrew Beach +// Last Modified On : Mon Mar 28 10:03:00 2022 +// Update Count : 73 // @@ -25,13 +25,26 @@ namespace ControlStruct { -Label newLabel( const string & suffix, const Stmt * stmt ) { +enum { size = 128 }; + +static int newLabelPre( char buf[size], const string & suffix ) { static int current = 0; - assertf( stmt, "CFA internal error: parameter statement cannot be null pointer" ); - - enum { size = 128 }; - char buf[size]; // space to build label int len = snprintf( buf, size, "__L%d__%s", current++, suffix.c_str() ); assertf( len < size, "CFA Internal error: buffer overflow creating label" ); + return len; +} + +static Label newLabelPost( char buf[size], const CodeLocation & location ) { + Label ret_label( location, buf ); + ret_label.attributes.push_back( new Attribute( "unused" ) ); + return ret_label; +} + +Label newLabel( const string & suffix, const Stmt * stmt ) { + // Buffer for string manipulation. + char buf[size]; + + assertf( stmt, "CFA internal error: parameter statement cannot be null pointer" ); + int len = newLabelPre( buf, suffix ); // What does this do? @@ -41,7 +54,13 @@ } // if - Label ret_label( stmt->location, buf ); - ret_label.attributes.push_back( new Attribute( "unused" ) ); - return ret_label; + return newLabelPost( buf, stmt->location ); +} + +Label newLabel( const string & suffix, const CodeLocation & location ) { + // Buffer for string manipulation. + char buf[size]; + + newLabelPre( buf, suffix ); + return newLabelPost( buf, location ); } Index: src/ControlStruct/LabelGeneratorNew.hpp =================================================================== --- src/ControlStruct/LabelGeneratorNew.hpp (revision 33b7d490d37c1f84e96a85cdf1c8baad2b08aeb8) +++ src/ControlStruct/LabelGeneratorNew.hpp (revision 3b80db89ad8057ef837786b049cd89765ab7a20d) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jan 31 18:03:09 2022 -// Update Count : 27 +// Last Modified By : Andrew Beach +// Last Modified On : Fir Mar 25 15:40:00 2022 +// Update Count : 28 // @@ -18,13 +18,14 @@ #include // for string -class Statement; +class CodeLocation; namespace ast { + class Label; class Stmt; - class Label; } // namespace ast namespace ControlStruct { ast::Label newLabel( const std::string &, const ast::Stmt * ); + ast::Label newLabel( const std::string &, const CodeLocation & ); } // namespace ControlStruct Index: src/ControlStruct/MultiLevelExit.cpp =================================================================== --- src/ControlStruct/MultiLevelExit.cpp (revision 33b7d490d37c1f84e96a85cdf1c8baad2b08aeb8) +++ src/ControlStruct/MultiLevelExit.cpp (revision 3b80db89ad8057ef837786b049cd89765ab7a20d) @@ -9,7 +9,7 @@ // Author : Andrew Beach // Created On : Mon Nov 1 13:48:00 2021 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 2 23:07:54 2022 -// Update Count : 33 +// Last Modified By : Andrew Beach +// Last Modified On : Mon Mar 28 9:42:00 2022 +// Update Count : 34 // @@ -40,5 +40,5 @@ enum Kind { - ForStmtK, WhileDoStmtK, CompoundStmtK, IfStmtK, CaseStmtK, SwitchStmtK, TryStmtK + ForStmtK, WhileDoStmtK, CompoundStmtK, IfStmtK, CaseClauseK, SwitchStmtK, TryStmtK } kind; @@ -58,6 +58,6 @@ Entry( const IfStmt *stmt, Label breakExit ) : stmt( stmt ), firstTarget( breakExit ), secondTarget(), kind( IfStmtK ) {} - Entry( const CaseStmt *stmt, Label fallExit ) : - stmt( stmt ), firstTarget( fallExit ), secondTarget(), kind( CaseStmtK ) {} + Entry( const CaseClause *, const CompoundStmt *stmt, Label fallExit ) : + stmt( stmt ), firstTarget( fallExit ), secondTarget(), kind( CaseClauseK ) {} Entry( const SwitchStmt *stmt, Label breakExit, Label fallDefaultExit ) : stmt( stmt ), firstTarget( breakExit ), secondTarget( fallDefaultExit ), kind( SwitchStmtK ) {} @@ -66,18 +66,18 @@ bool isContTarget() const { return kind <= WhileDoStmtK; } - bool isBreakTarget() const { return kind != CaseStmtK; } - bool isFallTarget() const { return kind == CaseStmtK; } + bool isBreakTarget() const { return kind != CaseClauseK; } + bool isFallTarget() const { return kind == CaseClauseK; } bool isFallDefaultTarget() const { return kind == SwitchStmtK; } // These routines set a target as being "used" by a BranchStmt Label useContExit() { assert( kind <= WhileDoStmtK ); return useTarget(secondTarget); } - Label useBreakExit() { assert( kind != CaseStmtK ); return useTarget(firstTarget); } - Label useFallExit() { assert( kind == CaseStmtK ); return useTarget(firstTarget); } + Label useBreakExit() { assert( kind != CaseClauseK ); return useTarget(firstTarget); } + Label useFallExit() { assert( kind == CaseClauseK ); return useTarget(firstTarget); } Label useFallDefaultExit() { assert( kind == SwitchStmtK ); return useTarget(secondTarget); } // These routines check if a specific label for a statement is used by a BranchStmt bool isContUsed() const { assert( kind <= WhileDoStmtK ); return secondTarget.used; } - bool isBreakUsed() const { assert( kind != CaseStmtK ); return firstTarget.used; } - bool isFallUsed() const { assert( kind == CaseStmtK ); return firstTarget.used; } + bool isBreakUsed() const { assert( kind != CaseClauseK ); return firstTarget.used; } + bool isFallUsed() const { assert( kind == CaseClauseK ); return firstTarget.used; } bool isFallDefaultUsed() const { assert( kind == SwitchStmtK ); return secondTarget.used; } void seenDefault() { fallDefaultValid = false; } @@ -115,5 +115,5 @@ void previsit( const ForStmt * ); const ForStmt * postvisit( const ForStmt * ); - const CaseStmt * previsit( const CaseStmt * ); + const CaseClause * previsit( const CaseClause * ); void previsit( const IfStmt * ); const IfStmt * postvisit( const IfStmt * ); @@ -123,5 +123,5 @@ void previsit( const TryStmt * ); void postvisit( const TryStmt * ); - void previsit( const FinallyStmt * ); + void previsit( const FinallyClause * ); const Stmt * mutateLoop( const Stmt * body, Entry& ); @@ -288,6 +288,5 @@ auto switchStmt = strict_dynamic_cast< const SwitchStmt * >( targetEntry->stmt ); bool foundDefault = false; - for ( auto subStmt : switchStmt->stmts ) { - const CaseStmt * caseStmt = subStmt.strict_as(); + for ( auto caseStmt : switchStmt->cases ) { if ( caseStmt->isDefault() ) { foundDefault = true; @@ -365,5 +364,5 @@ } -const CaseStmt * MultiLevelExitCore::previsit( const CaseStmt * stmt ) { +const CaseClause * MultiLevelExitCore::previsit( const CaseClause * stmt ) { visit_children = false; @@ -375,19 +374,21 @@ // The cond may not exist, but if it does update it now. - visitor->maybe_accept( stmt, &CaseStmt::cond ); + visitor->maybe_accept( stmt, &CaseClause::cond ); // Just save the mutated node for simplicity. - CaseStmt * mutStmt = mutate( stmt ); - - Label fallLabel = newLabel( "fallThrough", stmt ); + CaseClause * mutStmt = mutate( stmt ); + + Label fallLabel = newLabel( "fallThrough", stmt->location ); if ( ! mutStmt->stmts.empty() ) { + // These should already be in a block. + auto first = mutStmt->stmts.front().get_and_mutate(); + auto block = strict_dynamic_cast( first ); + // Ensure that the stack isn't corrupted by exceptions in fixBlock. auto guard = makeFuncGuard( - [&](){ enclosing_control_structures.emplace_back( mutStmt, fallLabel ); }, + [&](){ enclosing_control_structures.emplace_back( mutStmt, block, fallLabel ); }, [this](){ enclosing_control_structures.pop_back(); } ); - // These should already be in a block. - auto block = mutate( mutStmt->stmts.front().strict_as() ); block->kids = fixBlock( block->kids, true ); @@ -396,5 +397,5 @@ Entry & entry = enclosing_control_structures.back(); if ( entry.isFallUsed() ) { - mutStmt->stmts.push_back( labelledNullStmt( mutStmt->location, entry.useFallExit() ) ); + mutStmt->stmts.push_back( labelledNullStmt( block->location, entry.useFallExit() ) ); } } @@ -433,15 +434,14 @@ } -bool isDefaultCase( const ptr & stmt ) { - const CaseStmt * caseStmt = stmt.strict_as(); - return caseStmt->isDefault(); +static bool isDefaultCase( const ptr & caseClause ) { + return caseClause->isDefault(); } void MultiLevelExitCore::previsit( const SwitchStmt * stmt ) { Label label = newLabel( "switchBreak", stmt ); - auto it = find_if( stmt->stmts.rbegin(), stmt->stmts.rend(), isDefaultCase ); - - const CaseStmt * defaultCase = it != stmt->stmts.rend() ? (it)->strict_as() : nullptr; - Label defaultLabel = defaultCase ? newLabel( "fallThroughDefault", defaultCase ) : Label( stmt->location, "" ); + auto it = find_if( stmt->cases.rbegin(), stmt->cases.rend(), isDefaultCase ); + + const CaseClause * defaultCase = it != stmt->cases.rend() ? (*it) : nullptr; + Label defaultLabel = defaultCase ? newLabel( "fallThroughDefault", defaultCase->location ) : Label( stmt->location, "" ); enclosing_control_structures.emplace_back( stmt, label, defaultLabel ); GuardAction( [this]() { enclosing_control_structures.pop_back(); } ); @@ -449,6 +449,5 @@ // Collect valid labels for fallthrough. It starts with all labels at this level, then remove as each is seen during // traversal. - for ( const Stmt * stmt : stmt->stmts ) { - auto * caseStmt = strict_dynamic_cast< const CaseStmt * >( stmt ); + for ( const CaseClause * caseStmt : stmt->cases ) { if ( caseStmt->stmts.empty() ) continue; auto block = caseStmt->stmts.front().strict_as(); @@ -471,11 +470,11 @@ // exit label and break to the last case, create a default case if no cases. SwitchStmt * mutStmt = mutate( stmt ); - if ( mutStmt->stmts.empty() ) { - mutStmt->stmts.push_back( new CaseStmt( mutStmt->location, nullptr, {} ) ); - } - - auto caseStmt = mutStmt->stmts.back().strict_as(); + if ( mutStmt->cases.empty() ) { + mutStmt->cases.push_back( new CaseClause( mutStmt->location, nullptr, {} ) ); + } + + auto caseStmt = mutStmt->cases.back().get(); auto mutCase = mutate( caseStmt ); - mutStmt->stmts.back() = mutCase; + mutStmt->cases.back() = mutCase; Label label( mutCase->location, "breakLabel" ); @@ -514,5 +513,5 @@ } -void MultiLevelExitCore::previsit( const FinallyStmt * ) { +void MultiLevelExitCore::previsit( const FinallyClause * ) { GuardAction([this, old = move( enclosing_control_structures)](){ enclosing_control_structures = move(old); }); enclosing_control_structures = vector();