From 9ed13b91cfe8b3f79154cbcf7024da7ebc845ff0 Mon Sep 17 00:00:00 2001 From: Michael Baikov Date: Mon, 14 Oct 2024 18:05:24 -0400 Subject: [PATCH 1/2] Range is not inclusive, so we must shift end by one --- src/asm.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/asm.rs b/src/asm.rs index 9091198..ceb2a2b 100644 --- a/src/asm.rs +++ b/src/asm.rs @@ -293,7 +293,8 @@ fn scan_constant( + body[start + 1..] .iter() .take_while(|s| matches!(s, Statement::Directive(Directive::Data(_, _)))) - .count(); + .count() + + 1; Some(URange { start, end }) } From 88fcb7f9551c2ffdd6a68813cfba1630d5a5660f Mon Sep 17 00:00:00 2001 From: Michael Baikov Date: Mon, 14 Oct 2024 18:11:55 -0400 Subject: [PATCH 2/2] And add tests for constants specifically --- .github/workflows/check-and-lint.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-and-lint.yaml b/.github/workflows/check-and-lint.yaml index 0bd1624..1d30d93 100644 --- a/.github/workflows/check-and-lint.yaml +++ b/.github/workflows/check-and-lint.yaml @@ -212,12 +212,12 @@ jobs: - name: merged functions simd shell: bash if: ${{ !cancelled() && matrix.os != 'macos-latest' }} # uses x86 primops - run: ./.github/check.sh --manifest-path sample_merged/Cargo.toml sample_merged::merged_0 + run: ./.github/check.sh --manifest-path sample_merged/Cargo.toml sample_merged::merged_0 --include-constants - name: merged functions simd shell: bash if: ${{ !cancelled() && matrix.os != 'macos-latest' }} # uses x86 primops - run: ./.github/check.sh --manifest-path sample_merged/Cargo.toml sample_merged::merged_1 + run: ./.github/check.sh --manifest-path sample_merged/Cargo.toml sample_merged::merged_1 --include-constants - name: merged functions extern c shell: bash