Changeset 44940ee for src

Timestamp:

Feb 25, 2026, 12:56:30 AM (4 days ago)

Author:

Matthew Au-Yeung <mw2auyeu@…>

Branches:

stuck-waitfor-destruct

Children:

88bb0b4

Parents:

a0548c2

Message:

Revert "Add a generated hash to fix stuck waitfor comparing static inline mutex destructors"

This reverts commit a30fceb1a73c4ef2bbee39a2b5406da881f51111.

Location:

src

Files:

• Concurrency/Keywords.cpp (modified) (7 diffs)
• Concurrency/MutexFuncHash.hpp (deleted)
• Concurrency/Waitfor.cpp (modified) (2 diffs)
• Validate/Autogen.cpp (modified) (1 diff)

src/Concurrency/Keywords.cpp

@@ -29 +29 @@
 #include "Common/Examine.hpp"
 #include "Common/Utility.hpp"
-#include "Concurrency/MutexFuncHash.hpp"
 #include "Common/UniqueName.hpp"
 #include "ControlStruct/LabelGenerator.hpp"
@@ -1078 +1077 @@
 
         // In reverse order:
-        // monitor_dtor_guard_t __guard = { __monitor, func, func_id, false };
+        // monitor_dtor_guard_t __guard = { __monitor, func, false };
         mutBody->push_front(
                 new ast::DeclStmt( location, new ast::ObjectDecl(
@@ -1095 +1094 @@
                                                         generic_func,
                                                         ast::ExplicitCast ) ),
-                                        new ast::SingleInit( location,
-                                                Concurrency::hashMangleExpr( location, func ) ),
                                         new ast::SingleInit( location,
                                                 ast::ConstantExpr::from_bool( location, false ) ),
@@ -1178 +1175 @@
                                                 ast::ExplicitCast
                                         ) ),
-                                        new ast::SingleInit( location,
-                                                Concurrency::hashMangleExpr( location, func ) ),
                                 },
                                 {},
@@ -1480 +1475 @@
 
 ast::CompoundStmt * MutexKeyword::addThreadDtorStatements(
-                const ast::FunctionDecl* func, const ast::CompoundStmt * body,
+                const ast::FunctionDecl*, const ast::CompoundStmt * body,
                 const std::vector<const ast::DeclWithType * > & args ) {
         assert( args.size() == 1 );
@@ -1492 +1487 @@
         const CodeLocation & location = mutBody->location;
 
-        // thread_dtor_guard_t __guard = { this, func_id, intptr( 0 ) };
+        // thread_dtor_guard_t __guard = { this, intptr( 0 ) };
         mutBody->push_front( new ast::DeclStmt(
                 location,
@@ -1505 +1500 @@
                                                 new ast::CastExpr( location,
                                                         new ast::VariableExpr( location, arg ), argType ) ),
-                                        new ast::SingleInit( location,
-                                                Concurrency::hashMangleExpr( location, func ) ),
                                         new ast::SingleInit(
                                                 location,

src/Concurrency/Waitfor.cpp

@@ -22 +22 @@
 #include "InitTweak/InitTweak.hpp"
 #include "ResolvExpr/Resolver.hpp"
-#include "Concurrency/MutexFuncHash.hpp"
 
 #include "AST/Print.hpp"
@@ -332 +331 @@
                 makeAccStmt( location, acceptables, index, "func",
                         funcExpr, context ),
-                makeAccStmt( location, acceptables, index, "func_id",
-                        Concurrency::hashMangleExpr( location,
-                                variableExpr->var.strict_as<ast::DeclWithType>() ),
-                        context ),
                 makeAccStmt( location, acceptables, index, "data",
                         new ast::VariableExpr( location, monitors ), context ),

src/Validate/Autogen.cpp

@@ -402 +402 @@
         }
 
-        return genProto( "^?{}", { dst }, {} );
+        ast::FunctionDecl * decl = genProto( "^?{}", { dst }, {} );
+        // For concurrent types, remove static storage and inline specifier, and add
+        // cfa_linkonce attribute so the destructor has external linkage with linkonce
+        // semantics. This is required for waitfor to work correctly across translation
+        // units - the function pointer must be the same everywhere, and cfa_linkonce
+        // ensures only one definition survives linking.
+        if ( isConcurrentType() ) {
+                auto mut = ast::mutate( decl );
+                mut->storage = ast::Storage::Classes();
+                mut->funcSpec = ast::Function::Specs();
+                mut->attributes.push_back( new ast::Attribute( "cfa_linkonce" ) );
+        }
+        return decl;
 }