Changeset 58a4cde

Timestamp:

Aug 6, 2025, 10:47:44 AM (2 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

81e1984b

Parents:

d7a2de1 (diff), b2e4a73 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• Jenkinsfile (modified) (2 diffs)
• doc/proposals/modules-alvin/proposal.md (added)
• libcfa/src/heap.cfa (modified) (2 diffs)
• src/ResolvExpr/SatisfyAssertions.cpp (modified) (3 diffs)

Jenkinsfile

@@ -320 +320 @@
                         // Use only generic clang/gcc here because of unknown version numbers on different architectures.
                         case 'clang':
-                                this.Compiler = new CC_Desc('clang', 'clang++', 'gcc', '-flto=thin -flto-jobs=0')
+                                this.Compiler = new CC_Desc('clang', 'clang++', 'gcc-11', '-flto=thin -flto-jobs=0')
                         break
                         default :
@@ -379 +379 @@
                                         description: 'Which compiler to use',                   \
                                         name: 'Compiler',                                       \
-                                        choices: 'gcc-9\ngcc-10\ngcc-11\ngcc-12gcc-13gcc-14\nclang',    \
+                                        choices: 'gcc-9\ngcc-10\ngcc-11\ngcc-12\ngcc-13\ngcc-14\nclang', \
                                         defaultValue: 'gcc',                                    \
                                 ],                                                              \

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  7 10:14:47 2024
-// Update Count     : 1646
+// Last Modified On : Thu May 15 16:47:35 2025
+// Update Count     : 1647
 //
 
@@ -974 +974 @@
         if ( likely( tsize < heapMaster.mmapStart ) ) {         // small size => sbrk
                 size_t bucket;
+                // Find smallest bucket that is >= the allocation side.
                 #ifdef FASTLOOKUP
                 if ( likely( tsize < LookupSizes ) ) bucket = lookup[tsize];

src/ResolvExpr/SatisfyAssertions.cpp

@@ -10 +10 @@
 // Created On       : Mon Jun 10 17:45:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  2 18:15:51 2024
-// Update Count     : 5
+// Last Modified On : Thu Jul 31 18:04:31 2025
+// Update Count     : 6
 //
 
@@ -456 +456 @@
                         // should a limit be imposed? worst case here is O(n^2) but very unlikely to happen.
 
-                        for (unsigned resetCount = 0; ; ++resetCount) {
+                        for ( ;; ) {
                                 ast::AssertionList next;
                                 // make initial pass at matching assertions
@@ -475 +475 @@
                                         } else if ( result == AssertionResult::Skip ) {
                                                 next.emplace_back(assn);
-                                                // goto nextSat;
                                         }
                                 }