Changeset 90152a4 for src/SymTab/Indexer.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• src/SymTab/Indexer.cc (modified) (25 diffs)

src/SymTab/Indexer.cc

@@ -26 +26 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for cloneAll
+#include "GenPoly/GenPoly.h"
 #include "InitTweak/InitTweak.h"   // for isConstructor, isCopyFunction, isC...
 #include "Mangler.h"               // for Mangler
@@ -105 +106 @@
                 if ( ! CodeGen::isCtorDtorAssign( id ) ) return;
 
-                // helpful data structure
+                // helpful data structure to organize properties for a type
                 struct ValueType {
-                        struct DeclBall {
+                        struct DeclBall { // properties for this particular decl
                                 IdData decl;
-                                bool isUserDefinedFunc; // properties for this particular decl
-                                bool isDefaultCtor;
-                                bool isDtor;
+                                bool isUserDefinedFunc;
                                 bool isCopyFunc;
                         };
                         // properties for this type
-                        bool existsUserDefinedFunc = false;    // any user-defined function found
-                        bool existsUserDefinedCtor = false;    // any user-defined constructor found
-                        bool existsUserDefinedDtor = false;    // any user-defined destructor found
                         bool existsUserDefinedCopyFunc = false;    // user-defined copy ctor found
-                        bool existsUserDefinedDefaultCtor = false; // user-defined default ctor found
+                        BaseSyntaxNode * deleteStmt = nullptr;     // non-null if a user-defined function is found
                         std::list< DeclBall > decls;
 
@@ -126 +122 @@
                         ValueType & operator+=( IdData data ) {
                                 DeclarationWithType * function = data.id;
-                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
-                                bool isDefaultCtor = InitTweak::isDefaultConstructor( function );
-                                bool isDtor = InitTweak::isDestructor( function );
-                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
-                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
-                                existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
-                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && CodeGen::isConstructor( function->get_name() ) );
-                                existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
+                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->linkage );
+                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->name );
+                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isCopyFunc } );
                                 existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
-                                existsUserDefinedDefaultCtor = existsUserDefinedDefaultCtor || (isUserDefinedFunc && isDefaultCtor);
+                                if ( isUserDefinedFunc && ! deleteStmt ) {
+                                        // any user-defined function can act as an implicit delete statement for generated constructors.
+                                        // a delete stmt should not act as an implicit delete statement.
+                                        deleteStmt = data.id;
+                                }
                                 return *this;
                         }
@@ -147 +142 @@
                 for ( auto decl : copy ) {
                         if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl.id ) ) {
-                                std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
+                                std::list< DeclarationWithType * > & params = function->type->parameters;
                                 assert( ! params.empty() );
                                 // use base type of pointer, so that qualifiers on the pointer type aren't considered.
@@ -159 +154 @@
 
                 // if a type contains user defined ctor/dtor/assign, then special rules trigger, which determine
-                // the set of ctor/dtor/assign that are seen by the requester. In particular, if the user defines
-                // a default ctor, then the generated default ctor should never be seen, likewise for copy ctor
-                // and dtor. If the user defines any ctor/dtor, then no generated field ctors should be seen.
-                // If the user defines any ctor then the generated default ctor should not be seen (intrinsic default
-                // ctor must be overridden exactly).
+                // the set of ctor/dtor/assign that can be used  by the requester. In particular, if the user defines
+                // a default ctor, then the generated default ctor is unavailable, likewise for copy ctor
+                // and dtor. If the user defines any ctor/dtor, then no generated field ctors are available.
+                // If the user defines any ctor then the generated default ctor is unavailable (intrinsic default
+                // ctor must be overridden exactly). If the user defines anything that looks like a copy constructor,
+                // then the generated copy constructor is unavailable, and likewise for the assignment operator.
                 for ( std::pair< const std::string, ValueType > & pair : funcMap ) {
                         ValueType & val = pair.second;
                         for ( ValueType::DeclBall ball : val.decls ) {
-                                bool noUserDefinedFunc = ! val.existsUserDefinedFunc;
-                                bool isUserDefinedFunc = ball.isUserDefinedFunc;
-                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl.id->get_linkage() == LinkageSpec::Intrinsic)) && ball.isDefaultCtor; // allow default constructors only when no user-defined constructors exist, except in the case of intrinsics, which require exact overrides
-                                bool isAcceptableCopyFunc = ! val.existsUserDefinedCopyFunc && ball.isCopyFunc; // handles copy ctor and assignment operator
-                                bool isAcceptableDtor = ! val.existsUserDefinedDtor && ball.isDtor;
-                                if ( noUserDefinedFunc || isUserDefinedFunc || isAcceptableDefaultCtor || isAcceptableCopyFunc || isAcceptableDtor ) {
-                                        // decl conforms to the rules described above, so it should be seen by the requester
-                                        out.push_back( ball.decl );
+                                bool isNotUserDefinedFunc = ! ball.isUserDefinedFunc && ball.decl.id->linkage != LinkageSpec::Intrinsic;
+                                bool isCopyFunc = ball.isCopyFunc;
+                                bool existsUserDefinedCopyFunc = val.existsUserDefinedCopyFunc;
+
+                                // only implicitly delete non-user defined functions that are not intrinsic, and are
+                                // not copy functions (assignment or copy constructor). If a  user-defined copy function exists,
+                                // do not pass along the non-user-defined copy functions since signatures do not have to match,
+                                // and the generated functions will often be cheaper.
+                                if ( isNotUserDefinedFunc ) {
+                                        if ( isCopyFunc ) {
+                                                // Skip over non-user-defined copy functions when there is a user-defined copy function.
+                                                // Since their signatures do not have to be exact, deleting them is the wrong choice.
+                                                if ( existsUserDefinedCopyFunc ) continue;
+                                        } else {
+                                                // delete non-user-defined non-copy functions if applicable.
+                                                // deleteStmt will be non-null only if a user-defined function is found.
+                                                ball.decl.deleteStmt = val.deleteStmt;
+                                        }
                                 }
+                                out.push_back( ball.decl );
                         }
                 }
@@ -265 +272 @@
         }
 
+        NamedTypeDecl *Indexer::globalLookupType( const std::string &id ) const {
+                return lookupTypeAtScope( id, 0 );
+        }
+
+        StructDecl *Indexer::globalLookupStruct( const std::string &id ) const {
+                return lookupStructAtScope( id, 0 );
+        }
+
+        UnionDecl *Indexer::globalLookupUnion( const std::string &id ) const {
+                return lookupUnionAtScope( id, 0 );
+        }
+
+        EnumDecl *Indexer::globalLookupEnum( const std::string &id ) const {
+                return lookupEnumAtScope( id, 0 );
+        }
+
         EnumDecl *Indexer::lookupEnum( const std::string &id ) const {
                 if ( ! tables ) return 0;
@@ -286 +309 @@
         }
 
-        DeclarationWithType *Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
-                if ( ! tables ) return 0;
-                if ( tables->scope < scope ) return 0;
+        const Indexer::IdData * Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
+                if ( ! tables ) return nullptr;
+                if ( tables->scope < scope ) return nullptr;
 
                 IdTable::const_iterator decls = tables->idTable.find( id );
@@ -294 +317 @@
                         const MangleTable &mangleTable = decls->second;
                         MangleTable::const_iterator decl = mangleTable.find( mangleName );
-                        if ( decl != mangleTable.end() ) return decl->second.id;
+                        if ( decl != mangleTable.end() ) return &decl->second;
                 }
 
                 return tables->base.lookupIdAtScope( id, mangleName, scope );
+        }
+
+        Indexer::IdData * Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) {
+                return const_cast<IdData *>(const_cast<const Indexer *>(this)->lookupIdAtScope( id, mangleName, scope ));
         }
 
@@ -336 +363 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTypeAtScope( id, scope );
 
                 TypeTable::const_iterator ret = tables->typeTable.find( id );
@@ -344 +372 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupStructAtScope( id, scope );
 
                 StructTable::const_iterator ret = tables->structTable.find( id );
@@ -352 +381 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupEnumAtScope( id, scope );
 
                 EnumTable::const_iterator ret = tables->enumTable.find( id );
@@ -360 +390 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupUnionAtScope( id, scope );
 
                 UnionTable::const_iterator ret = tables->unionTable.find( id );
@@ -368 +399 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTraitAtScope( id, scope );
 
                 TraitTable::const_iterator ret = tables->traitTable.find( id );
@@ -373 +405 @@
         }
 
-        bool addedIdConflicts( DeclarationWithType *existing, DeclarationWithType *added ) {
+        bool isFunction( DeclarationWithType * decl ) {
+                return GenPoly::getFunctionType( decl->get_type() );
+        }
+
+        bool isObject( DeclarationWithType * decl ) {
+                return ! isFunction( decl );
+        }
+
+        bool isDefinition( DeclarationWithType * decl ) {
+                if ( FunctionDecl * func = dynamic_cast< FunctionDecl * >( decl ) ) {
+                        // a function is a definition if it has a body
+                        return func->statements;
+                } else {
+                        // an object is a definition if it is not marked extern.
+                        // both objects must be marked extern
+                        return ! decl->get_storageClasses().is_extern;
+                }
+        }
+
+        bool addedIdConflicts( Indexer::IdData & existing, DeclarationWithType *added, BaseSyntaxNode * deleteStmt, Indexer::ConflictFunction handleConflicts ) {
                 // if we're giving the same name mangling to things of different types then there is something wrong
-                assert( (dynamic_cast<ObjectDecl*>( added ) && dynamic_cast<ObjectDecl*>( existing ) )
-                        || (dynamic_cast<FunctionDecl*>( added ) && dynamic_cast<FunctionDecl*>( existing ) ) );
-
-                if ( LinkageSpec::isOverridable( existing->get_linkage() ) ) {
+                assert( (isObject( added ) && isObject( existing.id ) )
+                        || ( isFunction( added ) && isFunction( existing.id ) ) );
+
+                if ( LinkageSpec::isOverridable( existing.id->get_linkage() ) ) {
                         // new definition shadows the autogenerated one, even at the same scope
                         return false;
-                } else if ( LinkageSpec::isMangled( added->get_linkage() ) || ResolvExpr::typesCompatible( added->get_type(), existing->get_type(), Indexer() ) ) {
-                        // typesCompatible doesn't really do the right thing here. When checking compatibility of function types,
-                        // we should ignore outermost pointer qualifiers, except _Atomic?
-                        FunctionDecl *newentry = dynamic_cast< FunctionDecl* >( added );
-                        FunctionDecl *oldentry = dynamic_cast< FunctionDecl* >( existing );
-                        if ( newentry && oldentry ) {
-                                if ( newentry->get_statements() && oldentry->get_statements() ) {
-                                        throw SemanticError( "duplicate function definition for ", added );
-                                } // if
-                        } else {
-                                // two objects with the same mangled name defined in the same scope.
-                                // both objects must be marked extern or both must be intrinsic for this to be okay
-                                // xxx - perhaps it's actually if either is intrinsic then this is okay?
-                                //       might also need to be same storage class?
-                                ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( added );
-                                ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( existing );
-                                if ( ! newobj->get_storageClasses().is_extern && ! oldobj->get_storageClasses().is_extern ) {
-                                        throw SemanticError( "duplicate object definition for ", added );
+                } else if ( LinkageSpec::isMangled( added->get_linkage() ) || ResolvExpr::typesCompatible( added->get_type(), existing.id->get_type(), Indexer() ) ) {
+
+                        // it is a conflict if one declaration is deleted and the other is not
+                        if ( deleteStmt && ! existing.deleteStmt ) {
+                                return handleConflicts( existing, "deletion of defined identifier " );
+                        } else if ( ! deleteStmt && existing.deleteStmt ) {
+                                return handleConflicts( existing, "definition of deleted identifier " );
+                        }
+
+                        if ( isDefinition( added ) && isDefinition( existing.id ) ) {
+                                if ( isFunction( added ) ) {
+                                        return handleConflicts( existing, "duplicate function definition for " );
+                                } else {
+                                        return handleConflicts( existing, "duplicate object definition for " );
                                 } // if
                         } // if
                 } else {
-                        throw SemanticError( "duplicate definition for ", added );
+                        return handleConflicts( existing, "duplicate definition for " );
                 } // if
 
@@ -408 +455 @@
         }
 
-        void Indexer::addId( DeclarationWithType *decl, Expression * baseExpr ) {
+        void Indexer::addId( DeclarationWithType *decl, ConflictFunction handleConflicts, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) {
+                if ( decl->name == "" ) return;
                 debugPrint( "Adding Id " << decl->name << std::endl );
                 makeWritable();
@@ -430 +478 @@
                         // isomorphic to C type-compatibility, which it may not be.
                         if ( hasIncompatibleCDecl( name, mangleName, scope ) ) {
-                                throw SemanticError( "conflicting overload of C function ", decl );
-                        }
-                } else {
-                        // Check that a Cforall declaration doesn't overload any C declaration
+                                SemanticError( decl, "conflicting overload of C function " );
+                        }
+                } else {
+                        // Check that a Cforall declaration doesn't override any C declaration
                         if ( hasCompatibleCDecl( name, mangleName, scope ) ) {
-                                throw SemanticError( "Cforall declaration hides C function ", decl );
+                                SemanticError( decl, "Cforall declaration hides C function " );
                         }
                 }
 
                 // Skip repeat declarations of the same identifier
-                DeclarationWithType *existing = lookupIdAtScope( name, mangleName, scope );
-                if ( existing && addedIdConflicts( existing, decl ) ) return;
+                IdData * existing = lookupIdAtScope( name, mangleName, scope );
+                if ( existing && existing->id && addedIdConflicts( *existing, decl, deleteStmt, handleConflicts ) ) return;
 
                 // add to indexer
-                tables->idTable[ name ][ mangleName ] = { decl, baseExpr };
+                tables->idTable[ name ][ mangleName ] = IdData{ decl, baseExpr, deleteStmt };
                 ++tables->size;
         }
 
+        void Indexer::addId( DeclarationWithType * decl, Expression * baseExpr ) {
+                // default handling of conflicts is to raise an error
+                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr, decl->isDeleted ? decl : nullptr );
+        }
+
+        void Indexer::addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt ) {
+                // default handling of conflicts is to raise an error
+                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, nullptr, deleteStmt );
+        }
+
         bool addedTypeConflicts( NamedTypeDecl *existing, NamedTypeDecl *added ) {
-                if ( existing->get_base() == 0 ) {
+                if ( existing->base == nullptr ) {
                         return false;
-                } else if ( added->get_base() == 0 ) {
+                } else if ( added->base == nullptr ) {
                         return true;
                 } else {
-                        throw SemanticError( "redeclaration of ", added );
-                }
+                        assert( existing->base && added->base );
+                        // typedef redeclarations are errors only if types are different
+                        if ( ! ResolvExpr::typesCompatible( existing->base, added->base, Indexer() ) ) {
+                                SemanticError( added->location, "redeclaration of " + added->name );
+                        }
+                }
+                // does not need to be added to the table if both existing and added have a base that are the same
+                return true;
         }
 
@@ -462 +526 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TypeTable::iterator existing = tables->typeTable.find( id );
                 if ( existing == tables->typeTable.end() ) {
@@ -478 +542 @@
 
         bool addedDeclConflicts( AggregateDecl *existing, AggregateDecl *added ) {
-                if ( existing->get_members().empty() ) {
+                if ( ! existing->body ) {
                         return false;
-                } else if ( ! added->get_members().empty() ) {
-                        throw SemanticError( "redeclaration of ", added );
+                } else if ( added->body ) {
+                        SemanticError( added, "redeclaration of " );
                 } // if
                 return true;
@@ -495 +559 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 StructTable::iterator existing = tables->structTable.find( id );
                 if ( existing == tables->structTable.end() ) {
@@ -514 +578 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 EnumTable::iterator existing = tables->enumTable.find( id );
                 if ( existing == tables->enumTable.end() ) {
@@ -538 +602 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 UnionTable::iterator existing = tables->unionTable.find( id );
                 if ( existing == tables->unionTable.end() ) {
@@ -557 +621 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TraitTable::iterator existing = tables->traitTable.find( id );
                 if ( existing == tables->traitTable.end() ) {
@@ -572 +636 @@
         }
 
-        void Indexer::addWith( WithStmt * stmt ) {
-                for ( Expression * expr : stmt->exprs ) {
+        void Indexer::addMembers( AggregateDecl * aggr, Expression * expr, ConflictFunction handleConflicts ) {
+                for ( Declaration * decl : aggr->members ) {
+                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                addId( dwt, handleConflicts, expr );
+                                if ( dwt->name == "" ) {
+                                        Type * t = dwt->get_type()->stripReferences();
+                                        if ( dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t ) ) {
+                                                Expression * base = expr->clone();
+                                                ResolvExpr::Cost cost = ResolvExpr::Cost::zero; // xxx - carry this cost into the indexer as a base cost?
+                                                ResolvExpr::referenceToRvalueConversion( base, cost );
+                                                addMembers( t->getAggr(), new MemberExpr( dwt, base ), handleConflicts );
+                                        }
+                                }
+                        }
+                }
+        }
+
+        void Indexer::addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt ) {
+                for ( Expression * expr : withExprs ) {
                         if ( expr->result ) {
                                 AggregateDecl * aggr = expr->result->stripReferences()->getAggr();
                                 assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
 
-                                for ( Declaration * decl : aggr->members ) {
-                                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                                                addId( dwt, expr );
-                                        }
-                                }
+                                addMembers( aggr, expr, [withStmt](IdData & existing, const std::string &) {
+                                        // on conflict, delete the identifier
+                                        existing.deleteStmt = withStmt;
+                                        return true;
+                                });
                         }
                 }
@@ -641 +722 @@
 
         void Indexer::print( std::ostream &os, int indent ) const {
-            using std::cerr;
+                using std::cerr;
 
                 if ( tables ) {
@@ -666 +747 @@
         }
 
-        Expression * Indexer::IdData::combine() const {
+        Expression * Indexer::IdData::combine( ResolvExpr::Cost & cost ) const {
+                Expression * ret = nullptr;
                 if ( baseExpr ) {
                         Expression * base = baseExpr->clone();
-                        ResolvExpr::referenceToRvalueConversion( base );
-                        Expression * ret = new MemberExpr( id, base );
+                        ResolvExpr::referenceToRvalueConversion( base, cost );
+                        ret = new MemberExpr( id, base );
                         // xxx - this introduces hidden environments, for now remove them.
                         // std::swap( base->env, ret->env );
                         delete base->env;
                         base->env = nullptr;
-                        return ret;
-                } else {
-                        return new VariableExpr( id );
-                }
+                } else {
+                        ret = new VariableExpr( id );
+                }
+                if ( deleteStmt ) ret = new DeletedExpr( ret, deleteStmt );
+                return ret;
         }
 } // namespace SymTab