Index: src/Virtual/ExpandCasts.cc =================================================================== --- src/Virtual/ExpandCasts.cc (revision 4bae7b4e4a434778d66ee17c5aa961b8b246ab9c) +++ src/Virtual/ExpandCasts.cc (revision 41606df1c8a25852791147aa8665029c6146c8fc) @@ -24,13 +24,7 @@ #include "AST/Expr.hpp" #include "AST/Pass.hpp" -#include "Common/PassVisitor.h" // for PassVisitor #include "Common/ScopedMap.h" // for ScopedMap #include "Common/SemanticError.h" // for SemanticError #include "SymTab/Mangler.h" // for mangleType -#include "SynTree/Declaration.h" // for ObjectDecl, StructDecl, FunctionDecl -#include "SynTree/Expression.h" // for VirtualCastExpr, CastExpr, Address... -#include "SynTree/Mutator.h" // for mutateAll -#include "SynTree/Type.h" // for Type, PointerType, StructInstType -#include "SynTree/Visitor.h" // for acceptAll namespace Virtual { @@ -43,9 +37,4 @@ } -bool is_type_id_object( const ObjectDecl * objectDecl ) { - const std::string & objectName = objectDecl->name; - return is_prefix( "__cfatid_", objectName ); -} - bool is_type_id_object( const ast::ObjectDecl * decl ) { return is_prefix( "__cfatid_", decl->name ); @@ -55,219 +44,4 @@ /// Maps virtual table types the instance for that type. - class VirtualTableMap final { - ScopedMap vtable_instances; - public: - void enterScope() { - vtable_instances.beginScope(); - } - void leaveScope() { - vtable_instances.endScope(); - } - - ObjectDecl * insert( ObjectDecl * vtableDecl ) { - std::string const & mangledName = SymTab::Mangler::mangleType( vtableDecl->type ); - ObjectDecl *& value = vtable_instances[ mangledName ]; - if ( value ) { - if ( vtableDecl->storageClasses.is_extern ) { - return nullptr; - } else if ( ! value->storageClasses.is_extern ) { - return value; - } - } - value = vtableDecl; - return nullptr; - } - - ObjectDecl * lookup( const Type * vtableType ) { - std::string const & mangledName = SymTab::Mangler::mangleType( vtableType ); - const auto it = vtable_instances.find( mangledName ); - return ( vtable_instances.end() == it ) ? nullptr : it->second; - } - }; - - class VirtualCastCore { - CastExpr * cast_to_type_id( Expression * expr, int level_of_indirection ) { - Type * type = new StructInstType( - Type::Qualifiers( Type::Const ), pvt_decl ); - for (int i = 0 ; i < level_of_indirection ; ++i) { - type = new PointerType( noQualifiers, type ); - } - return new CastExpr( expr, type ); - } - - public: - VirtualCastCore() : - indexer(), vcast_decl( nullptr ), pvt_decl( nullptr ) - {} - - void premutate( FunctionDecl * functionDecl ); - void premutate( StructDecl * structDecl ); - void premutate( ObjectDecl * objectDecl ); - - Expression * postmutate( VirtualCastExpr * castExpr ); - - VirtualTableMap indexer; - private: - FunctionDecl *vcast_decl; - StructDecl *pvt_decl; - }; - - void VirtualCastCore::premutate( FunctionDecl * functionDecl ) { - if ( (! vcast_decl) && - functionDecl->get_name() == "__cfavir_virtual_cast" ) { - vcast_decl = functionDecl; - } - } - - void VirtualCastCore::premutate( StructDecl * structDecl ) { - if ( pvt_decl || ! structDecl->has_body() ) { - return; - } else if ( structDecl->get_name() == "__cfavir_type_info" ) { - pvt_decl = structDecl; - } - } - - void VirtualCastCore::premutate( ObjectDecl * objectDecl ) { - if ( is_type_id_object( objectDecl ) ) { - // Multiple definitions should be fine because of linkonce. - indexer.insert( objectDecl ); - } - } - - /// Better error locations for generated casts. - CodeLocation castLocation( const VirtualCastExpr * castExpr ) { - if ( castExpr->location.isSet() ) { - return castExpr->location; - } else if ( castExpr->arg->location.isSet() ) { - return castExpr->arg->location; - } else if ( castExpr->result->location.isSet() ) { - return castExpr->result->location; - } else { - return CodeLocation(); - } - } - - [[noreturn]] void castError( const VirtualCastExpr * castExpr, std::string const & message ) { - SemanticError( castLocation( castExpr ), message ); - } - - /// Get the base type from a pointer or reference. - const Type * getBaseType( const Type * type ) { - if ( auto target = dynamic_cast( type ) ) { - return target->base; - } else if ( auto target = dynamic_cast( type ) ) { - return target->base; - } else { - return nullptr; - } - } - - /* Attempt to follow the "head" field of the structure to get the... - * Returns nullptr on error, otherwise owner must free returned node. - */ - StructInstType * followHeadPointerType( - const StructInstType * oldType, - const std::string& fieldName, - const CodeLocation& errorLocation ) { - - // First section of the function is all about trying to fill this variable in. - StructInstType * newType = nullptr; - { - const StructDecl * oldDecl = oldType->baseStruct; - assert( oldDecl ); - - // Helper function for throwing semantic errors. - auto throwError = [&fieldName, &errorLocation, &oldDecl](const std::string& message) { - const std::string& context = "While following head pointer of " + - oldDecl->name + " named '" + fieldName + "': "; - SemanticError( errorLocation, context + message ); - }; - - if ( oldDecl->members.empty() ) { - throwError( "Type has no fields." ); - } - const Declaration * memberDecl = oldDecl->members.front(); - assert( memberDecl ); - const ObjectDecl * fieldDecl = dynamic_cast( memberDecl ); - assert( fieldDecl ); - if ( fieldName != fieldDecl->name ) { - throwError( "Head field did not have expected name." ); - } - - const Type * fieldType = fieldDecl->type; - if ( nullptr == fieldType ) { - throwError( "Could not get head field." ); - } - const PointerType * ptrType = dynamic_cast( fieldType ); - if ( nullptr == ptrType ) { - throwError( "First field is not a pointer type." ); - } - assert( ptrType->base ); - newType = dynamic_cast( ptrType->base ); - if ( nullptr == newType ) { - throwError( "First field does not point to a structure type." ); - } - } - - // Now we can look into copying it. - newType = newType->clone(); - if ( ! oldType->parameters.empty() ) { - deleteAll( newType->parameters ); - newType->parameters.clear(); - cloneAll( oldType->parameters, newType->parameters ); - } - return newType; - } - - /// Get the type-id type from a virtual type. - StructInstType * getTypeIdType( const Type * type, const CodeLocation& errorLocation ) { - const StructInstType * typeInst = dynamic_cast( type ); - if ( nullptr == typeInst ) { - return nullptr; - } - StructInstType * tableInst = - followHeadPointerType( typeInst, "virtual_table", errorLocation ); - if ( nullptr == tableInst ) { - return nullptr; - } - StructInstType * typeIdInst = - followHeadPointerType( tableInst, "__cfavir_typeid", errorLocation ); - delete tableInst; - return typeIdInst; - } - - Expression * VirtualCastCore::postmutate( VirtualCastExpr * castExpr ) { - assertf( castExpr->result, "Virtual Cast target not found before expansion." ); - - assert( vcast_decl ); - assert( pvt_decl ); - - const Type * base_type = getBaseType( castExpr->result ); - if ( nullptr == base_type ) { - castError( castExpr, "Virtual cast target must be a pointer or reference type." ); - } - const Type * type_id_type = getTypeIdType( base_type, castLocation( castExpr ) ); - if ( nullptr == type_id_type ) { - castError( castExpr, "Ill formed virtual cast target type." ); - } - ObjectDecl * type_id = indexer.lookup( type_id_type ); - delete type_id_type; - if ( nullptr == type_id ) { - castError( castExpr, "Virtual cast does not target a virtual type." ); - } - - Expression * result = new CastExpr( - new ApplicationExpr( VariableExpr::functionPointer( vcast_decl ), { - cast_to_type_id( new AddressExpr( new VariableExpr( type_id ) ), 1 ), - cast_to_type_id( castExpr->get_arg(), 2 ), - } ), - castExpr->get_result()->clone() - ); - - castExpr->set_arg( nullptr ); - castExpr->set_result( nullptr ); - delete castExpr; - return result; - } /// Better error locations for generated casts. @@ -494,9 +268,4 @@ } // namespace -void expandCasts( std::list< Declaration * > & translationUnit ) { - PassVisitor translator; - mutateAll( translationUnit, translator ); -} - void expandCasts( ast::TranslationUnit & translationUnit ) { ast::Pass::run( translationUnit ); Index: src/Virtual/Tables.cc =================================================================== --- src/Virtual/Tables.cc (revision 4bae7b4e4a434778d66ee17c5aa961b8b246ab9c) +++ src/Virtual/Tables.cc (revision 41606df1c8a25852791147aa8665029c6146c8fc) @@ -21,9 +21,4 @@ #include "AST/Stmt.hpp" #include "AST/Type.hpp" -#include -#include -#include -#include -#include namespace Virtual { @@ -65,21 +60,4 @@ return 17 < name.size() && '_' == name[0] && std::string("_vtable_instance") == name.substr(1, name.size() - 17); -} - -static ObjectDecl * makeVtableDeclaration( - std::string const & name, - StructInstType * type, Initializer * init ) { - Type::StorageClasses storage = noStorageClasses; - if ( nullptr == init ) { - storage.is_extern = true; - } - return new ObjectDecl( - name, - storage, - LinkageSpec::Cforall, - nullptr, - type, - init - ); } @@ -101,9 +79,4 @@ } -ObjectDecl * makeVtableForward( std::string const & name, StructInstType * type ) { - assert( type ); - return makeVtableDeclaration( name, type, nullptr ); -} - ast::ObjectDecl * makeVtableForward( CodeLocation const & location, std::string const & name, @@ -111,45 +84,4 @@ assert( vtableType ); return makeVtableDeclaration( location, name, vtableType, nullptr ); -} - -ObjectDecl * makeVtableInstance( - std::string const & name, StructInstType * vtableType, - Type * objectType, Initializer * init ) { - assert( vtableType ); - assert( objectType ); - StructDecl * vtableStruct = vtableType->baseStruct; - // Build the initialization - if ( nullptr == init ) { - std::list< Initializer * > inits; - - // This is going to have to be run before the resolver to connect expressions. - for ( auto field : vtableStruct->members ) { - if ( std::string( "parent" ) == field->name ) { - // This will not work with polymorphic state. - auto oField = strict_dynamic_cast< ObjectDecl * >( field ); - auto fieldType = strict_dynamic_cast< PointerType * >( oField->type ); - auto parentType = strict_dynamic_cast< StructInstType * >( fieldType->base ); - std::string const & parentInstance = instanceName( parentType->name ); - inits.push_back( - new SingleInit( new AddressExpr( new NameExpr( parentInstance ) ) ) ); - } else if ( std::string( "__cfavir_typeid" ) == field->name ) { - std::string const & baseType = baseTypeName( vtableType->name ); - std::string const & typeId = typeIdName( baseType ); - inits.push_back( new SingleInit( new AddressExpr( new NameExpr( typeId ) ) ) ); - } else if ( std::string( "size" ) == field->name ) { - inits.push_back( new SingleInit( new SizeofExpr( objectType->clone() ) ) ); - } else if ( std::string( "align" ) == field->name ) { - inits.push_back( new SingleInit( new AlignofExpr( objectType->clone() ) ) ); - } else { - inits.push_back( new SingleInit( new NameExpr( field->name ) ) ); - } - } - init = new ListInit( inits ); - // This should initialize everything except the parent pointer, the - // size-of and align-of fields. These should be inserted. - } else { - assert(false); - } - return makeVtableDeclaration( name, vtableType, init ); } @@ -224,37 +156,4 @@ } -FunctionDecl * makeGetExceptionForward( - Type * vtableType, Type * exceptType ) { - assert( vtableType ); - assert( exceptType ); - FunctionType * type = new FunctionType( noQualifiers, false ); - vtableType->tq.is_const = true; - type->returnVals.push_back( new ObjectDecl( - "_retvalue", - noStorageClasses, - LinkageSpec::Cforall, - nullptr, - new ReferenceType( noQualifiers, vtableType ), - nullptr, - { new Attribute("unused") } - ) ); - type->parameters.push_back( new ObjectDecl( - "__unused", - noStorageClasses, - LinkageSpec::Cforall, - nullptr, - new PointerType( noQualifiers, exceptType ), - nullptr, - { new Attribute("unused") } - ) ); - return new FunctionDecl( - functionName, - noStorageClasses, - LinkageSpec::Cforall, - type, - nullptr - ); -} - ast::FunctionDecl * makeGetExceptionForward( CodeLocation const & location, @@ -284,16 +183,4 @@ } -FunctionDecl * makeGetExceptionFunction( - ObjectDecl * vtableInstance, Type * exceptType ) { - assert( vtableInstance ); - assert( exceptType ); - FunctionDecl * func = makeGetExceptionForward( - vtableInstance->type->clone(), exceptType ); - func->statements = new CompoundStmt( { - new ReturnStmt( new VariableExpr( vtableInstance ) ), - } ); - return func; -} - ast::FunctionDecl * makeGetExceptionFunction( CodeLocation const & location, @@ -307,23 +194,4 @@ } ); return func; -} - -ObjectDecl * makeTypeIdInstance( StructInstType const * typeIdType ) { - assert( typeIdType ); - StructInstType * type = typeIdType->clone(); - type->tq.is_const = true; - std::string const & typeid_name = typeIdTypeToInstance( typeIdType->name ); - return new ObjectDecl( - typeid_name, - noStorageClasses, - LinkageSpec::Cforall, - /* bitfieldWidth */ nullptr, - type, - new ListInit( { new SingleInit( - new AddressExpr( new NameExpr( "__cfatid_exception_t" ) ) - ) } ), - { new Attribute( "cfa_linkonce", {} ) }, - noFuncSpecifiers - ); } Index: src/Virtual/Tables.h =================================================================== --- src/Virtual/Tables.h (revision 4bae7b4e4a434778d66ee17c5aa961b8b246ab9c) +++ src/Virtual/Tables.h (revision 41606df1c8a25852791147aa8665029c6146c8fc) @@ -18,12 +18,4 @@ #include #include "AST/Fwd.hpp" -class Declaration; -class Expression; -class FunctionDecl; -class Initializer; -class ObjectDecl; -class StructDecl; -class StructInstType; -class Type; namespace Virtual { @@ -37,6 +29,4 @@ bool isVTableInstanceName( std::string const & name ); -ObjectDecl * makeVtableForward( - std::string const & name, StructInstType * vtableType ); /* Create a forward declaration of a vtable of the given type. * vtableType node is consumed. @@ -46,8 +36,4 @@ ast::StructInstType const * vtableType ); -ObjectDecl * makeVtableInstance( - std::string const & name, - StructInstType * vtableType, Type * objectType, - Initializer * init = nullptr ); /* Create an initialized definition of a vtable. * vtableType and init (if provided) nodes are consumed. @@ -61,5 +47,5 @@ // Some special code for how exceptions interact with virtual tables. -FunctionDecl * makeGetExceptionForward( Type * vtableType, Type * exceptType ); + /* Create a forward declaration of the exception virtual function * linking the vtableType to the exceptType. Both nodes are consumed. @@ -70,6 +56,4 @@ ast::Type const * exceptType ); -FunctionDecl * makeGetExceptionFunction( - ObjectDecl * vtableInstance, Type * exceptType ); /* Create the definition of the exception virtual function. * exceptType node is consumed. @@ -79,5 +63,4 @@ ast::ObjectDecl const * vtableInstance, ast::Type const * exceptType ); -ObjectDecl * makeTypeIdInstance( StructInstType const * typeIdType ); /* Build an instance of the type-id from the type of the type-id. * TODO: Should take the parent type. Currently locked to the exception_t.