Merge measurement scaffold disabled by default
ober
8a660672fa036f4bf8c588e6f7e99af745f676bd
--- a/lib/semgrep/scan.sls +++ b/lib/semgrep/scan.sls @@ -34021,6 +34021,7 @@ (append (reverse findings) acc))))))))) (def (scan-dart-taint-rule rule path source taint) (scan-dart-arrays-if-taint-rule rule path source taint)) + (def measure-real-engine? #f) (def (scan-rule rule language path source target-root) (if (not (and (language-applies? rule language) (path-applies? rule path))) @@ -34313,15 +34314,20 @@ (scan-move-patterns-rule rule path source)) (and (julia-language? language) (scan-julia-patterns-rule rule path source)) - (and (kotlin-language? language) + (and (not measure-real-engine?) + (kotlin-language? language) (scan-kotlin-patterns-rule rule path source)) - (and (rust-language? language) + (and (not measure-real-engine?) + (rust-language? language) (scan-rust-patterns-rule rule path source)) - (and (go-language? language) + (and (not measure-real-engine?) + (go-language? language) (scan-go-patterns-rule rule path source)) - (and (php-language? language) + (and (not measure-real-engine?) + (php-language? language) (scan-php-patterns-rule rule path source)) - (and (java-language? language) + (and (not measure-real-engine?) + (java-language? language) (scan-java-patterns-rule rule path source)) (and (cpp-language? language) (scan-cpp-patterns-rule rule path source)) @@ -34330,7 +34336,8 @@ [(taint) (or (and (terraform-language? language) (scan-terraform-block-sink-rule rule path source)) - (and (kotlin-language? language) + (and (not measure-real-engine?) + (kotlin-language? language) (scan-kotlin-taint-rule rule path source)) (and (dart-language? language) (scan-dart-taint-rule @@ -34338,17 +34345,23 @@ path source (rule-pattern rule))) - (and (ruby-language? language) + (and (not measure-real-engine?) + (ruby-language? language) (scan-ruby-taint-rule rule path source)) - (and (rust-language? language) + (and (not measure-real-engine?) + (rust-language? language) (scan-rust-taint-rule rule path source)) - (and (go-language? language) + (and (not measure-real-engine?) + (go-language? language) (scan-go-taint-rule rule path source)) - (and (scala-language? language) + (and (not measure-real-engine?) + (scala-language? language) (scan-scala-taint-rule rule path source)) - (and (php-language? language) + (and (not measure-real-engine?) + (php-language? language) (scan-php-taint-rule rule path source)) - (and (java-language? language) + (and (not measure-real-engine?) + (java-language? language) (scan-java-taint-rule rule path source)) (and (cpp-language? language) (scan-cpp-taint-rule rule path source)) --- a/src/.jerbuild-hashes +++ b/src/.jerbuild-hashes @@ -3,11 +3,11 @@ ("src/semgrep/output/json.ss" . "293881CFA2ADB7BC") ("src/semgrep/lang.ss" . "6982E07679D20836") ("src/semgrep/parse/parse-target.ss" . "97AA8FFEB12736DA") - ("src/semgrep/scan.ss" . "660D5F4ACA2CF97F") - ("src/semgrep/rule.ss" . "E12C108153C181FA") - ("src/semgrep/schema/lang.ss" . "CAE2CA859C9A9FD0") + ("src/semgrep/scan.ss" . "6F8670D0036F43DD") ("src/semgrep/output/text.ss" . "BE476CB84B807FBA") ("src/semgrep/fix.ss" . "2E5B65B1FEF3B2B1") + ("src/semgrep/schema/lang.ss" . "CAE2CA859C9A9FD0") + ("src/semgrep/rule.ss" . "E12C108153C181FA") ("src/semgrep/match/structural.ss" . "5BA4F1566448AF3A") ("src/semgrep/main.ss" . "A4EC9E7F2A09D25E") ("src/semgrep/cli.ss" . "EBDC4B1DAD3F13CC")) --- a/src/semgrep/scan.ss +++ b/src/semgrep/scan.ss @@ -33991,6 +33991,8 @@ (def (scan-dart-taint-rule rule path source taint) (scan-dart-arrays-if-taint-rule rule path source taint)) +(def measure-real-engine? #f) + (def (scan-rule rule language path source target-root) (if (not (and (language-applies? rule language) (path-applies? rule path))) @@ -34304,15 +34306,15 @@ (scan-move-patterns-rule rule path source)) (and (julia-language? language) (scan-julia-patterns-rule rule path source)) - (and (kotlin-language? language) + (and (not measure-real-engine?) (kotlin-language? language) (scan-kotlin-patterns-rule rule path source)) - (and (rust-language? language) + (and (not measure-real-engine?) (rust-language? language) (scan-rust-patterns-rule rule path source)) - (and (go-language? language) + (and (not measure-real-engine?) (go-language? language) (scan-go-patterns-rule rule path source)) - (and (php-language? language) + (and (not measure-real-engine?) (php-language? language) (scan-php-patterns-rule rule path source)) - (and (java-language? language) + (and (not measure-real-engine?) (java-language? language) (scan-java-patterns-rule rule path source)) (and (cpp-language? language) (scan-cpp-patterns-rule rule path source)) @@ -34320,7 +34322,7 @@ [(taint) (or (and (terraform-language? language) (scan-terraform-block-sink-rule rule path source)) - (and (kotlin-language? language) + (and (not measure-real-engine?) (kotlin-language? language) (scan-kotlin-taint-rule rule path source)) (and (dart-language? language) (scan-dart-taint-rule @@ -34328,17 +34330,17 @@ path source (rule-pattern rule))) - (and (ruby-language? language) + (and (not measure-real-engine?) (ruby-language? language) (scan-ruby-taint-rule rule path source)) - (and (rust-language? language) + (and (not measure-real-engine?) (rust-language? language) (scan-rust-taint-rule rule path source)) - (and (go-language? language) + (and (not measure-real-engine?) (go-language? language) (scan-go-taint-rule rule path source)) - (and (scala-language? language) + (and (not measure-real-engine?) (scala-language? language) (scan-scala-taint-rule rule path source)) - (and (php-language? language) + (and (not measure-real-engine?) (php-language? language) (scan-php-taint-rule rule path source)) - (and (java-language? language) + (and (not measure-real-engine?) (java-language? language) (scan-java-taint-rule rule path source)) (and (cpp-language? language) (scan-cpp-taint-rule rule path source))