Changes in src/Virtual/Tables.cc [4f6dda0:aff7e86]

File:

• src/Virtual/Tables.cc (modified) (7 diffs)

src/Virtual/Tables.cc

@@ -10 +10 @@
 // Created On       : Mon Aug 31 11:11:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Mar 11 10:40:00 2022
-// Update Count     : 3
+// Last Modified On : Wed Apr 21 15:36:00 2021
+// Update Count     : 2
 //
 
-#include "AST/Attribute.hpp"
-#include "AST/Copy.hpp"
-#include "AST/Decl.hpp"
-#include "AST/Expr.hpp"
-#include "AST/Init.hpp"
-#include "AST/Stmt.hpp"
-#include "AST/Type.hpp"
 #include <SynTree/Attribute.h>
 #include <SynTree/Declaration.h>
@@ -84 +77 @@
 }
 
-static ast::ObjectDecl * makeVtableDeclaration(
-                CodeLocation const & location, std::string const & name,
-                ast::StructInstType const * type, ast::Init const * init ) {
-        ast::Storage::Classes storage;
-        if ( nullptr == init ) {
-                storage.is_extern = true;
-        }
-        return new ast::ObjectDecl(
-                location,
-                name,
-                type,
-                init,
-                storage,
-                ast::Linkage::Cforall
-        );
-}
-
 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,
-                ast::StructInstType const * vtableType ) {
-        assert( vtableType );
-        return makeVtableDeclaration( location, name, vtableType, nullptr );
 }
 
@@ -154 +123 @@
 }
 
-static std::vector<ast::ptr<ast::Init>> buildInits(
-                CodeLocation const & location,
-                //std::string const & name,
-                ast::StructInstType const * vtableType,
-                ast::Type const * objectType ) {
-        ast::StructDecl const * vtableStruct = vtableType->base;
-
-        std::vector<ast::ptr<ast::Init>> inits;
-        inits.reserve( vtableStruct->members.size() );
-
-        // This is designed to run before the resolver.
-        for ( auto field : vtableStruct->members ) {
-                if ( std::string( "parent" ) == field->name ) {
-                        // This will not work with polymorphic state.
-                        auto oField = field.strict_as<ast::ObjectDecl>();
-                        auto fieldType = oField->type.strict_as<ast::PointerType>();
-                        auto parentType = fieldType->base.strict_as<ast::StructInstType>();
-                        std::string const & parentInstance = instanceName( parentType->name );
-                        inits.push_back(
-                                        new ast::SingleInit( location, new ast::AddressExpr( new ast::NameExpr( location, 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 ast::SingleInit( location, new ast::AddressExpr( new ast::NameExpr( location, typeId ) ) ) );
-                } else if ( std::string( "size" ) == field->name ) {
-                        inits.push_back( new ast::SingleInit( location, new ast::SizeofExpr( location, objectType )
-                        ) );
-                } else if ( std::string( "align" ) == field->name ) {
-                        inits.push_back( new ast::SingleInit( location,
-                                new ast::AlignofExpr( location, objectType )
-                        ) );
-                } else {
-                        inits.push_back( new ast::SingleInit( location,
-                                new ast::NameExpr( location, field->name )
-                        ) );
-                }
-                //ast::Expr * expr = buildInitExpr(...);
-                //inits.push_back( new ast::SingleInit( location, expr ) )
-        }
-
-        return inits;
-}
-
-ast::ObjectDecl * makeVtableInstance(
-                CodeLocation const & location,
-                std::string const & name,
-                ast::StructInstType const * vtableType,
-                ast::Type const * objectType,
-                ast::Init const * init ) {
-        assert( vtableType );
-        assert( objectType );
-
-        // Build the initialization.
-        if ( nullptr == init ) {
-                init = new ast::ListInit( location,
-                        buildInits( location, vtableType, objectType ) );
-
-        // The provided init should initialize everything except the parent
-        // pointer, the size-of and align-of fields. These should be inserted.
-        } else {
-                // Except this is not yet supported.
-                assert(false);
-        }
-        return makeVtableDeclaration( location, name, vtableType, init );
-}
-
 namespace {
         std::string const functionName = "get_exception_vtable";
@@ -237 +140 @@
                 new ReferenceType( noQualifiers, vtableType ),
                 nullptr,
-                { new Attribute("unused") }
+        { new Attribute("unused") }
         ) );
         type->parameters.push_back( new ObjectDecl(
@@ -257 +160 @@
 }
 
-ast::FunctionDecl * makeGetExceptionForward(
-                CodeLocation const & location,
-                ast::Type const * vtableType,
-                ast::Type const * exceptType ) {
-        assert( vtableType );
-        assert( exceptType );
-        return new ast::FunctionDecl(
-                location,
-                functionName,
-                { /* forall */ },
-                { new ast::ObjectDecl(
-                        location,
-                        "__unused",
-                        new ast::PointerType( exceptType )
-                ) },
-                { new ast::ObjectDecl(
-                        location,
-                        "_retvalue",
-                        new ast::ReferenceType( vtableType )
-                ) },
-                nullptr,
-                ast::Storage::Classes(),
-                ast::Linkage::Cforall,
-                { new ast::Attribute( "unused" ) }
-        );
-}
-
 FunctionDecl * makeGetExceptionFunction(
                 ObjectDecl * vtableInstance, Type * exceptType ) {
@@ -292 +168 @@
         func->statements = new CompoundStmt( {
                 new ReturnStmt( new VariableExpr( vtableInstance ) ),
-        } );
-        return func;
-}
-
-ast::FunctionDecl * makeGetExceptionFunction(
-                CodeLocation const & location,
-                ast::ObjectDecl const * vtableInstance, ast::Type const * exceptType ) {
-        assert( vtableInstance );
-        assert( exceptType );
-        ast::FunctionDecl * func = makeGetExceptionForward(
-                        location, ast::deepCopy( vtableInstance->type ), exceptType );
-        func->stmts = new ast::CompoundStmt( location, {
-                new ast::ReturnStmt( location, new ast::VariableExpr( location, vtableInstance ) )
         } );
         return func;
@@ -328 +191 @@
 }
 
-ast::ObjectDecl * makeTypeIdInstance(
-                CodeLocation const & location,
-                ast::StructInstType const * typeIdType ) {
-        assert( typeIdType );
-        ast::StructInstType * type = ast::mutate( typeIdType );
-        type->set_const( true );
-        std::string const & typeid_name = typeIdTypeToInstance( typeIdType->name );
-        return new ast::ObjectDecl(
-                location,
-                typeid_name,
-                type,
-                new ast::ListInit( location, {
-                        new ast::SingleInit( location,
-                                new ast::AddressExpr( location,
-                                        new ast::NameExpr( location, "__cfatid_exception_t" ) ) )
-                } ),
-                ast::Storage::Classes(),
-                ast::Linkage::Cforall,
-                nullptr,
-                { new ast::Attribute( "cfa_linkonce" ) }
-        );
 }
-
-}