Skip to content

Commit fdcb1fa

Browse files
authored
Merge pull request #9928 from asgerf/js/source-node-type
JS: Simplify type hierarchy for SourceNode
2 parents ab3d365 + 98a9cb0 commit fdcb1fa

File tree

3 files changed

+1
-28
lines changed

3 files changed

+1
-28
lines changed

javascript/ql/lib/semmle/javascript/dataflow/Sources.qll

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,7 @@ private import semmle.javascript.internal.CachedStages
3333
* import("fs")
3434
* ```
3535
*/
36-
class SourceNode extends DataFlow::Node {
37-
SourceNode() {
38-
this instanceof SourceNode::Range
39-
or
40-
none() and this instanceof SourceNode::Internal::RecursionGuard
41-
}
42-
36+
class SourceNode extends DataFlow::Node instanceof SourceNode::Range {
4337
/**
4438
* Holds if this node flows into `sink` in zero or more local (that is,
4539
* intra-procedural) steps.
@@ -340,12 +334,6 @@ module SourceNode {
340334
DataFlow::functionReturnNode(this, _)
341335
}
342336
}
343-
344-
/** INTERNAL. DO NOT USE. */
345-
module Internal {
346-
/** An empty class that some tests are using to enforce that SourceNode is non-recursive. */
347-
abstract class RecursionGuard extends DataFlow::Node { }
348-
}
349337
}
350338

351339
private class NodeModuleSourcesNodes extends SourceNode::Range {

javascript/ql/test/library-tests/RecursionPrevention/SourceNodeRange.expected

Lines changed: 0 additions & 1 deletion
This file was deleted.

javascript/ql/test/library-tests/RecursionPrevention/SourceNodeRange.ql

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)