Changeset a9ce782 for src

Timestamp:

Feb 7, 2026, 1:40:26 PM (6 days ago)

Author:

Matthew Au-Yeung <mw2auyeu@…>

Branches:

stuck-waitfor-destruct

Parents:

c7d106a

git-author:

Matthew Au-Yeung <mw2auyeu@…> (02/07/26 13:40:05)

git-committer:

Matthew Au-Yeung <mw2auyeu@…> (02/07/26 13:40:26)

Message:

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

Location:

src

Files:

• Concurrency/Keywords.cpp (modified) (7 diffs)
• Concurrency/MutexFuncHash.hpp (added)
• 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"
@@ -1077 +1078 @@
 
         // In reverse order:
-        // monitor_dtor_guard_t __guard = { __monitor, func, false };
+        // monitor_dtor_guard_t __guard = { __monitor, func, func_id, false };
         mutBody->push_front(
                 new ast::DeclStmt( location, new ast::ObjectDecl(
@@ -1094 +1095 @@
                                                         generic_func,
                                                         ast::ExplicitCast ) ),
+                                        new ast::SingleInit( location,
+                                                Concurrency::hashMangleExpr( location, func ) ),
                                         new ast::SingleInit( location,
                                                 ast::ConstantExpr::from_bool( location, false ) ),
@@ -1175 +1178 @@
                                                 ast::ExplicitCast
                                         ) ),
+                                        new ast::SingleInit( location,
+                                                Concurrency::hashMangleExpr( location, func ) ),
                                 },
                                 {},
@@ -1475 +1480 @@
 
 ast::CompoundStmt * MutexKeyword::addThreadDtorStatements(
-                const ast::FunctionDecl*, const ast::CompoundStmt * body,
+                const ast::FunctionDecl* func, const ast::CompoundStmt * body,
                 const std::vector<const ast::DeclWithType * > & args ) {
         assert( args.size() == 1 );
@@ -1487 +1492 @@
         const CodeLocation & location = mutBody->location;
 
-        // thread_dtor_guard_t __guard = { this, intptr( 0 ) };
+        // thread_dtor_guard_t __guard = { this, func_id, intptr( 0 ) };
         mutBody->push_front( new ast::DeclStmt(
                 location,
@@ -1500 +1505 @@
                                                 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"
@@ -331 +332 @@
                 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 @@
         }
 
-        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;
+        return genProto( "^?{}", { dst }, {} );
 }