Index: src/ControlStruct/ExceptTranslate.cc =================================================================== --- src/ControlStruct/ExceptTranslate.cc (revision a5a08a05ef4b7b5171fe05d97efdb47b5996f4ad) +++ src/ControlStruct/ExceptTranslate.cc (revision cc287800d7bddd7ca9acd23c50bb33d0a4fa3439) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// ExceptVisitor.cc -- +// ExceptTranslate.cc -- Conversion of exception control flow structures. // // Author : Andrew Beach Index: src/ControlStruct/ExceptTranslate.h =================================================================== --- src/ControlStruct/ExceptTranslate.h (revision a5a08a05ef4b7b5171fe05d97efdb47b5996f4ad) +++ src/ControlStruct/ExceptTranslate.h (revision cc287800d7bddd7ca9acd23c50bb33d0a4fa3439) @@ -5,11 +5,11 @@ // file "LICENCE" distributed with Cforall. // -// ExceptTranslate.h -- +// ExceptTranslate.h -- Conversion of exception control flow structures. // // Author : Andrew Beach // Created On : Tus Jun 06 10:13:00 2017 // Last Modified By : Andrew Beach -// Last Modified On : Tus May 19 11:47:00 2020 -// Update Count : 5 +// Last Modified On : Mon Nov 8 11:43:00 2020 +// Update Count : 6 // @@ -19,7 +19,11 @@ class Declaration; +namespace ast { + class TranslationUnit; +} namespace ControlStruct { void translateThrows( std::list< Declaration *> & translationUnit ); + void translateThrows( ast::TranslationUnit & transUnit ); /* Replaces all throw & throwResume statements with function calls. * These still need to be resolved, so call this before the reslover. Index: src/ControlStruct/ExceptTranslateNew.cpp =================================================================== --- src/ControlStruct/ExceptTranslateNew.cpp (revision cc287800d7bddd7ca9acd23c50bb33d0a4fa3439) +++ src/ControlStruct/ExceptTranslateNew.cpp (revision cc287800d7bddd7ca9acd23c50bb33d0a4fa3439) @@ -0,0 +1,142 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// ExceptTranslateNew.cpp -- Conversion of exception control flow structures. +// +// Author : Andrew Beach +// Created On : Mon Nov 8 11:53:00 2021 +// Last Modified By : Andrew Beach +// Last Modified On : Mon Nov 8 16:50:00 2021 +// Update Count : 0 +// + +#include "ExceptTranslate.h" + +#include "AST/Expr.hpp" +#include "AST/Pass.hpp" +#include "AST/Stmt.hpp" +#include "AST/TranslationUnit.hpp" + +namespace ControlStruct { + +namespace { + +class TranslateThrowsCore : public ast::WithGuards { + const ast::ObjectDecl * terminateHandlerExcept; + enum Context { NoHandler, TerHandler, ResHandler } currentContext; + + const ast::Stmt * createEitherThrow( + const ast::ThrowStmt * throwStmt, const char * funcName ); + const ast::Stmt * createTerminateRethrow( const ast::ThrowStmt * ); + +public: + TranslateThrowsCore() : + terminateHandlerExcept( nullptr ), currentContext( NoHandler ) + {} + + void previsit( const ast::CatchStmt * stmt ); + const ast::Stmt * postvisit( const ast::ThrowStmt * stmt ); +}; + +const ast::Stmt * TranslateThrowsCore::createEitherThrow( + const ast::ThrowStmt * throwStmt, const char * funcName ) { + // `throwFunc`( `throwStmt->name` ); + ast::UntypedExpr * call = new ast::UntypedExpr( throwStmt->location, + new ast::NameExpr( throwStmt->location, funcName ) + ); + call->args.push_back( throwStmt->expr ); + return new ast::ExprStmt( throwStmt->location, call ); +} + +ast::VariableExpr * varOf( const ast::DeclWithType * decl ) { + return new ast::VariableExpr( decl->location, decl ); +} + +const ast::Stmt * TranslateThrowsCore::createTerminateRethrow( + const ast::ThrowStmt * stmt ) { + // { `terminate_handler_except` = 0p; __rethrow_terminate(); } + assert( nullptr == stmt->expr ); + assert( terminateHandlerExcept ); + + ast::CompoundStmt * result = new ast::CompoundStmt( + stmt->location, {}, std::vector( stmt->labels ) ); + result->push_back( new ast::ExprStmt( stmt->location, + ast::UntypedExpr::createAssign( + stmt->location, + varOf( terminateHandlerExcept ), + ast::ConstantExpr::null( + stmt->location, + terminateHandlerExcept->type + ) + ) + ) ); + result->push_back( new ast::ExprStmt( stmt->location, new ast::UntypedExpr( + stmt->location, + new ast::NameExpr( stmt->location, "__cfaehm_rethrow_terminate" ) + ) ) ); + return result; +} + +void TranslateThrowsCore::previsit( const ast::CatchStmt * stmt ) { + // Validate the statement's form. + const ast::ObjectDecl * decl = stmt->decl.as(); + // Also checking the type would be nice. + if ( !decl || !decl->type.as() ) { + std::string kind = (ast::Terminate == stmt->kind) ? "catch" : "catchResume"; + SemanticError( stmt->location, kind + " must have pointer to an exception type" ); + } + + // Track the handler context. + if ( ast::Terminate == stmt->kind ) { + GuardValue( currentContext ) = TerHandler; + GuardValue( terminateHandlerExcept ) = decl; + } else { + GuardValue( currentContext ) = ResHandler; + } +} + +const ast::Stmt * TranslateThrowsCore::postvisit( + const ast::ThrowStmt * stmt ) { + // Ignoring ThrowStmt::target for now. + // Handle Termination (Raise, Reraise, Error): + if ( ast::Terminate == stmt->kind ) { + if ( stmt->expr ) { + return createEitherThrow( stmt, "$throw" ); + } else if ( TerHandler == currentContext ) { + return createTerminateRethrow( stmt ); + } else { + abort( "Invalid throw in %s at %i\n", + stmt->location.filename.c_str(), + stmt->location.first_line); + } + // Handle Resumption (Raise, Reraise, Error): + } else { + if ( stmt->expr ) { + return createEitherThrow( stmt, "$throwResume" ); + } else if ( ResHandler == currentContext ) { + // This has to be handled later. + return stmt; + } else { + abort( "Invalid throwResume in %s at %i\n", + stmt->location.filename.c_str(), + stmt->location.first_line); + } + } +} + +} // namespace + +void translateThrows( ast::TranslationUnit & transUnit ) { + ast::Pass::run( transUnit ); +} + +} // namespace ControlStruct + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/ControlStruct/module.mk =================================================================== --- src/ControlStruct/module.mk (revision a5a08a05ef4b7b5171fe05d97efdb47b5996f4ad) +++ src/ControlStruct/module.mk (revision cc287800d7bddd7ca9acd23c50bb33d0a4fa3439) @@ -33,5 +33,9 @@ ControlStruct/Mutate.h -SRC += $(SRC_CONTROLSTRUCT) ControlStruct/ExceptTranslate.cc ControlStruct/ExceptTranslate.h +SRC += $(SRC_CONTROLSTRUCT) \ + ControlStruct/ExceptTranslateNew.cpp \ + ControlStruct/ExceptTranslate.cc \ + ControlStruct/ExceptTranslate.h + SRCDEMANGLE += $(SRC_CONTROLSTRUCT) Index: src/main.cc =================================================================== --- src/main.cc (revision a5a08a05ef4b7b5171fe05d97efdb47b5996f4ad) +++ src/main.cc (revision cc287800d7bddd7ca9acd23c50bb33d0a4fa3439) @@ -10,6 +10,6 @@ // Created On : Fri May 15 23:12:02 2015 // Last Modified By : Andrew Beach -// Last Modified On : Fri Oct 29 16:34:00 2021 -// Update Count : 655 +// Last Modified On : Mon Nov 8 11:42:00 2021 +// Update Count : 656 // @@ -334,6 +334,4 @@ } // if - PASS( "Translate Throws", ControlStruct::translateThrows( translationUnit ) ); - CodeTools::fillLocations( translationUnit ); @@ -347,4 +345,5 @@ forceFillCodeLocations( transUnit ); + PASS( "Translate Throws", ControlStruct::translateThrows( transUnit ) ); PASS( "Fix Labels", ControlStruct::fixLabels( transUnit ) ); PASS( "Fix Names", CodeGen::fixNames( transUnit ) ); @@ -384,4 +383,5 @@ translationUnit = convert( move( transUnit ) ); } else { + PASS( "Translate Throws", ControlStruct::translateThrows( translationUnit ) ); PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) ); PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );