Skip to content

Fix phantom argument attachment in Fluent DSL member expressions #2795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
narangtanmay wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix phantom argument attachment in Fluent DSL member expressions #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b068827
Fix phantom argument attachment in Fluent DSL member expressions
narangtanmay Jun 16, 2026
7beddf7
Make member() base lambda context-bound instead of post-hoc cleanup
narangtanmay Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 33 additions & 19 deletions cpg-analysis/src/test/kotlin/de/fraunhofer/aisec/cpg/testcases/Passes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ class Passes {
thenStmt { ref("y").inc() }
elseStmt { ref("y").dec() }
}
memberCall("println", member("out", ref("System"))) { ref("y") }
memberCall("println", member("out") { ref("System") }) {
ref("y")
}
returnStmt {}
}
}
Expand All @@ -79,7 +81,9 @@ class Passes {
thenStmt { ref("y").inc() }
elseStmt { ref("y").dec() }
}
memberCall("println", member("out", ref("System"))) { ref("y") }
memberCall("println", member("out") { ref("System") }) {
ref("y")
}
returnStmt {}
}
}
Expand All @@ -98,7 +102,9 @@ class Passes {
thenStmt { ref("y").inc() }
elseStmt { ref("y").dec() }
}
memberCall("println", member("out", ref("System"))) { ref("y") }
memberCall("println", member("out") { ref("System") }) {
ref("y")
}
returnStmt {}
}
}
Expand All @@ -117,7 +123,9 @@ class Passes {
thenStmt { ref("y").inc() }
elseStmt { ref("y").dec() }
}
memberCall("println", member("out", ref("System"))) { ref("y") }
memberCall("println", member("out") { ref("System") }) {
ref("y")
}
returnStmt {}
}
}
Expand All @@ -138,7 +146,9 @@ class Passes {
elseStmt { ref("y").dec() }
}
ref("z") assign literal(10, t("int"))
memberCall("println", member("out", ref("System"))) { ref("y") }
memberCall("println", member("out") { ref("System") }) {
ref("y")
}
returnStmt {}
}
}
Expand All @@ -159,7 +169,9 @@ class Passes {
elseStmt { ref("y").dec() }
}
ref("z") assign literal(3, t("int"))
memberCall("println", member("out", ref("System"))) { ref("y") }
memberCall("println", member("out") { ref("System") }) {
ref("y")
}
returnStmt {}
}
}
Expand All @@ -178,7 +190,9 @@ class Passes {
thenStmt { ref("y").inc() }
elseStmt { ref("y").dec() }
}
memberCall("println", member("out", ref("System"))) { ref("y") }
memberCall("println", member("out") { ref("System") }) {
ref("y")
}
returnStmt {}
}
}
Expand All @@ -192,13 +206,13 @@ class Passes {
whileStmt {
whileCondition { ref("x") }
loopBody {
memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("Cool loop", t("string"))
}
}
}

memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("After cool loop", t("string"))
}
returnStmt {}
Expand All @@ -214,14 +228,14 @@ class Passes {
whileStmt {
whileCondition { ref("x") }
loopBody {
memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("Cool loop", t("string"))
}
ref("x") assign literal(false, t("boolean"))
}
}

memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("After cool loop", t("string"))
}
returnStmt {}
Expand All @@ -233,13 +247,13 @@ class Passes {
whileStmt {
whileCondition { literal(false, t("boolean")) }
loopBody {
memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("Cool loop", t("string"))
}
}
}

memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("After cool loop", t("string"))
}
returnStmt {}
Expand All @@ -253,13 +267,13 @@ class Passes {
whileStmt {
whileCondition { ref("x") le literal(2, t("int")) }
loopBody {
memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("Cool loop", t("string"))
}
}
}

memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("After cool loop", t("string"))
}
returnStmt {}
Expand All @@ -273,13 +287,13 @@ class Passes {
whileStmt {
whileCondition { ref("x") gt literal(3, t("int")) }
loopBody {
memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("Cool loop", t("string"))
}
}
}

memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("After cool loop", t("string"))
}
returnStmt {}
Expand All @@ -297,14 +311,14 @@ class Passes {
whileStmt {
whileCondition { ref("y") le literal(2, t("int")) }
loopBody {
memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("Cool loop", t("string"))
}
ref("y") assign memberCall("nextUInt", ref("URandomKt"))
}
}

memberCall("println", member("out", ref("System"))) {
memberCall("println", member("out") { ref("System") }) {
literal("After cool loop", t("string"))
}
returnStmt {}
Expand Down
61 changes: 29 additions & 32 deletions cpg-analysis/src/test/kotlin/de/fraunhofer/aisec/cpg/testcases/Query.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ class Query {
method("print", void()) {
param("s", t("string"))
body {
memberCall("println", member("out", ref("System"))) { ref("s") }
memberCall("println", member("out") { ref("System") }) {
ref("s")
}
returnStmt {}
}
}
Expand All @@ -84,9 +86,7 @@ class Query {
}
}
memberCall("print", ref("sc")) { ref("s") }
memberCall("print", ref("sc")) {
memberCall("test", ref("sc", makeMagic = false))
}
memberCall("print", ref("sc")) { memberCall("test", ref("sc")) }
}
}
}
Expand Down Expand Up @@ -120,7 +120,9 @@ class Query {
isStatic = true
param("s", t("string"))
body {
memberCall("println", member("out", ref("System"))) { ref("s") }
memberCall("println", member("out") { ref("System") }) {
ref("s")
}
returnStmt {}
}
}
Expand All @@ -135,7 +137,7 @@ class Query {
}
}

member("a", ref("sc")) assign literal(5, t("int"))
member("a") { ref("sc") } assign literal(5, t("int"))

memberCall(
"highlyCriticalOperation",
Expand All @@ -145,21 +147,18 @@ class Query {
},
) {
this@memberCall.isStatic = true
memberCall(
"toString",
ref("Integer", t("Integer"), makeMagic = false),
) {
memberCall("toString", ref("Integer", t("Integer"))) {
this.type = t("string")
this@memberCall.isStatic = true
isStatic = true
member("a", ref("sc", makeMagic = false))
member("a") { ref("sc") }
}
}

memberCall("log", ref("logger")) {
member("INFO", ref("Level", makeMagic = false))
member("INFO") { ref("Level") }
literal("put ", t("string")) +
member("a", ref("sc", makeMagic = false)) +
member("a") { ref("sc") } +
literal(" into highlyCriticalOperation()", t("string"))
}
returnStmt {}
Expand Down Expand Up @@ -198,7 +197,9 @@ class Query {
isStatic = true
param("s", t("string"))
body {
memberCall("println", member("out", ref("System"))) { ref("s") }
memberCall("println", member("out") { ref("System") }) {
ref("s")
}
returnStmt {}
}
}
Expand All @@ -213,12 +214,12 @@ class Query {
}
}

member("a", ref("sc")) assign literal(5, t("int"))
member("a") { ref("sc") } assign literal(5, t("int"))

memberCall("log", ref("logger")) {
member("INFO", ref("Level", makeMagic = false))
member("INFO") { ref("Level") }
literal("put ", t("string")) +
member("a", ref("sc", makeMagic = false)) +
member("a") { ref("sc") } +
literal(" into highlyCriticalOperation()", t("string"))
}

Expand All @@ -230,14 +231,11 @@ class Query {
},
) {
this@memberCall.isStatic = true
memberCall(
"toString",
ref("Integer", t("Integer"), makeMagic = false),
) {
memberCall("toString", ref("Integer", t("Integer"))) {
this.type = t("string")
this@memberCall.isStatic = true
isStatic = true
member("a", ref("sc", makeMagic = false))
member("a") { ref("sc") }
}
}
returnStmt {}
Expand Down Expand Up @@ -273,7 +271,9 @@ class Query {
isStatic = true
param("s", t("string"))
body {
memberCall("println", member("out", ref("System"))) { ref("s") }
memberCall("println", member("out") { ref("System") }) {
ref("s")
}
returnStmt {}
}
}
Expand All @@ -288,16 +288,16 @@ class Query {
}
}

member("a", ref("sc")) assign literal(5, t("int"))
member("a") { ref("sc") } assign literal(5, t("int"))

memberCall("log", ref("logger")) {
member("INFO", ref("Level", makeMagic = false))
member("INFO") { ref("Level") }
literal("put ", t("string")) +
member("a", ref("a", makeMagic = false)) +
member("a") { ref("a") } +
literal(" into highlyCriticalOperation()", t("string"))
}

member("a", ref("sc")) assign literal(3, t("int"))
member("a") { ref("sc") } assign literal(3, t("int"))

memberCall(
"highlyCriticalOperation",
Expand All @@ -307,14 +307,11 @@ class Query {
},
) {
this@memberCall.isStatic = true
memberCall(
"toString",
ref("Integer", t("Integer"), makeMagic = false),
) {
memberCall("toString", ref("Integer", t("Integer"))) {
this.type = t("string")
this@memberCall.isStatic = true
isStatic = true
member("a", ref("sc", makeMagic = false))
member("a") { ref("sc") }
}
}
returnStmt {}
Expand Down
Loading