Changeset 6018ddb

Timestamp:

Feb 25, 2026, 12:52:06 AM (17 hours ago)

Author:

Matthew Au-Yeung <mw2auyeu@…>

Branches:

stuck-waitfor-destruct

Children:

a0548c2

Parents:

2b3ebe5

git-author:

Matthew Au-Yeung <mw2auyeu@…> (02/25/26 00:31:10)

git-committer:

Matthew Au-Yeung <mw2auyeu@…> (02/25/26 00:52:06)

Message:

Revert "cleanup and add tests"

This reverts commit a56d544a48fa37aa9352321253b32a7ddc0159c7.

Files:

• src/AST/Expr.cpp (modified) (1 diff)
• src/AST/Expr.hpp (modified) (1 diff)
• src/Concurrency/MutexFuncHash.hpp (modified) (3 diffs)
• tests/.expect/linkoncedestructor.txt (moved) (moved from tests/concurrency/waitfor/.expect/autogen_destructor.txt )
• tests/Makefile.am (modified) (2 diffs)
• tests/concurrency/waitfor/.expect/static_inline.txt (deleted)
• tests/concurrency/waitfor/gendestructor.hfa (modified) (1 diff)

src/AST/Expr.cpp

@@ -264 +264 @@
 }
 
-ConstantExpr * ConstantExpr::from_ulonglong( const CodeLocation & loc, unsigned long long i ) {
-        return new ConstantExpr{
-                loc, new BasicType{ BasicKind::LongLongUnsignedInt }, std::to_string( i ) + "ULL",
-                (unsigned long long)i };
-}
-
 ConstantExpr * ConstantExpr::from_string( const CodeLocation & loc, const std::string & str ) {
         const Type * charType = new BasicType( BasicKind::Char, ast::CV::Const );

src/AST/Expr.hpp

@@ -464 +464 @@
         /// Generates an integer constant of the given unsigned long int.
         static ConstantExpr * from_ulong( const CodeLocation & loc, unsigned long i );
-        /// Generates an integer constant of the given unsigned long long int.
-        static ConstantExpr * from_ulonglong( const CodeLocation & loc, unsigned long long i );
         /// Generates a string constant from the given string (char type, unquoted string).
         static ConstantExpr * from_string( const CodeLocation & loc, const std::string & string );

src/Concurrency/MutexFuncHash.hpp

@@ -18 +18 @@
 #include "AST/Decl.hpp"
 #include "AST/Expr.hpp"
+#include "AST/Type.hpp"
 #include "SymTab/Mangler.hpp"
 
@@ -26 +27 @@
 // since function pointers may differ for static inline functions.
 static inline uint64_t hashMangle( const ast::DeclWithType * decl ) {
-        std::string name = Mangle::mangleType( decl );
+        std::string name = Mangle::mangle( decl );
         uint64_t hash = 14695981039346656037ULL; // FNV offset basis
         for ( char c : name ) {
@@ -35 +36 @@
 }
 
-// Create a ConstantExpr with the hash of the mangled name.
-static inline ast::ConstantExpr * hashMangleExpr( 
-        const CodeLocation & location, const ast::DeclWithType * decl ) {
-        return ast::ConstantExpr::from_ulonglong( location, hashMangle( decl ) );
+// Create a ConstantExpr for the hash with proper ULL suffix to avoid
+// C compiler warnings about large unsigned constants.
+static inline ast::ConstantExpr * hashMangleExpr(
+                const CodeLocation & location, const ast::DeclWithType * decl ) {
+        uint64_t hash = hashMangle( decl );
+        return new ast::ConstantExpr{
+                location,
+                new ast::BasicType{ ast::BasicKind::LongLongUnsignedInt },
+                std::to_string( hash ) + "ull",
+                (unsigned long long)hash };
 }
 

tests/Makefile.am

@@ -119 +119 @@
 .PHONY : concurrency list .validate .test_makeflags
 .INTERMEDIATE : .validate .validate.cfa .test_makeflags
+<<<<<<< HEAD
 EXTRA_PROGRAMS = array-collections/boxed \
         avl_test \
@@ -126 +127 @@
         linking/mangling/anon \
         .dummy_hack # build but do not install
+=======
+EXTRA_PROGRAMS = array-collections/boxed avl_test linkonce linkoncedestructor linking/mangling/anon .dummy_hack # build but do not install
+>>>>>>> parent of a56d544a4 (cleanup and add tests)
 EXTRA_DIST = test.py \
         pybin/__init__.py \

tests/concurrency/waitfor/gendestructor.hfa

@@ -3 +3 @@
 thread MyThread {};
 
-void main(MyThread &t);
+void main(MyThread &t);