Merge pull request #18294 from github/redsun82/extract-self-param-ref

Rust: extract `isRef` for `SelfParam`
github · Dec 16, 2024 · d624670 · d624670
2 parents 9a80c40 + 4975e7b
commit d624670
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 32 deletions.
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
@@ -35,6 +35,7 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         (_, "then_branch") => "then",
         (_, "else_branch") => "else_",
         ("ArrayType", "ty") => "element_type_repr",
+        ("SelfParam", "is_amp") => "is_ref",
         (_, "ty") => "type_repr",
         _ => field_name,
     };
@@ -363,6 +364,13 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
                 is_many: false,
             });
         }
+        "SelfParam" => {
+            result.push(FieldInfo {
+                name: "is_amp".to_string(),
+                tp: "predicate".to_string(),
+                is_many: false,
+            });
+        }
         _ => {}
     }
 

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
diff --git a/rust/ql/lib/codeql/rust/elements/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/SelfParam.qll
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
@@ -2226,6 +2226,11 @@ self_params(
   unique int id: @self_param
 );
 
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
 #keyset[id]
 self_param_is_mut(
   int id: @self_param ref

diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
@@ -1 +1,5 @@
-| gen_self_param.rs:5:13:5:21 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isMut: | yes | hasLifetime: | no | hasName: | yes |
+| gen_self_param.rs:6:10:6:14 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | yes | isMut: | no | hasLifetime: | no | hasName: | yes |
+| gen_self_param.rs:7:10:7:18 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | yes | isMut: | yes | hasLifetime: | no | hasName: | yes |
+| gen_self_param.rs:8:12:8:15 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | no | isMut: | no | hasLifetime: | no | hasName: | yes |
+| gen_self_param.rs:9:11:9:18 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | no | isMut: | yes | hasLifetime: | no | hasName: | yes |
+| gen_self_param.rs:10:15:10:22 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | yes | isMut: | no | hasLifetime: | yes | hasName: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.expected
@@ -0,0 +1 @@
+| gen_self_param.rs:10:15:10:22 | SelfParam | gen_self_param.rs:10:16:10:17 | ''a |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected
@@ -1 +1,5 @@
-| gen_self_param.rs:5:13:5:21 | SelfParam | gen_self_param.rs:5:18:5:21 | self |
+| gen_self_param.rs:6:10:6:14 | SelfParam | gen_self_param.rs:6:11:6:14 | self |
+| gen_self_param.rs:7:10:7:18 | SelfParam | gen_self_param.rs:7:15:7:18 | self |
+| gen_self_param.rs:8:12:8:15 | SelfParam | gen_self_param.rs:8:12:8:15 | self |
+| gen_self_param.rs:9:11:9:18 | SelfParam | gen_self_param.rs:9:15:9:18 | self |
+| gen_self_param.rs:10:15:10:22 | SelfParam | gen_self_param.rs:10:19:10:22 | self |
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		\| gen_self_param.rs:10:15:10:22 \| SelfParam \| gen_self_param.rs:10:16:10:17 \| ''a \|