Add scanning for expanded macro calls

Cargo.toml

@@ -52,6 +52,8 @@ ra_ap_project_model = "0.0.185"
 ra_ap_syntax = "0.0.185"
 ra_ap_vfs = "0.0.185"
 ra_ap_cfg = "0.0.185"
+ra_ap_stdx = "0.0.185"
+ra_ap_toolchain = "0.0.185"
 regex = "1.10.6"
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
@@ -67,6 +69,7 @@ home.workspace = true
 csv = "1.3.0"
 threadpool = "1.8.1"
 serde_stacker = "0.1.11"
+ra_ap_text_edit = "0.0.185"
 
 [workspace.dependencies]
 serde_json = { version = "1.0.108", features = ["unbounded_depth"] }

Makefile

@@ -23,9 +23,15 @@ test: checks test-results
 top10: install
 	$(SCAN_ALL) data/crate-lists/top10.csv top10
 
+top10-with-macro: install
+	$(SCAN_ALL) data/crate-lists/top10.csv top10 --expand-macro
+
 top100: install
 	$(SCAN_ALL) data/crate-lists/top100.csv top100 -n 64
 
+top100-with-macro: install
+	$(SCAN_ALL) data/crate-lists/top100.csv top100 -n 64 --expand-macro
+
 top1000: install
 	$(SCAN_ALL) data/crate-lists/top1000.csv top1000 -n 64
 

data/crate-lists/test-crates.csv

@@ -9,6 +9,7 @@ fns-closures
 fnv_minimal
 inline-ex
 libc-ex
+macro_test
 num_cpus_minimal
 parsing-ex
 permissions-ex

data/results/test_all.csv

@@ -1,23 +1,14 @@
 crate, fn_decl, callee, effect, dir, file, line, col
 caller_checked, caller_checked::has_direct_effect, libc::unix::sysconf, [FFI Call], data/test-packages/caller-checked/src, lib.rs, 9, 8
-caller_checked, caller_checked::local_effect, UNKNOWN_METHOD::as_ptr, [UnsafeCall], data/test-packages/caller-checked/src, main.rs, 10, 27
-caller_checked, caller_checked::local_effect, core::ptr::null_mut, [UnsafeCall], data/test-packages/caller-checked/src, main.rs, 12, 12
-caller_checked, caller_checked::local_effect, core::ptr::null_mut, [UnsafeCall], data/test-packages/caller-checked/src, main.rs, 13, 12
-caller_checked, caller_checked::local_effect, core::ptr::null_mut, [UnsafeCall], data/test-packages/caller-checked/src, main.rs, 14, 12
-caller_checked, caller_checked::local_effect, libc::unix::linux_like::linux::gnu::b64::x86_64::not_x32::sysctl, [FFI Call], data/test-packages/caller-checked/src, main.rs, 9, 8
+caller_checked, caller_checked::local_effect, libc::unix::bsd::apple::sysctl, [FFI Call], data/test-packages/caller-checked/src, main.rs, 9, 8
 caller_checked, caller_checked::unsafe_effect, caller_checked::unsafe_effect::x, [PtrDeref], data/test-packages/caller-checked/src, main.rs, 24, 9
 caller_checked, caller_checked::sub::effect, libc::unix::sysconf, [FFI Call], data/test-packages/caller-checked/src, sub.rs, 6, 8
-caller_checked, caller_checked::sub::effect, core::ffi::CStr::from_bytes_with_nul, [UnsafeCall], data/test-packages/caller-checked/src, sub.rs, 7, 29
-caller_checked, caller_checked::sub::effect, UNKNOWN_METHOD::unwrap, [UnsafeCall], data/test-packages/caller-checked/src, sub.rs, 7, 76
-caller_checked, caller_checked::sub::effect, UNKNOWN_METHOD::as_ptr, [UnsafeCall], data/test-packages/caller-checked/src, sub.rs, 9, 27
-caller_checked, caller_checked::sub::effect, core::ptr::null_mut, [UnsafeCall], data/test-packages/caller-checked/src, sub.rs, 11, 12
-caller_checked, caller_checked::sub::effect, core::ptr::null_mut, [UnsafeCall], data/test-packages/caller-checked/src, sub.rs, 12, 12
-caller_checked, caller_checked::sub::effect, core::ptr::null_mut, [UnsafeCall], data/test-packages/caller-checked/src, sub.rs, 13, 12
-caller_checked, caller_checked::sub::effect, libc::unix::linux_like::linux::gnu::b64::x86_64::not_x32::sysctl, [FFI Call], data/test-packages/caller-checked/src, sub.rs, 8, 8
+caller_checked, caller_checked::sub::effect, libc::unix::bsd::apple::sysctl, [FFI Call], data/test-packages/caller-checked/src, sub.rs, 8, 8
 cfg_ex, cfg_ex::foo1, std::fs::write, std::fs, data/test-packages/cfg-ex/src, main.rs, 14, 4
 cfg_ex, cfg_ex::foo2, std::fs::write, std::fs, data/test-packages/cfg-ex/src, main.rs, 24, 4
 cfg_ex, cfg_ex::test_2, std::fs::write, std::fs, data/test-packages/cfg-ex/src, main.rs, 41, 4
 dependency_ex, dependency_ex::read_fn, std::fs::File::open, std::fs, data/test-packages/dependency-ex/src, lib.rs, 5, 24
+dependency_ex, dependency_ex::read_fn, std::fs::<File as Read>::read_to_end, std::fs, data/test-packages/dependency-ex/src, lib.rs, 8, 17
 dependency_ex, dependency_ex::unsafe_deref, dependency_ex::unsafe_deref::y, [PtrDeref], data/test-packages/dependency-ex/src, lib.rs, 21, 9
 dependency_parent, dependency_parent::internal_unsafe_deref, dependency_parent::internal_unsafe_deref::y, [PtrDeref], data/test-packages/dependency-parent/src, main.rs, 5, 9
 ffi_ex, ffi_ex::SCDynamicStoreGetTypeID, ffi_ex::SCDynamicStoreGetTypeID, [FFI Declaration], data/test-packages/ffi-ex/src, main.rs, 38, 4
@@ -42,11 +33,12 @@ fns_closures, fns_closures::closure_effects::return_file_reader_2, std::fs::read
 fns_closures, fns_closures::closure_effects::return_file_reader_2, CLOSURE::data::test_packages::fns_closures::src::closure_effects::9::4, [ClosureCreation], data/test-packages/fns-closures/src, closure_effects.rs, 9, 4
 fns_closures, fns_closures::closure_effects::main, std::path::Path::new, std::path, data/test-packages/fns-closures/src, closure_effects.rs, 14, 12
 fns_closures, fns_closures::consts::terrible_code_execution_attack, std::process::Command::new, std::process, data/test-packages/fns-closures/src, consts.rs, 40, 4
+fns_closures, fns_closures::consts::terrible_code_execution_attack, std::process::Command::output, std::process, data/test-packages/fns-closures/src, consts.rs, 40, 50
 fns_closures, fns_closures::unsafe_fn_pointers::bar, fns_closures::unsafe_fn_pointers::foo, [FnPtrCreation], data/test-packages/fns-closures/src, unsafe_fn_pointers.rs, 10, 4
 libc_ex, libc_ex::main, libc::unix::sysconf, [FFI Call], data/test-packages/libc-ex/src, main.rs, 6, 8
-libc_ex, libc_ex::main, libc::sysctlbyname, libc, data/test-packages/libc-ex/src, main.rs, 8, 8
+libc_ex, libc_ex::main, libc::unix::bsd::apple::sysctlbyname, [FFI Call], data/test-packages/libc-ex/src, main.rs, 8, 8
 num_cpus_minimal, num_cpus_minimal::get_num_cpus, libc::unix::sysconf, [FFI Call], data/test-packages/num_cpus_minimal/src, main.rs, 13, 24
-num_cpus_minimal, num_cpus_minimal::get_num_physical_cpus, libc::sysctlbyname, libc, data/test-packages/num_cpus_minimal/src, main.rs, 28, 26
+num_cpus_minimal, num_cpus_minimal::get_num_physical_cpus, libc::unix::bsd::apple::sysctlbyname, [FFI Call], data/test-packages/num_cpus_minimal/src, main.rs, 28, 26
 permissions_ex, permissions_ex::remove, std::process::Command::new, std::process, data/test-packages/permissions-ex/src, lib.rs, 12, 4
 permissions_ex, permissions_ex::remove, std::process::Command::arg, std::process, data/test-packages/permissions-ex/src, lib.rs, 12, 23
 permissions_ex, permissions_ex::remove, std::process::Command::arg, std::process, data/test-packages/permissions-ex/src, lib.rs, 12, 33

data/results/test_metadata.csv

@@ -1,14 +1,15 @@
 crate, effects, macros, macro LoC, conditional blocks, conditional LoC, skipped calls, skipped call LoC, skipped fn pointers, skipped pointers LoC, skipped other, skipped other LoC, unsafe traits, unsafe trait LoC, unsafe impls, unsafe impl LoC, public fns, public fns with effects, public total effects, audited fns, audited LoC, total LoC
-caller-checked, 15, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 4, 31, 10, 58, 85
+caller-checked, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 4, 9, 10, 58, 85
 cfg-ex, 3, 2, 2, 4, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 4, 11, 55
-dependency-ex, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 18, 23
+dependency-ex, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 3, 2, 18, 23
 dependency-parent, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 11, 13
 dummy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103
 ffi-ex, 16, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 17, 16, 16, 16, 49, 118
-fns-closures, 7, 9, 9, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 7, 3, 5, 6, 20, 136
+fns-closures, 8, 9, 9, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 7, 3, 6, 6, 20, 136
 fnv_minimal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 135
 inline-ex, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 13
 libc-ex, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 1, 12, 15
+macro_test, 0, 16, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 162
 num_cpus_minimal, 2, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 24, 37
 parsing-ex, 0, 7, 13, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 146
 permissions-ex, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 10, 3, 10, 17

data/results/test_patterns.csv

@@ -1,19 +1,20 @@
-crate, [ClosureCreation], [FFI Call], [FFI Declaration], [FnPtrCreation], [PtrDeref], [StaticExtVar], [StaticMutVar], [UnionField], [UnsafeCall], libc, std::env, std::ffi, std::fs, std::io, std::net, std::path, std::process
-caller-checked, 0, 4, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0
-cfg-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0
-dependency-ex, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0
-dependency-parent, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-dummy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-ffi-ex, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-fns-closures, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1
-fnv_minimal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-inline-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-libc-ex, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0
-num_cpus_minimal, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0
-parsing-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-permissions-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 4
-recursion-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4
-resolution-ex, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-toy-crates, 1, 0, 0, 0, 1, 0, 0, 0, 6, 0, 1, 1, 0, 0, 2, 0, 3
-trait-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-unsafe-test, 0, 2, 1, 0, 2, 1, 1, 3, 1, 0, 0, 0, 2, 1, 0, 0, 0
+crate, [ClosureCreation], [FFI Call], [FFI Declaration], [FnPtrCreation], [PtrDeref], [StaticExtVar], [StaticMutVar], [UnionField], [UnsafeCall], std::env, std::ffi, std::fs, std::io, std::net, std::path, std::process
+caller-checked, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+cfg-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0
+dependency-ex, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0
+dependency-parent, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+dummy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ffi-ex, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+fns-closures, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 2
+fnv_minimal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+inline-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+libc-ex, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+macro_test, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+num_cpus_minimal, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+parsing-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+permissions-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 4
+recursion-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4
+resolution-ex, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+toy-crates, 1, 0, 0, 0, 1, 0, 0, 0, 6, 1, 1, 0, 0, 2, 0, 3
+trait-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+unsafe-test, 0, 2, 1, 0, 2, 1, 1, 3, 1, 0, 0, 2, 1, 0, 0, 0

data/results/test_summary.csv

@@ -1,13 +1,13 @@
 crate, effects
 ffi-ex, 16
-caller-checked, 15
 toy-crates, 15
 unsafe-test, 14
-fns-closures, 7
+fns-closures, 8
 permissions-ex, 6
+caller-checked, 5
 recursion-ex, 4
 cfg-ex, 3
-dependency-ex, 2
+dependency-ex, 3
 libc-ex, 2
 num_cpus_minimal, 2
 resolution-ex, 2