Changeset 5d3d281 for src/Validate/Autogen.cpp

Timestamp:

Dec 11, 2024, 7:32:08 PM (7 days ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

36dfdac

Parents:

e797179

Message:

Remove autogen forward declarations, which are never needed, and cause warnings about static declarations without definitions.

Intended to fix the failing test from previous commit.

Autogen forward declarations are never needed because they do not depend on each other, much less with mutual recursion.

Consequences:

• tests/.expect/(5 tests).(3 archs).txt: Accept generated code that lacks autogen forward declarations
• libcfa/src/concurrency/thread.*: Remove unused dependency on destructor from constructor (via thrd_start), by splitting trait is_thread with is_basic_thread

File:

• src/Validate/Autogen.cpp (modified) (13 diffs)

src/Validate/Autogen.cpp

@@ -71 +71 @@
 class FuncGenerator {
 public:
-        std::list<ast::ptr<ast::Decl>> forwards;
         std::list<ast::ptr<ast::Decl>> definitions;
 
@@ -90 +89 @@
         virtual void genStandardFuncs();
         void produceDecl( const ast::FunctionDecl * decl );
-        void produceForwardDecl( const ast::FunctionDecl * decl );
 
         const CodeLocation& getLocation() const { return getDecl()->location; }
@@ -196 +194 @@
 
         bool shouldAutogen() const final { return true; }
-        void generateAndPrependDecls( std::list<ast::ptr<ast::Decl>> & );
-        void genForwards();
 private:
         void genFuncBody( ast::FunctionDecl * decl ) final;
@@ -245 +241 @@
         ast::EnumInstType enumInst( enumDecl->name );
         enumInst.base = enumDecl;
-        if ( enumDecl->isCfa ) {
-                EnumFuncGenerator gen( enumDecl, &enumInst, functionNesting );
-                gen.generateAndPrependDecls( declsToAddBefore );
-        }
-
-        EnumFuncGenerator gen2( enumDecl, &enumInst, functionNesting );
-        gen2.generateAndAppendFunctions( declsToAddAfter );
+
+        EnumFuncGenerator gen( enumDecl, &enumInst, functionNesting );
+        gen.generateAndAppendFunctions( declsToAddAfter );
 }
 
@@ -320 +312 @@
 
         // Now export the lists contents.
-        decls.splice( decls.end(), forwards );
+//      decls.splice( decls.end(), forwards );    // mlb wip: delete me
         decls.splice( decls.end(), definitions );
 }
@@ -329 +321 @@
 
         definitions.push_back( decl );
-}
-
-/// Make a forward declaration of the decl and add it to forwards.
-void FuncGenerator::produceForwardDecl( const ast::FunctionDecl * decl ) {
-        if (0 != functionNesting) return;
-        ast::FunctionDecl * fwd =
-                ( decl->stmts ) ? ast::asForward( decl ) : ast::deepCopy( decl ) ;
-        fwd->fixUniqueId();
-        forwards.push_back( fwd );
 }
 
@@ -483 +466 @@
         for ( auto & generator : standardProtos ) {
                 ast::FunctionDecl * decl = (this->*generator)();
-                produceForwardDecl( decl );
                 genFuncBody( decl );
                 if ( CodeGen::isAssignment( decl->name ) ) {
@@ -505 +487 @@
                         continue;
                 }
-                produceForwardDecl( ctor );
                 makeFieldCtorBody( decl->members.begin(), decl->members.end(), ctor );
                 produceDecl( ctor );
@@ -667 +648 @@
                         return;
                 }
-                produceForwardDecl( ctor );
                 auto params = ctor->params;
                 auto dstParam = params.front().strict_as<ast::ObjectDecl>();
@@ -695 +675 @@
                 // Add unused attribute to parameter to silence warnings.
                 addUnusedAttribute( params.front() );
-
-                // Just an extra step to make the forward and declaration match.
-                if ( forwards.empty() ) return;
-                ast::FunctionDecl * fwd = strict_dynamic_cast<ast::FunctionDecl *>(
-                        forwards.back().get_and_mutate() );
-                addUnusedAttribute( fwd->params.front() );
         }
 }
@@ -718 +692 @@
 }
 
-void EnumFuncGenerator::generateAndPrependDecls( std::list<ast::ptr<ast::Decl>> & decls ) {
-        genForwards();
-        decls.splice( decls.end(), forwards );
-}
-
-void EnumFuncGenerator::genForwards() {
-        forwards.push_back( ast::asForward(decl) );
-
-        ast::FunctionDecl *(FuncGenerator::*standardProtos[4])() const = {
-                &EnumFuncGenerator::genCtorProto, &EnumFuncGenerator::genCopyProto,
-                &EnumFuncGenerator::genDtorProto, &EnumFuncGenerator::genAssignProto };
-
-        for ( auto & generator: standardProtos) {
-                ast::FunctionDecl * decl = (this->*generator)();
-                produceForwardDecl( decl );
-        }
-}
-
 void EnumFuncGenerator::genStandardFuncs() {
         // do everything FuncGenerator does except not make ForwardDecls
@@ -744 +700 @@
         for ( auto & generator : standardProtos ) {
                 ast::FunctionDecl * decl = (this->*generator)();
-                produceForwardDecl( decl );
                 genFuncBody( decl );
                 if ( CodeGen::isAssignment( decl->name ) ) {
@@ -794 +749 @@
                 // Just add unused attribute to parameter to silence warnings.
                 addUnusedAttribute( params.front() );
-
-                // Just an extra step to make the forward and declaration match.
-                if ( forwards.empty() ) return;
-                ast::FunctionDecl * fwd = strict_dynamic_cast<ast::FunctionDecl *>(
-                        forwards.back().get_and_mutate() );
-                addUnusedAttribute( fwd->params.front() );
         }
 }