Try using source-based code coverage

Author: coolreader18

.github/workflows/cron-ci.yaml

@@ -27,12 +27,12 @@ jobs:
         with:
           toolchain: nightly
           override: true
+          components: llvm-tools-preview
       - uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --verbose
+          args: --release --verbose
         env:
-          CARGO_INCREMENTAL: '0'
           RUSTC_WRAPPER: './scripts/codecoverage-rustc-wrapper.sh'
       - uses: actions/setup-python@v1
         with:
@@ -49,17 +49,23 @@ jobs:
         working-directory: ./extra_tests
         env:
           RUSTPYTHON_TESTS_NOBUILD: 'true'
-          RUSTPYTHON_DEBUG: 'true'
+          LLVM_PROFILE_FILE: 'snippet-%p.profraw'
       - name: run cpython tests
-        run: target/debug/rustpython -m test -v
+        run: target/release/rustpython -m test -v
         env:
           RUSTPYTHONPATH: ${{ github.workspace }}/Lib
-      - uses: actions-rs/grcov@v0.1
-        id: coverage
+          LLVM_PROFILE_FILE: 'regrtest.profraw'
+      - name: prepare code coverage data
+        run: |
+          rusttool() {
+            local tool=$1; shift; "$(rustc --print target-libdir)/../bin/llvm-$tool" "$@"
+          }
+          rusttool profdata merge extra_tests/snippet-*.profraw regrtest.profraw --output codecov.profdata
+          rusttool cov export --instr-profile codecov.profdata target/release/rustpython >codecov.lcov
       - name: upload to Codecov
         uses: codecov/codecov-action@v1
         with:
-          file: ${{ steps.coverage.outputs.report }}
+          file: ./codecov.lcov
 
   testdata:
     name: Collect regression test data

scripts/codecoverage-rustc-wrapper.sh

@@ -14,7 +14,7 @@ get_crate_name() {
 
 case $(get_crate_name "$@") in
   rustpython_*|rustpython)
-    EXTRA=(-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests) # -Cpanic=abort
+    EXTRA=(-Zinstrument-coverage)
     ;;
 
   *) EXTRA=() ;;