Index: src/GenPoly/CopyParams.cc =================================================================== --- src/GenPoly/CopyParams.cc (revision ae1b9eaca1bda2fba72d857681b6459557fd6784) +++ (revision ) @@ -1,110 +1,0 @@ -// -// 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. -// -// CopyParams.cc -- -// -// Author : Richard C. Bilson -// Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Tue May 19 07:33:31 2015 -// Update Count : 1 -// - -#include // for assert -#include // for list, _List_iterator, _List_const_... -#include // for map, _Rb_tree_const_iterator, map<... -#include // for set, set<>::const_iterator -#include // for string, operator== -#include // for pair - -#include "Common/SemanticError.h" // for SemanticError -#include "Common/UniqueName.h" // for UniqueName -#include "SynTree/Declaration.h" // for DeclarationWithType, TypeDecl, Fun... -#include "SynTree/Expression.h" // for VariableExpr, ApplicationExpr, Add... -#include "SynTree/Label.h" // for Label, noLabels -#include "SynTree/Statement.h" // for CompoundStmt, DeclStmt, ExprStmt -#include "SynTree/SynTree.h" // for UniqueId -#include "SynTree/Type.h" // for FunctionType, TypeInstType, Type -#include "SynTree/Visitor.h" // for acceptAll, Visitor - -namespace GenPoly { - class CopyParams : public Visitor { - public: - CopyParams(); - - virtual void visit( FunctionDecl *funcDecl ); - virtual void visit( AddressExpr *addrExpr ); - - private: - std::set< DeclarationWithType * > modVars; - UniqueName namer; - }; - - /// creates local copies of polymorphic function parameters - void copyParams( std::list< Declaration* > &translationUnit ) { - CopyParams copier; - acceptAll( translationUnit, copier ); - } - - CopyParams::CopyParams() : namer( "_cp" ) {} - - void CopyParams::visit( FunctionDecl *funcDecl ) { - if ( funcDecl->statements ) { - funcDecl->statements->accept( *this ); - - if ( ! modVars.empty() ) { - std::map< std::string, DeclarationWithType* > assignOps; - // xxx - this needs to use constructors, not assignment operators - // assume the assignment operator is the first assert param after any "type" parameter - for ( Type::ForallList::const_iterator tyVar = funcDecl->type->forall.begin(); tyVar != funcDecl->type->forall.end(); ++tyVar ) { - if ( (*tyVar)->get_kind() == TypeDecl::Any ) { - assert( !(*tyVar)->assertions.empty() ); - assert( (*tyVar)->assertions.front()->name == "?=?" ); - assignOps[ (*tyVar)->name ] = (*tyVar)->assertions.front(); - } // if - } // for - for ( std::list< DeclarationWithType* >::iterator param = funcDecl->type->parameters.begin(); param != funcDecl->type->parameters.end(); ++param ) { - std::set< DeclarationWithType * >::const_iterator var = modVars.find( *param ); - if ( var != modVars.end() ) { - TypeInstType *typeInst = dynamic_cast< TypeInstType* >( (*param)->get_type() ); - std::map< std::string, DeclarationWithType* >::const_iterator assignOp = assignOps.find( typeInst->name ); - if ( assignOp != assignOps.end() ) { - DeclarationWithType *oldParam = *param; - *param = (*param)->clone(); - (*param)->set_mangleName( namer.newName( (*param)->get_mangleName() ) ); - ApplicationExpr *assign = new ApplicationExpr( new VariableExpr( assignOp->second ) ); - assign->args.push_back( new VariableExpr( oldParam ) ); - assign->args.push_back( new VariableExpr( *param ) ); - funcDecl->statements->push_front( new ExprStmt( noLabels, assign ) ); - funcDecl->statements->push_front( new DeclStmt( noLabels, oldParam ) ); - } // if - modVars.erase( var ); - } // if - } // for - } // if - } // if - } - - // this test is insufficient because it is possible for values to be modified by being passed to other polymorphic - // routines (e.g., assignment operators) without having their addresses explicitly taken. Some thought is needed to - // make sure that all of the correct cases are identified where copies are necessary. - // - // As a temporary measure, for correctness at the expense of performance, ignore the modVars list entirely and copy - // every parameter of TypeInstType* when visiting the FunctionDecl. - void CopyParams::visit( AddressExpr *addrExpr ) { - if ( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( addrExpr->arg ) ) { - if ( dynamic_cast< TypeInstType* >( varExpr->var->get_type() ) ) { - modVars.insert( varExpr->var ); - } // if - } // if - } -} // namespace GenPoly - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/GenPoly/CopyParams.h =================================================================== --- src/GenPoly/CopyParams.h (revision ae1b9eaca1bda2fba72d857681b6459557fd6784) +++ (revision ) @@ -1,29 +1,0 @@ -// -// 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. -// -// CopyParams.h -- -// -// Author : Richard C. Bilson -// Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 22 09:23:09 2017 -// Update Count : 2 -// - -#pragma once - -#include "SynTree/SynTree.h" - -namespace GenPoly { - /// Clones by-value parameters which have been passed by-reference for polymorphism - void copyParams( std::list< Declaration* > &translationUnit ); -} // namespace GenPoly - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/GenPoly/module.mk =================================================================== --- src/GenPoly/module.mk (revision ae1b9eaca1bda2fba72d857681b6459557fd6784) +++ src/GenPoly/module.mk (revision e706bfdd16d98ec3bd9aa37c28043cfd7c27ef6f) @@ -20,5 +20,4 @@ GenPoly/Lvalue.cc \ GenPoly/Specialize.cc \ - GenPoly/CopyParams.cc \ GenPoly/FindFunction.cc \ GenPoly/InstantiateGeneric.cc