Skip to content

JS: Add compileForOverlayEval: true #20421

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

Merged
merged 5 commits into from
Oct 31, 2025
Merged

JS: Add compileForOverlayEval: true #20421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39f74d8
JS: Add compileForOverlayEval
asgerf Jul 2, 2025
a5819a1
JS: Fix bad join order in getNextToken()
asgerf Sep 12, 2025
0acface
JS: Recursively delete source archive so emptiness detection works
asgerf Oct 27, 2025
1f7671c
JS: Ensure integration test contains one valid file
asgerf Oct 27, 2025
c583b48
JS: Add pragma[nomagic] just to be safe
asgerf Oct 30, 2025
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
5 changes: 1 addition & 4 deletions javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,12 +498,9 @@ public int run() throws IOException {
// ensuring that the finalize steps detects that no code was seen.
Path srcFolder = Paths.get(EnvironmentVariables.getWipDatabase(), "src");
try {
// Non-recursive delete because "src/" should be empty.
FileUtil8.delete(srcFolder);
FileUtil8.recursiveDelete(srcFolder);
} catch (NoSuchFileException e) {
Exceptions.ignore(e, "the directory did not exist");
} catch (DirectoryNotEmptyException e) {
Exceptions.ignore(e, "just leave the directory if it is not empty");
}
return 0;
}
Expand Down
2 changes: 2 additions & 0 deletions javascript/ql/integration-tests/diagnostics/syntax-error/good.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Ensure at least one file without errors is included, as extraction fails otherwise.
console.log("Hello")
1 change: 1 addition & 0 deletions javascript/ql/lib/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ dataExtensions:
- semmle/javascript/security/domains/**/*.model.yml
- ext/*.model.yml
warnOnImplicitThis: true
compileForOverlayEval: true
13 changes: 9 additions & 4 deletions javascript/ql/lib/semmle/javascript/Tokens.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

import javascript

pragma[nomagic]
private predicate adjacentTokens(Token token1, Token token2) {
Copy link
Contributor

@tausbn tausbn Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No pragma[nomagic] on this to prevent future reinlining?

Copy link
Contributor Author

@asgerf asgerf Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added pragma[nomagic]. The DIL seems to be unchanged so we shouldn't have to rerun the evaluations.

exists(TopLevel top, int index |
tokeninfo(token1, _, top, index, _) and
tokeninfo(token2, _, top, index + 1, _)
)
}

/**
* A token occurring in a piece of JavaScript source code.
*
Expand All @@ -27,10 +35,7 @@ class Token extends Locatable, @token {
string getValue() { tokeninfo(this, _, _, _, result) }

/** Gets the token following this token inside the same toplevel structure, if any. */
Token getNextToken() {
this.getTopLevel() = result.getTopLevel() and
this.getIndex() + 1 = result.getIndex()
}
Token getNextToken() { adjacentTokens(this, result) }

/** Gets the token preceding this token inside the same toplevel structure, if any. */
Token getPreviousToken() { result.getNextToken() = this }
Expand Down