Merge remote-tracking branch 'origin/trunk' into macros_floats_support

Author: ivanaivanovska

MODULE.bazel

@@ -116,6 +116,7 @@ http_archive(
         "@carbon//bazel/llvm_project:0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch",
         "@carbon//bazel/llvm_project:0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch",
         "@carbon//bazel/llvm_project:0003_Comment_out_unloaded_proto_library_dependencies.patch",
+        "@carbon//bazel/llvm_project:0004_Introduce_basic_sources_exporting_for_libunwind.patch",
     ],
     strip_prefix = "llvm-project-{0}".format(llvm_project_version),
     urls = ["https://github.com/llvm/llvm-project/archive/{0}.tar.gz".format(llvm_project_version)],

bazel/llvm_project/0004_Introduce_basic_sources_exporting_for_libunwind.patch

@@ -0,0 +1,34 @@
+Commit ID: a79f1facf56cc5772557cdb09d811aa11a22e43b
+Change ID: sxspxmonsuvqzuvxvrvorlumwpwromsv
+Author   : Chandler Carruth <[email protected]> (2025-09-25 22:55:26)
+Committer: Chandler Carruth <[email protected]> (2025-11-17 09:59:25)
+
+    Introduce basic sources exporting for libunwind
+
+    This exports the source files directly so that they can be used to build
+    this runtime library on demand.
+
+diff --git a/utils/bazel/llvm-project-overlay/libunwind/BUILD.bazel b/utils/bazel/llvm-project-overlay/libunwind/BUILD.bazel
+index c9fdc819c0..7d734c5a06 100644
+--- a/utils/bazel/llvm-project-overlay/libunwind/BUILD.bazel
++++ b/utils/bazel/llvm-project-overlay/libunwind/BUILD.bazel
+@@ -21,3 +21,19 @@
+     ],
+     strip_include_prefix = "include",
+ )
++
++filegroup(
++    name = "libunwind_hdrs",
++    srcs = glob(["include/**/*.h"]),
++)
++
++filegroup(
++    name = "libunwind_srcs",
++    srcs = glob([
++        "src/*.cpp",
++        "src/*.hpp",
++        "src/*.c",
++        "src/*.h",
++        "src/*.S",
++    ]),
++)

common/command_line.h

@@ -813,7 +813,7 @@ auto OneOfArgBuilder::OneOfImpl(const OneOfValueT<U> (&input_values)[N],
   new (&arg()->value_action) Arg::ValueActionT(
       [values, match](const Arg& arg, llvm::StringRef value_string) -> bool {
         for (auto [value, arg_value_string] :
-             llvm::zip(values, arg.value_strings)) {
+             llvm::zip_equal(values, arg.value_strings)) {
           if (value_string == arg_value_string) {
             match(value);
             return true;

examples/advent2024/day10_part1.carbon

@@ -38,7 +38,7 @@ class Reachable {
     return var;
   }
 
-  fn AddLevel[addr self: Self*](terrain: Terrain, level: i32) {
+  fn AddLevel[ref self: Self](terrain: Terrain, level: i32) {
     let adj: array((i32, i32), 4) = ((-1, 0), (0, -1), (1, 0), (0, 1));
     for (y: i32 in Core.Range(43)) {
       for (x: i32 in Core.Range(43)) {
@@ -51,11 +51,11 @@ class Reachable {
             if (adj_x >= 0 and adj_x < 43 and
                 adj_y >= 0 and adj_y < 43 and
                 terrain.height[adj_x][adj_y] == level - 1) {
-              reach = reach | self->trailheads[adj_x][adj_y];
+              reach = reach | self.trailheads[adj_x][adj_y];
             }
             ++i;
           }
-          self->trailheads[x][y] = reach;
+          self.trailheads[x][y] = reach;
         }
       }
     }

examples/advent2024/day10_part2.carbon

@@ -23,7 +23,7 @@ class PathsToTop {
     return var;
   }
 
-  fn AddLevel[addr self: Self*](terrain: Terrain, level: i32) -> i64 {
+  fn AddLevel[ref self: Self](terrain: Terrain, level: i32) -> i64 {
     var total: i64 = 0;
     let adj: array((i32, i32), 4) = ((-1, 0), (0, -1), (1, 0), (0, 1));
     for (y: i32 in Core.Range(43)) {
@@ -37,10 +37,10 @@ class PathsToTop {
             if (adj_x >= 0 and adj_x < 43 and
                 adj_y >= 0 and adj_y < 43 and
                 terrain.height[adj_x][adj_y] == level + 1) {
-              paths += self->paths[adj_x][adj_y];
+              paths += self.paths[adj_x][adj_y];
             }
           }
-          self->paths[x][y] = paths;
+          self.paths[x][y] = paths;
           total += paths;
         }
       }

examples/advent2024/day12_common.carbon

@@ -42,13 +42,13 @@ class DisjointSetForest {
     return var;
   }
 
-  fn Lookup[addr self: Self*](a: i32) -> i32 {
-    let next: i32 = self->nodes[a].next;
+  fn Lookup[ref self: Self](a: i32) -> i32 {
+    let next: i32 = self.nodes[a].next;
     if (next == a) {
       return next;
     }
-    let resolved: i32 = self->Lookup(next);
-    self->nodes[a].next = resolved;
+    let resolved: i32 = self.Lookup(next);
+    self.nodes[a].next = resolved;
     return resolved;
   }
 
@@ -60,22 +60,22 @@ class DisjointSetForest {
     return self.nodes[canon_a].weight;
   }
 
-  fn Union[addr self: Self*](a: i32, b: i32) {
-    let canon_b: i32 = self->Lookup(b);
-    self->Set(a, canon_b);
-    ++self->nodes[canon_b].unions;
+  fn Union[ref self: Self](a: i32, b: i32) {
+    let canon_b: i32 = self.Lookup(b);
+    self.Set(a, canon_b);
+    ++self.nodes[canon_b].unions;
   }
 
-  private fn Set[addr self: Self*](a: i32, canon_b: i32) {
-    let next: i32 = self->nodes[a].next;
-    self->nodes[a].next = canon_b;
+  private fn Set[ref self: Self](a: i32, canon_b: i32) {
+    let next: i32 = self.nodes[a].next;
+    self.nodes[a].next = canon_b;
     if (next == a) {
       if (a != canon_b) {
-        self->nodes[canon_b].weight += self->nodes[a].weight;
-        self->nodes[canon_b].unions += self->nodes[a].unions;
+        self.nodes[canon_b].weight += self.nodes[a].weight;
+        self.nodes[canon_b].unions += self.nodes[a].unions;
       }
     } else {
-      self->Set(next, canon_b);
+      self.Set(next, canon_b);
     }
   }
 

examples/advent2024/day2_part1.carbon

@@ -15,23 +15,23 @@ class ReportState {
             .increasing = false, .safe_so_far = true};
   }
 
-  fn Add[addr self: Self*](level: i32) {
-    ++self->levels_so_far;
-    if (self->levels_so_far >= 2) {
-      if (not IsSafeDelta(self->previous, level)) {
+  fn Add[ref self: Self](level: i32) {
+    ++self.levels_so_far;
+    if (self.levels_so_far >= 2) {
+      if (not IsSafeDelta(self.previous, level)) {
         // Difference is zero or too large.
-        self->safe_so_far = false;
+        self.safe_so_far = false;
       }
 
-      var is_increase: bool = level > self->previous;
-      if (self->levels_so_far == 2) {
-        self->increasing = is_increase;
-      } else if (is_increase != self->increasing) {
+      var is_increase: bool = level > self.previous;
+      if (self.levels_so_far == 2) {
+        self.increasing = is_increase;
+      } else if (is_increase != self.increasing) {
         // Not monotone.
-        self->safe_so_far = false;
+        self.safe_so_far = false;
       }
     }
-    self->previous = level;
+    self.previous = level;
   }
 
   var levels_so_far: i32;

examples/advent2024/day2_part2.carbon

@@ -12,11 +12,11 @@ import library "io_utils";
 // A three-element sliding window of recent levels.
 class Window {
   fn Make() -> Window { return {.data = (0,0,0), .size = 0}; }
-  fn Add[addr self: Self*](n: i32) {
-    self->data[2] = self->data[1];
-    self->data[1] = self->data[0];
-    self->data[0] = n;
-    ++self->size;
+  fn Add[ref self: Self](n: i32) {
+    self.data[2] = self.data[1];
+    self.data[1] = self.data[0];
+    self.data[0] = n;
+    ++self.size;
   }
 
   var data: array(i32, 3);
@@ -36,7 +36,7 @@ class ReportState {
             .removable_double_bad_edge = false};
   }
 
-  fn OnAdd[addr self: Self*](window: Window) {
+  fn OnAdd[ref self: Self](window: Window) {
     if (window.size < 2) {
       return;
     }
@@ -47,39 +47,39 @@ class ReportState {
     let c: i32 = window.data[0];
 
     // Keep a count of the unsafe edges.
-    let b_to_c: bool = IsSafe(window.data[1], window.data[0], self->increasing);
+    let b_to_c: bool = IsSafe(window.data[1], window.data[0], self.increasing);
     if (not b_to_c) {
-      ++self->bad_edges;
+      ++self.bad_edges;
 
       // We have a removable single bad edge if the first edge is unsafe.
       if (window.size == 2) {
-        self->removable_single_bad_edge = true;
+        self.removable_single_bad_edge = true;
       }
     }
 
     if (window.size >= 3) {
       let a: i32 = window.data[2];
-      if (IsSafe(a, c, self->increasing)) {
-        let lhs: bool = IsSafe(a, b, self->increasing);
+      if (IsSafe(a, c, self.increasing)) {
+        let lhs: bool = IsSafe(a, b, self.increasing);
         let rhs: bool = b_to_c;
         if (not lhs and not rhs) {
           // If a->b and b->c are both unsafe, but a->c is safe,
           // then we have a removable double bad edge.
-          self->removable_double_bad_edge = true;
+          self.removable_double_bad_edge = true;
         } else if (not lhs or not rhs) {
           // If a->b or b->c is unsafe but a->c is safe, then we have a
           // removable single bad edge.
-          self->removable_single_bad_edge = true;
+          self.removable_single_bad_edge = true;
         }
       }
     }
   }
 
-  fn OnFinish[addr self: Self*](window: Window) {
+  fn OnFinish[ref self: Self](window: Window) {
     if (window.size >= 2 and
-        not IsSafe(window.data[1], window.data[0], self->increasing)) {
+        not IsSafe(window.data[1], window.data[0], self.increasing)) {
       // We have a removable single bad edge if the last edge is unsafe.
-      self->removable_single_bad_edge = true;
+      self.removable_single_bad_edge = true;
     }
   }
 

examples/advent2024/day5_common.carbon

@@ -61,9 +61,9 @@ class PageList {
     return var;
   }
 
-  fn Add[addr self: Self*](page: i32) {
-    self->pages[self->num_pages] = page;
-    ++self->num_pages;
+  fn Add[ref self: Self](page: i32) {
+    self.pages[self.num_pages] = page;
+    ++self.num_pages;
   }
 
   fn FollowsRules[self: Self](rules: Rules) -> bool {
@@ -87,12 +87,12 @@ class PageList {
     return true;
   }
 
-  fn ExtractPossibleFirstPage[addr self: Self*](rules: Rules) -> i32 {
-    for (i: i32 in Core.Range(self->num_pages)) {
-      var page: i32 = self->pages[i];
-      if (self->IsPossibleFirstPage(rules, page)) {
-        self->pages[i] = self->pages[self->num_pages - 1];
-        --self->num_pages;
+  fn ExtractPossibleFirstPage[ref self: Self](rules: Rules) -> i32 {
+    for (i: i32 in Core.Range(self.num_pages)) {
+      var page: i32 = self.pages[i];
+      if (self.IsPossibleFirstPage(rules, page)) {
+        self.pages[i] = self.pages[self.num_pages - 1];
+        --self.num_pages;
         return page;
       }
     }

examples/advent2024/day6_common.carbon

@@ -57,34 +57,34 @@ class Maze {
     return var;
   }
 
-  fn Step[addr self: Self*]() -> bool {
-    let x: i32 = self->loc.0 + self->dir.0;
-    let y: i32 = self->loc.1 + self->dir.1;
+  fn Step[ref self: Self]() -> bool {
+    let x: i32 = self.loc.0 + self.dir.0;
+    let y: i32 = self.loc.1 + self.dir.1;
     if (x < 0 or x >= 130 or y < 0 or y >= 130) {
       return false;
     }
-    if (self->data[x][y] == Wall()) {
+    if (self.data[x][y] == Wall()) {
       // TODO: Should this work?
-      // self->dir = (-self->dir.1, self->dir.0);
-      let d: (i32, i32) = self->dir;
-      self->dir = (-d.1, d.0);
+      // self.dir = (-self.dir.1, self.dir.0);
+      let d: (i32, i32) = self.dir;
+      self.dir = (-d.1, d.0);
     } else {
-      self->loc = (x, y);
-      self->data[x][y] = Visited();
+      self.loc = (x, y);
+      self.data[x][y] = Visited();
     }
     return true;
   }
 
-  fn AddObstacle[addr self: Self*]() -> bool {
-    let x: i32 = self->loc.0 + self->dir.0;
-    let y: i32 = self->loc.1 + self->dir.1;
+  fn AddObstacle[ref self: Self]() -> bool {
+    let x: i32 = self.loc.0 + self.dir.0;
+    let y: i32 = self.loc.1 + self.dir.1;
     if (x < 0 or x >= 130 or y < 0 or y >= 130) {
       return false;
     }
-    if (self->data[x][y] != Empty()) {
+    if (self.data[x][y] != Empty()) {
       return false;
     }
-    self->data[x][y] = Wall();
+    self.data[x][y] = Wall();
     return true;
   }