Changeset 28f3a19 for src/SymTab

Timestamp:

Jun 27, 2018, 3:28:41 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (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 with_gc

Location:

src/SymTab

Files:

• Indexer.cc (modified) (5 diffs)
• Mangler.cc (modified) (3 diffs)
• Validate.cc (modified) (3 diffs)

src/SymTab/Indexer.cc

@@ -106 +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;
 
@@ -127 +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;
                         }
@@ -148 +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.
@@ -160 +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 );
                         }
                 }
@@ -471 +477 @@
         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 );
+                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr, decl->isDeleted ? decl : nullptr );
         }
 

src/SymTab/Mangler.cc

@@ -171 +171 @@
                                         "w",    // SignedInt128
                                         "Uw",   // UnsignedInt128
+                                        "x",   // Float80
+                                        "y",   // Float128
                                 };
+                                static_assert(
+                                        sizeof(btLetter)/sizeof(btLetter[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+                                        "Each basic type kind should have a corresponding mangler letter"
+                                );
 
                                 printQualifiers( basicType );
+                                assert( basicType->get_kind() < sizeof(btLetter)/sizeof(btLetter[0]) );
                                 mangleName << btLetter[ basicType->get_kind() ];
                         }
@@ -218 +225 @@
                                 GuardValue( inFunctionType );
                                 inFunctionType = true;
-                                std::list< Type* > returnTypes = getTypes( functionType->get_returnVals() );
+                                std::list< Type* > returnTypes = getTypes( functionType->returnVals );
                                 acceptAll( returnTypes, *visitor );
                                 mangleName << "_";
-                                std::list< Type* > paramTypes = getTypes( functionType->get_parameters() );
+                                std::list< Type* > paramTypes = getTypes( functionType->parameters );
                                 acceptAll( paramTypes, *visitor );
                                 mangleName << "_";
@@ -229 +236 @@
                                 printQualifiers( refType );
 
-                                mangleName << ( refType->get_name().length() + prefix.length() ) << prefix << refType->get_name();
+                                mangleName << ( refType->name.length() + prefix.length() ) << prefix << refType->name;
 
                                 if ( mangleGenericParams ) {
-                                        std::list< Expression* >& params = refType->get_parameters();
+                                        std::list< Expression* >& params = refType->parameters;
                                         if ( ! params.empty() ) {
                                                 mangleName << "_";
                                                 for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
                                                         TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
-                                                        assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
-                                                        maybeAccept( paramType->get_type(), *visitor );
+                                                        assertf(paramType, "Aggregate parameters should be type expressions: %s", toCString(*param));
+                                                        maybeAccept( paramType->type, *visitor );
                                                 }
                                                 mangleName << "_";

src/SymTab/Validate.cc

@@ -49 +49 @@
 #include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
 #include "Common/GC.h"                 // for new_static_root, register_static_root
+#include "ControlStruct/Mutate.h"      // for ForExprMutator
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
@@ -77 +78 @@
 class SwitchStmt;
 
-
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
 
@@ -275 +275 @@
                 Concurrency::applyKeywords( translationUnit );
                 acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
+                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
                 Concurrency::implementMutexFuncs( translationUnit );