hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-20 00:43:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
Arthur Baars
2020-12-17 12:17:29 +01:00
parent 46fc17da58
commit b676c95218
3 changed files with 144 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll
View File

@@ -1,147 +1,21 @@
/** Provides classes representing the control flow graph. */
private import codeql.Locations
private import codeql_ruby.ast.internal.TreeSitter
private import codeql_ruby.ast.internal.TreeSitter::Generated
private import codeql_ruby.controlflow.BasicBlocks
private import SuccessorTypes
private import internal.ControlFlowGraphImpl
private import internal.Splitting
private import internal.Completion
private module CfgScope {
abstract class Range extends Generated::AstNode {
abstract string getName();
predicate entry(Generated::AstNode first) { first(this, first) }
predicate exit(Generated::AstNode last, Completion c) { last(this, last, c) }
}
private class ProgramScope extends Range, Generated::Program {
final override string getName() { result = "top-level" }
}
private class BeginBlockScope extends Range, Generated::BeginBlock {
final override string getName() { result = "BEGIN block" }
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::BeginBlockTree).getFirstChildNode(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
last(this.(Trees::BeginBlockTree).getLastChildNode(), last, c)
}
}
private class EndBlockScope extends Range, Generated::EndBlock {
final override string getName() { result = "END block" }
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::EndBlockTree).getFirstChildNode(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
last(this.(Trees::EndBlockTree).getLastChildNode(), last, c)
}
}
private class MethodScope extends Range, Generated::AstNode {
MethodScope() { this instanceof Generated::Method }
final override string getName() { result = this.(Generated::Method).getName().toString() }
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::RescueEnsureBlockTree).firstBody(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
this.(Trees::RescueEnsureBlockTree).lastBody(last, c)
}
}
private class SingletonMethodScope extends Range, Generated::AstNode {
SingletonMethodScope() { this instanceof Generated::SingletonMethod }
final override string getName() {
result = this.(Generated::SingletonMethod).getName().toString()
}
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::RescueEnsureBlockTree).firstBody(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
this.(Trees::RescueEnsureBlockTree).lastBody(last, c)
}
}
private class DoBlockScope extends Range, Generated::DoBlock {
DoBlockScope() { not this.getParent() instanceof Generated::Lambda }
final override string getName() { result = "do block" }
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::RescueEnsureBlockTree).firstBody(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
this.(Trees::RescueEnsureBlockTree).lastBody(last, c)
}
}
private class BlockScope extends Range, Generated::Block {
BlockScope() { not this.getParent() instanceof Generated::Lambda }
final override string getName() { result = "block" }
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::BlockTree).getFirstChildNode(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
last(this.(Trees::BlockTree).getLastChildNode(), last, c)
}
}
private class LambdaScope extends Range, Generated::Lambda {
final override string getName() { result = "lambda" }
final override predicate entry(Generated::AstNode first) {
first(this.getParameters(), first)
or
not exists(this.getParameters()) and
(
first(this.getBody().(Trees::DoBlockTree).firstBody(), first)
or
first(this.getBody().(Trees::BlockTree).getFirstChildNode(), first)
)
}
final override predicate exit(Generated::AstNode last, Completion c) {
last(this.getParameters(), last, c) and
not c instanceof NormalCompletion
or
last(this.getBody().(Trees::BlockTree).getLastChildNode(), last, c)
or
this.getBody().(Trees::RescueEnsureBlockTree).lastBody(last, c)
or
not exists(this.getBody()) and last(this.getParameters(), last, c)
}
}
}
/** An AST node with an associated control-flow graph. */
class CfgScope extends Generated::AstNode {
CfgScope::Range range;
class CfgScope extends AstNode {
CfgScope::Range_ range;
CfgScope() { range = this }
/** Gets the name of this scope. */
string getName() { result = range.getName() }
predicate entry(Generated::AstNode first) { range.entry(first) }
predicate exit(Generated::AstNode last, Completion c) { range.exit(last, c) }
}
/**
@@ -157,7 +31,7 @@ class CfgNode extends TCfgNode {
string toString() { none() }
/** Gets the AST node that this node corresponds to, if any. */
Generated::AstNode getNode() { none() }
AstNode getNode() { none() }
/** Gets the location of this control flow node. */
Location getLocation() { result = this.getNode().getLocation() }
@@ -252,11 +126,11 @@ module CfgNodes {
*/
class AstCfgNode extends CfgNode, TAstNode {
private Splits splits;
private Generated::AstNode n;
private AstNode n;
AstCfgNode() { this = TAstNode(n, splits) }
final override Generated::AstNode getNode() { result = n }
final override AstNode getNode() { result = n }
final override string toString() {
result = "[" + this.getSplitsString() + "] " + n.toString()

150
ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
View File

@@ -39,6 +39,130 @@ private import SuccessorTypes
private import Splitting
private import codeql.files.FileSystem
module CfgScope {
abstract class Range_ extends AstNode {
abstract string getName();
abstract predicate entry(AstNode first);
abstract predicate exit(AstNode last, Completion c);
}
private class ProgramScope extends Range_, Program {
final override string getName() { result = "top-level" }
final override predicate entry(AstNode first) { first(this, first) }
final override predicate exit(AstNode last, Completion c) { last(this, last, c) }
}
private class BeginBlockScope extends Range_, BeginBlock {
final override string getName() { result = "BEGIN block" }
final override predicate entry(AstNode first) {
first(this.(Trees::BeginBlockTree).getFirstChildNode(), first)
}
final override predicate exit(AstNode last, Completion c) {
last(this.(Trees::BeginBlockTree).getLastChildNode(), last, c)
}
}
private class EndBlockScope extends Range_, EndBlock {
final override string getName() { result = "END block" }
final override predicate entry(AstNode first) {
first(this.(Trees::EndBlockTree).getFirstChildNode(), first)
}
final override predicate exit(AstNode last, Completion c) {
last(this.(Trees::EndBlockTree).getLastChildNode(), last, c)
}
}
private class MethodScope extends Range_, AstNode {
MethodScope() { this instanceof Method }
final override string getName() { result = this.(Method).getName().toString() }
final override predicate entry(AstNode first) {
this.(Trees::RescueEnsureBlockTree).firstInner(first)
}
final override predicate exit(AstNode last, Completion c) {
this.(Trees::RescueEnsureBlockTree).lastInner(last, c)
}
}
private class SingletonMethodScope extends Range_, AstNode {
SingletonMethodScope() { this instanceof SingletonMethod }
final override string getName() { result = this.(SingletonMethod).getName().toString() }
final override predicate entry(AstNode first) {
this.(Trees::RescueEnsureBlockTree).firstInner(first)
}
final override predicate exit(AstNode last, Completion c) {
this.(Trees::RescueEnsureBlockTree).lastInner(last, c)
}
}
private class DoBlockScope extends Range_, DoBlock {
DoBlockScope() { not this.getParent() instanceof Lambda }
final override string getName() { result = "do block" }
final override predicate entry(AstNode first) {
this.(Trees::RescueEnsureBlockTree).firstInner(first)
}
final override predicate exit(AstNode last, Completion c) {
this.(Trees::RescueEnsureBlockTree).lastInner(last, c)
}
}
private class BlockScope extends Range_, Block {
BlockScope() { not this.getParent() instanceof Lambda }
final override string getName() { result = "block" }
final override predicate entry(AstNode first) {
first(this.(Trees::BlockTree).getFirstChildNode(), first)
}
final override predicate exit(AstNode last, Completion c) {
last(this.(Trees::BlockTree).getLastChildNode(), last, c)
}
}
private class LambdaScope extends Range_, Lambda {
final override string getName() { result = "lambda" }
final override predicate entry(AstNode first) {
first(this.getParameters(), first)
or
not exists(this.getParameters()) and
(
this.getBody().(Trees::DoBlockTree).firstInner(first)
or
first(this.getBody().(Trees::BlockTree).getFirstChildNode(), first)
)
}
final override predicate exit(AstNode last, Completion c) {
last(this.getParameters(), last, c) and
not c instanceof NormalCompletion
or
last(this.getBody().(Trees::BlockTree).getLastChildNode(), last, c)
or
this.getBody().(Trees::RescueEnsureBlockTree).lastInner(last, c)
or
not exists(this.getBody()) and last(this.getParameters(), last, c)
}
}
}
private AstNode parent(AstNode n) {
result.getAFieldOrChild() = n and
not n instanceof CfgScope
@@ -122,7 +246,7 @@ predicate succ(AstNode pred, AstNode succ, Completion c) {
/** Holds if `first` is first executed when entering `scope`. */
pragma[nomagic]
predicate succEntry(CfgScope scope, AstNode first) {
predicate succEntry(CfgScope::Range_ scope, AstNode first) {
exists(AstNode n |
scope.entry(n) and
succImplIfHidden*(n, first) and
@@ -132,7 +256,7 @@ predicate succEntry(CfgScope scope, AstNode first) {
/** Holds if `last` with completion `c` can exit `scope`. */
pragma[nomagic]
predicate succExit(CfgScope scope, AstNode last, Completion c) {
predicate succExit(CfgScope::Range_ scope, AstNode last, Completion c) {
exists(AstNode n |
scope.exit(n, c) and
succImplIfHidden*(last, n) and
@@ -277,7 +401,7 @@ module Trees {
result = this.getChild(i) and rescuable = true
}
final override predicate last(AstNode last, Completion c) { this.lastBody(last, c) }
final override predicate last(AstNode last, Completion c) { this.lastInner(last, c) }
override predicate isHidden() { any() }
}
@@ -388,7 +512,7 @@ module Trees {
result = this.getChild(i - 1) and rescuable = true
}
final override predicate last(AstNode last, Completion c) { this.lastBody(last, c) }
final override predicate last(AstNode last, Completion c) { this.lastInner(last, c) }
}
private class ClassVariableTree extends LeafTree, ClassVariable { }
@@ -692,7 +816,7 @@ module Trees {
last(this.getParameters(), pred, c) and
c instanceof NormalCompletion and
(
first(this.getBody().(DoBlockTree).firstBody(), succ)
this.getBody().(DoBlockTree).firstInner(succ)
or
first(this.getBody().(BlockTree).getFirstChildNode(), succ)
)
@@ -798,7 +922,7 @@ module Trees {
result = this.getChild(i - 1) and rescuable = true
}
final override predicate last(AstNode last, Completion c) { this.lastBody(last, c) }
final override predicate last(AstNode last, Completion c) { this.lastInner(last, c) }
}
private class NextTree extends StandardPostOrderTree, Next {
@@ -1080,7 +1204,7 @@ module Trees {
nestLevel = this.nestLevel()
}
predicate lastBody(AstNode last, Completion c) {
predicate lastInner(AstNode last, Completion c) {
exists(boolean ensurable | last = this.getAnEnsurePredecessor(c, ensurable) |
not this.hasEnsure()
or
@@ -1107,15 +1231,15 @@ module Trees {
not c instanceof NormalCompletion
}
AstNode firstBody() {
result = this.getBodyChild(0, _)
predicate firstInner(AstNode first) {
first(this.getBodyChild(0, _), first)
or
not exists(this.getBodyChild(_, _)) and
(
result = this.getRescue(0)
first(this.getRescue(_), first)
or
not exists(this.getRescue(_)) and
result = this.getEnsure()
first(this.getEnsure(), first)
)
}
@@ -1123,7 +1247,7 @@ module Trees {
this instanceof PreOrderTree and
pred = this and
c instanceof SimpleCompletion and
first(this.firstBody(), succ)
this.firstInner(succ)
or
// Normal left-to-right evaluation in the body
exists(int i |
@@ -1215,7 +1339,7 @@ module Trees {
)
}
final override predicate last(AstNode last, Completion c) { this.lastBody(last, c) }
final override predicate last(AstNode last, Completion c) { this.lastInner(last, c) }
}
private class SingletonMethodTree extends RescueEnsureBlockTree, PostOrderTree, SingletonMethod {

2
ql/src/codeql_ruby/controlflow/internal/Splitting.qll
View File

@@ -384,7 +384,7 @@ module EnsureSplitting {
) {
this.appliesToPredecessor(pred) and
nestLevel = block.nestLevel() and
block.lastBody(pred, c)
block.lastInner(pred, c)
}
/**