fix(compiler): Better #line attribute generation (#116)

.github/workflows/build.yml

@@ -107,7 +107,7 @@ jobs:
       - name: Install Tree-sitter (with runtime)
         run: |
           npm install -g tree-sitter-cli
-          curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.23.0.tar.gz | tar -xz
+          curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.24.2.tar.gz | tar -xz
           cd tree-sitter-*
           make
           sudo make install
@@ -146,7 +146,7 @@ jobs:
       - name: Install Tree-sitter (with runtime)
         run: |
           npm install -g tree-sitter-cli
-          curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.23.0.tar.gz | tar -xz
+          curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.24.2.tar.gz | tar -xz
           cd tree-sitter-*
           make
           sudo make install

.github/workflows/docs.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install Tree-sitter (with runtime)
         run: |
           npm install -g tree-sitter-cli
-          curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.23.0.tar.gz | tar -xz
+          curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.24.2.tar.gz | tar -xz
           cd tree-sitter-*
           make -j8
           sudo make install

Dockerfile

@@ -17,7 +17,7 @@ RUN mkdir -p /etc/apt/keyrings && \
 RUN cargo install tree-sitter-cli
 
 WORKDIR /alumina/deps
-RUN curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.23.0.tar.gz | tar -xz
+RUN curl -fsSL https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.24.2.tar.gz | tar -xz
 RUN cd tree-sitter-* && make -j8 && make install && ldconfig
 RUN curl -fsSL https://github.com/ianlancetaylor/libbacktrace/archive/master.tar.gz | tar -xz
 RUN cd libbacktrace-* && ./configure && make -j8 && make install

Makefile

@@ -128,7 +128,7 @@ endif
 ## ----------------------------- Minicoro ------------------------------
 
 $(BUILD_DIR)/minicoro.o: common/minicoro/minicoro.h
-	$(CC) $(CFLAGS) -DMINICORO_IMPL -xc -c $^ -o $@
+	$(CC) $(CFLAGS) -DMINICORO_IMPL -DNDEBUG -xc -c $^ -o $@
 
 ## --------------------------- Stdlib tests ----------------------------
 

docs/lang_guide.md

@@ -1374,7 +1374,7 @@ impl FancyInt {
 }
 
 fn sum<T: Additive<T>>(slice: &[T]) -> T {
-    let mut result = T::zero();
+    let result = T::zero();
     for item in slice {
         result = result.add(item);
     }
@@ -1794,9 +1794,10 @@ mod tests {
     }
 
     #[test]
-    #[test::should_panic]
     fn test_panic() {
-        panic!("oops");
+        test::assert_panics!({
+            panic!("oops");
+        });
     }
 }
 ```

src/alumina-boot/Cargo.toml

@@ -21,7 +21,7 @@ clap = { version = "4", features = ["derive", "env"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 alumina-boot-macros = { path = "../alumina-boot-macros" }
-tree-sitter = "0.23.0"
+tree-sitter = "0.24.2"
 bumpalo = "3"
 thiserror = "1"
 indexmap = "2"

src/alumina-boot/src/ast/mod.rs

@@ -843,6 +843,7 @@ pub enum Attribute<'ast> {
     Packed(usize),
     TupleCall,
     ConstOnly,
+    ReturnsTwice,
     NoConst,
     Diagnostic(Diagnostic),
     Transparent,

src/alumina-boot/src/codegen/functions.rs

@@ -56,6 +56,10 @@ pub fn write_function_signature<'ir, 'gen>(
         attributes = format!("__attribute__((cold)) {}", attributes);
     }
 
+    if item.attributes.contains(&Attribute::ReturnsTwice) {
+        attributes = format!("__attribute__((returns_twice)) {}", attributes);
+    }
+
     if item.return_type.is_never() {
         attributes = format!("_Noreturn {}", attributes);
     }
@@ -311,6 +315,18 @@ impl<'ir, 'gen> FunctionWriter<'ir, 'gen> {
         Ok(())
     }
 
+    fn write_line_directive(&mut self, span: Span, trailing_endline: bool) {
+        if let Some(filename) = self.ctx.global_ctx.diag().get_file_path(span.file) {
+            w!(
+                self.fn_bodies,
+                "\n#line {} {:?}{}",
+                span.line + 1,
+                filename.display(),
+                if trailing_endline { "\n" } else { "" }
+            );
+        }
+    }
+
     pub fn write_expr(
         &mut self,
         diag: &DiagnosticsStack,
@@ -323,23 +339,17 @@ impl<'ir, 'gen> FunctionWriter<'ir, 'gen> {
 
         if self.debug_info {
             if let Some(span) = expr.span.map(|s| self.ctx.global_ctx.diag().map_span(s)) {
-                let prev_line = self.last_span.map(|s| (s.file, s.line + 1));
-                if prev_line != Some((span.file, span.line + 1)) {
-                    if prev_line == Some((span.file, span.line)) {
+                match self.last_span {
+                    Some(s) if s.file == span.file && s.line == span.line => {}
+                    Some(s) if s.file == span.file && s.line + 1 == span.line => {
                         w!(self.fn_bodies, "\n");
-                    } else if let Some(filename) =
-                        self.ctx.global_ctx.diag().get_file_path(span.file)
-                    {
-                        w!(
-                            self.fn_bodies,
-                            "\n#line {} {:?}\n",
-                            span.line + 1,
-                            filename.display()
-                        );
                     }
-                } else {
-                    self.last_span = None;
+                    _ => self.write_line_directive(span, true),
                 }
+
+                self.last_span = Some(span);
+            } else {
+                self.last_span = None;
             }
         }
 
@@ -764,6 +774,13 @@ impl<'ir, 'gen> FunctionWriter<'ir, 'gen> {
         item: &'ir Const<'ir>,
     ) -> Result<(), AluminaError> {
         let _guard = diag.push_span(item.span);
+
+        if self.debug_info {
+            if let Some(span) = item.span.map(|s| self.ctx.global_ctx.diag().map_span(s)) {
+                self.write_line_directive(span, false);
+            }
+        }
+
         w!(
             self.fn_bodies,
             "\nconst static {} {} = ",
@@ -796,6 +813,12 @@ impl<'ir, 'gen> FunctionWriter<'ir, 'gen> {
             return Ok(());
         }
 
+        if self.debug_info {
+            if let Some(span) = item.span.map(|s| self.ctx.global_ctx.diag().map_span(s)) {
+                self.write_line_directive(span, false);
+            }
+        }
+
         write_function_signature(
             self.ctx,
             &mut self.fn_bodies,

src/alumina-boot/src/ir/mono/mod.rs

@@ -145,6 +145,7 @@ impl<'ast, 'ir> MonoCtx<'ast, 'ir> {
             Attribute::LinkName(s) => Attribute::LinkName(s.alloc_on(self.ir)),
             Attribute::Coroutine => Attribute::Coroutine,
             Attribute::Custom(v) => Attribute::Custom(self.map_custom_attribute(v)),
+            Attribute::ReturnsTwice => Attribute::ReturnsTwice,
         }
     }
 

src/alumina-boot/src/visitors.rs

@@ -551,6 +551,10 @@ impl<'ast, 'src> AluminaVisitor<'src> for AttributeVisitor<'ast, 'src> {
                 check_duplicate!(Attribute::Export);
                 self.attributes.push(Attribute::Export);
             }
+            "returns_twice" => {
+                check_duplicate!(Attribute::ReturnsTwice);
+                self.attributes.push(Attribute::ReturnsTwice);
+            }
             "thread_local" => {
                 check_duplicate!(Attribute::ThreadLocal);
                 // We can skip thread-local on programs that are compiled with threads

sysroot/std/cmp.alu

@@ -88,8 +88,8 @@ protocol DefaultEquatable<Self> {
                     }
                 } else {
                     compile_fail!(
-                        "field {} is not automatically equatable",
-                        ty.fields().(i).name()
+                        "field {} of {} is not equated automatically",
+                        ty.fields().(i).name(), ty.debug_name()
                     );
                 }
             }
@@ -98,7 +98,7 @@ protocol DefaultEquatable<Self> {
         } else when ty.is_enum() {
             lhs == rhs
         } else {
-            compile_fail!("type cannot be automatically hashed")
+            compile_fail!("type {} cannot be equated automatically", ty.debug_name());
         }
     }
 
@@ -244,15 +244,15 @@ protocol LexicographicComparable<Self> {
                     }
                 } else {
                     compile_fail!(
-                        "field {} is not automatically comparable",
-                        ty.fields().(i).name()
+                        "field {} of {} cannot be compared automatically",
+                        ty.fields().(i).name(), ty.debug_name()
                     );
                 }
             }
 
             Ordering::Equal
         } else {
-            compile_fail!("type cannot be lexicographically compared")
+            compile_fail!("type {} cannot be compared automatically", ty.debug_name());
         }
     }