Merge pull request #21873 from hvitved/local-name-resolution

Shared: Local name resolution library
2026-06-03 04:40:14 +02:00 · 2026-06-01 20:51:07 +02:00
parent ab4a575243 d2f474d998
commit 9618e9b35c
24 changed files with 4344 additions and 3796 deletions
--- a/ruby/ql/lib/codeql/ruby/ast/Parameter.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Parameter.qll
@@ -134,7 +134,7 @@ class BlockParameter extends NamedParameter, TBlockParameter {
  final override string getName() { result = g.getName().getValue() }

  final override LocalVariable getVariable() {
-    result = TLocalVariableReal(_, _, g.getName()) or
+    result.(LocalVariableReal).getDefiningNode() = g.getName() or
    result = TLocalVariableSynth(this, 0)
  }

@@ -164,7 +164,7 @@ class HashSplatParameter extends NamedParameter, THashSplatParameter {
  final override string getAPrimaryQlClass() { result = "HashSplatParameter" }

  final override LocalVariable getVariable() {
-    result = TLocalVariableReal(_, _, g.getName()) or
+    result.(LocalVariableReal).getDefiningNode() = g.getName() or
    result = TLocalVariableSynth(this, 0)
  }

@@ -212,7 +212,9 @@ class KeywordParameter extends NamedParameter, TKeywordParameter {

  final override string getAPrimaryQlClass() { result = "KeywordParameter" }

-  final override LocalVariable getVariable() { result = TLocalVariableReal(_, _, g.getName()) }
+  final override LocalVariable getVariable() {
+    result.(LocalVariableReal).getDefiningNode() = g.getName()
+  }

  /**
   * Gets the default value, i.e. the value assigned to the parameter when one
@@ -262,7 +264,9 @@ class OptionalParameter extends NamedParameter, TOptionalParameter {
   */
  final Expr getDefaultValue() { toGenerated(result) = g.getValue() }

-  final override LocalVariable getVariable() { result = TLocalVariableReal(_, _, g.getName()) }
+  final override LocalVariable getVariable() {
+    result.(LocalVariableReal).getDefiningNode() = g.getName()
+  }

  final override string toString() { result = this.getName() }

@@ -293,7 +297,7 @@ class SplatParameter extends NamedParameter, TSplatParameter {
  final override string getAPrimaryQlClass() { result = "SplatParameter" }

  final override LocalVariable getVariable() {
-    result = TLocalVariableReal(_, _, g.getName()) or
+    result.(LocalVariableReal).getDefiningNode() = g.getName() or
    result = TLocalVariableSynth(this, 0)
  }

--- a/ruby/ql/lib/codeql/ruby/ast/internal/AST.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/AST.qll
@@ -207,9 +207,7 @@ private module Cached {
    TLambda(Ruby::Lambda g) or
    TLine(Ruby::Line g) or
    TLeftAssignmentList(Ruby::LeftAssignmentList g) or
-    TLocalVariableAccessReal(Ruby::Identifier g, TLocalVariableReal v) {
-      LocalVariableAccess::range(g, v)
-    } or
+    TLocalVariableAccessReal(Ruby::Identifier g, TLocalVariableReal v) { access(g, v) } or
    TLocalVariableAccessSynth(Ast::AstNode parent, int i, Ast::LocalVariable v) {
      mkSynthChild(LocalVariableAccessRealKind(v), parent, i)
      or
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Parameter.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Parameter.qll
@@ -33,7 +33,7 @@ class SimpleParameterRealImpl extends SimpleParameterImpl, TSimpleParameterReal

  SimpleParameterRealImpl() { this = TSimpleParameterReal(g) }

-  override LocalVariable getVariableImpl() { result = TLocalVariableReal(_, _, g) }
+  override LocalVariable getVariableImpl() { result.(LocalVariableReal).getDefiningNode() = g }

  override string getNameImpl() { result = g.getValue() }
 }
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
@@ -118,7 +118,7 @@ private Ruby::AstNode specialParentOf(Ruby::AstNode n) {
    ]
 }

-private Ruby::AstNode parentOf(Ruby::AstNode n) {
+Ruby::AstNode parentOf(Ruby::AstNode n) {
  n = getHereDocBody(result)
  or
  result = specialParentOf(n).getParent()
@@ -172,13 +172,15 @@ private module Cached {
  }
 }

-bindingset[n]
-pragma[inline_late]
-Scope::Range scopeOf(Ruby::AstNode n) { result = Cached::scopeOfImpl(n) }
+import Cached

 bindingset[n]
 pragma[inline_late]
-Scope scopeOfInclSynth(AstNode n) { result = Cached::scopeOfInclSynthImpl(n) }
+Scope::Range scopeOf(Ruby::AstNode n) { result = scopeOfImpl(n) }
+
+bindingset[n]
+pragma[inline_late]
+Scope scopeOfInclSynth(AstNode n) { result = scopeOfInclSynthImpl(n) }

 abstract class ScopeImpl extends AstNode, TScopeType {
  final Scope getOuterScopeImpl() { result = scopeOfInclSynth(this) }
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
@@ -299,9 +299,12 @@ private predicate hasLocation(AstNode n, Location l) {
 private module ImplicitSelfSynthesis {
  pragma[nomagic]
  private predicate identifierMethodCallSelfSynthesis(AstNode mc, int i, Child child) {
-    child = SynthChild(SelfKind(TSelfVariable(scopeOf(toGenerated(mc)).getEnclosingSelfScope()))) and
-    mc = TIdentifierMethodCall(_) and
-    i = 0
+    exists(SelfVariableImpl self |
+      self.getDeclaringScopeImpl() = scopeOf(toGenerated(mc)).getEnclosingSelfScope() and
+      child = SynthChild(SelfKind(self)) and
+      mc = TIdentifierMethodCall(_) and
+      i = 0
+    )
  }

  private class IdentifierMethodCallSelfSynthesis extends Synthesis {
@@ -312,13 +315,14 @@ private module ImplicitSelfSynthesis {

  pragma[nomagic]
  private predicate regularMethodCallSelfSynthesis(TRegularMethodCall mc, int i, Child child) {
-    exists(Ruby::AstNode g |
+    exists(Ruby::AstNode g, SelfVariableImpl self |
      mc = TRegularMethodCall(g) and
      // If there's no explicit receiver, then the receiver is implicitly `self`.
-      not exists(g.(Ruby::Call).getReceiver())
-    ) and
-    child = SynthChild(SelfKind(TSelfVariable(scopeOf(toGenerated(mc)).getEnclosingSelfScope()))) and
-    i = 0
+      not exists(g.(Ruby::Call).getReceiver()) and
+      self.getDeclaringScopeImpl() = scopeOf(toGenerated(mc)).getEnclosingSelfScope() and
+      child = SynthChild(SelfKind(self)) and
+      i = 0
+    )
  }

  private class RegularMethodCallSelfSynthesis extends Synthesis {
@@ -341,9 +345,10 @@ private module ImplicitSelfSynthesis {
   */
  pragma[nomagic]
  private SelfKind getSelfKind(InstanceVariableAccess var) {
-    exists(Ruby::AstNode owner |
+    exists(Ruby::AstNode owner, SelfVariableImpl self |
+      self.getDeclaringScopeImpl() = scopeOf(owner).getEnclosingSelfScope() and
      owner = toGenerated(instanceVarAccessSynthParentStar(var)) and
-      result = SelfKind(TSelfVariable(scopeOf(owner).getEnclosingSelfScope()))
+      result = SelfKind(self)
    )
  }

@@ -1566,20 +1571,20 @@ private module ForLoopDesugar {
 * { a: a }
 * ```
 */
-private module ImplicitHashValueSynthesis {
-  private Ruby::AstNode keyWithoutValue(AstNode parent, int i) {
+module ImplicitHashValueSynthesis {
+  Ruby::AstNode keyWithoutValue(Ruby::AstNode parent, int i) {
    exists(Ruby::KeywordPattern pair |
      result = pair.getKey() and
-      result = toGenerated(parent.(HashPattern).getKey(i)) and
+      result = parent.(Ruby::HashPattern).getChild(i).(Ruby::KeywordPattern).getKey() and
      not exists(pair.getValue())
    )
    or
-    exists(Ruby::Pair pair |
-      i = 0 and
-      result = pair.getKey() and
-      pair = toGenerated(parent) and
-      not exists(pair.getValue())
-    )
+    parent =
+      any(Ruby::Pair pair |
+        i = 0 and
+        result = pair.getKey() and
+        not exists(pair.getValue())
+      )
  }

  private string keyName(Ruby::AstNode key) {
@@ -1589,7 +1594,7 @@ private module ImplicitHashValueSynthesis {

  private class ImplicitHashValueSynthesis extends Synthesis {
    final override predicate child(AstNode parent, int i, Child child) {
-      exists(Ruby::AstNode key | key = keyWithoutValue(parent, i) |
+      exists(Ruby::AstNode key | key = keyWithoutValue(toGenerated(parent), i) |
        exists(TVariableReal variable |
          access(key, variable) and
          child = SynthChild(LocalVariableAccessRealKind(variable))
@@ -1616,7 +1621,7 @@ private module ImplicitHashValueSynthesis {
    }

    final override predicate location(AstNode n, Location l) {
-      exists(AstNode p, int i | l = keyWithoutValue(p, i).getLocation() |
+      exists(AstNode p, int i | l = keyWithoutValue(toGenerated(p), i).getLocation() |
        n = p.(HashPattern).getValue(i)
        or
        i = 0 and n = p.(Pair).getValue()
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll
@@ -2,6 +2,7 @@ overlay[local]
 module;

 private import TreeSitter
+private import codeql.namebinding.LocalNameBinding
 private import codeql.ruby.AST
 private import codeql.ruby.CFG
 private import codeql.ruby.ast.internal.AST
@@ -94,10 +95,11 @@ predicate scopeDefinesParameterVariable(
  // In case of overlapping parameter names (e.g. `_`), only the first
  // parameter will give rise to a variable
  i =
-    min(Ruby::Identifier other |
-      parameterAssignment(scope, name, other, _)
+    min(Ruby::Identifier other, int startline, int startcolumn |
+      parameterAssignment(scope, name, other, _) and
+      other.getLocation().hasLocationInfo(_, startline, startcolumn, _, _)
    |
-      other order by other.getLocation().getStartLine(), other.getLocation().getStartColumn()
+      other order by startline, startcolumn
    ) and
  parameterAssignment(scope, name, _, pos)
  or
@@ -113,7 +115,8 @@ predicate scopeDefinesParameterVariable(
  )
 }

-pragma[nomagic]
+bindingset[i]
+pragma[inline_late]
 private string variableNameInScope(Ruby::AstNode i, Scope::Range scope) {
  scope = scopeOf(i) and
  (
@@ -137,40 +140,142 @@ private predicate scopeAssigns(Scope::Range scope, string name, Ruby::AstNode i)
  name = variableNameInScope(i, scope)
 }

+private module Input implements LocalNameBindingInputSig<Location> {
+  predicate cacheRevRef() { exists(TVariable v) implies any() }
+
+  class AstNode = Ruby::AstNode;
+
+  AstNode getChild(AstNode parent, int index) {
+    parent = parentOf(result) and
+    (
+      index = result.getParentIndex()
+      or
+      not exists(result.getParentIndex()) and
+      index = -1
+    )
+  }
+
+  class Conditional extends AstNode {
+    Conditional() { none() }
+
+    AstNode getCondition() { none() }
+
+    AstNode getThen() { none() }
+
+    AstNode getElse() { none() }
+  }
+
+  class SiblingShadowingDecl extends AstNode {
+    SiblingShadowingDecl() { none() }
+
+    AstNode getLhs() { none() }
+
+    AstNode getRhs() { none() }
+
+    AstNode getElse() { none() }
+  }
+
+  predicate isTopScope(AstNode scope) {
+    scope instanceof Scope::Range and
+    not (
+      scope instanceof Ruby::Block or
+      scope instanceof Ruby::DoBlock or
+      scope instanceof Ruby::Lambda
+    )
+  }
+
+  private Scope::Range getParentScope(Scope::Range scope) {
+    result = scopeOf(scope) and
+    not isTopScope(scope)
+  }
+
+  bindingset[name, scope]
+  pragma[inline_late]
+  private predicate declInScope0(AstNode definingNode, string name, AstNode scope) {
+    scopeDefinesParameterVariable(scope, name, definingNode, _) or
+    scopeAssigns(scope, name, definingNode)
+  }
+
+  predicate declInScope(AstNode definingNode, string name, AstNode scope) {
+    scopeDefinesParameterVariable(scope, name, definingNode, _)
+    or
+    /*
+     * Variables are not declared explicitly in Ruby, so we consider the _first_ assignment to
+     * be the declaration:
+     *
+     * ```rb
+     * a = 1 # declares `a`
+     * a = 2 # does not declare `a`
+     * 1.times do | x | # declares `x`
+     *   a = 2 # does not declare `a`
+     * end
+     * ```
+     */
+
+    scopeAssigns(scope, name, definingNode) and
+    not scopeDefinesParameterVariable(scope, name, _, _) and
+    not exists(AstNode prev, AstNode prevScope |
+      prevScope = getParentScope*(scope) and
+      declInScope0(prev, name, prevScope) and
+      prev.getLocation().strictlyBefore(definingNode.getLocation())
+    )
+  }
+
+  predicate implicitDeclInScope(string name, AstNode scope) {
+    name = "self" and
+    scope instanceof SelfBase::Range
+  }
+
+  predicate accessCand(AstNode n, string name) {
+    name = variableNameInScope(n, _) and
+    (
+      explicitAssignmentNode(n, _)
+      or
+      implicitAssignmentNode(n)
+      or
+      scopeDefinesParameterVariable(_, _, n, _)
+      or
+      vcall(n)
+      or
+      n = any(Ruby::VariableReferencePattern vr).getName()
+      or
+      n = ImplicitHashValueSynthesis::keyWithoutValue(_, _)
+    )
+    or
+    n instanceof Ruby::Self and
+    name = "self"
+  }
+}
+
+private import LocalNameBinding<Location, Input>
+
 cached
 private module Cached {
  cached
  newtype TVariable =
-    TGlobalVariable(string name) { name = any(Ruby::GlobalVariable var).getValue() } or
+    TGlobalVariable(string name) {
+      CachedStage::ref() and
+      name = any(Ruby::GlobalVariable var).getValue()
+    } or
    TClassVariable(Scope::Range scope, string name, Ruby::AstNode decl) {
      decl =
-        min(Ruby::ClassVariable other |
-          classVariableAccess(other, name, scope)
+        min(Ruby::ClassVariable other, int startline, int startcolumn |
+          classVariableAccess(other, name, scope) and
+          other.getLocation().hasLocationInfo(_, startline, startcolumn, _, _)
        |
-          other order by other.getLocation().getStartLine(), other.getLocation().getStartColumn()
+          other order by startline, startcolumn
        )
    } or
    TInstanceVariable(Scope::Range scope, string name, boolean instance, Ruby::AstNode decl) {
      decl =
-        min(Ruby::InstanceVariable other |
-          instanceVariableAccess(other, name, scope, instance)
+        min(Ruby::InstanceVariable other, int startline, int startcolumn |
+          instanceVariableAccess(other, name, scope, instance) and
+          other.getLocation().hasLocationInfo(_, startline, startcolumn, _, _)
        |
-          other order by other.getLocation().getStartLine(), other.getLocation().getStartColumn()
+          other order by startline, startcolumn
        )
    } or
-    TLocalVariableReal(Scope::Range scope, string name, Ruby::AstNode i) {
-      scopeDefinesParameterVariable(scope, name, i, _)
-      or
-      i =
-        min(Ruby::AstNode other |
-          scopeAssigns(scope, name, other)
-        |
-          other order by other.getLocation().getStartLine(), other.getLocation().getStartColumn()
-        ) and
-      not scopeDefinesParameterVariable(scope, name, _, _) and
-      not inherits(scope, name, _)
-    } or
-    TSelfVariable(SelfBase::Range scope) or
+    TLocalVariableReal(Local l) or
    TLocalVariableSynth(AstNode n, int i) { any(Synthesis s).localVariable(n, i) }

  // Db types that can be vcalls
@@ -321,39 +426,37 @@ private module Cached {
    i = any(Ruby::ExpressionReferencePattern x).getValue()
  }

-  pragma[nomagic]
-  private predicate hasScopeAndName(VariableReal variable, Scope::Range scope, string name) {
-    variable.getNameImpl() = name and
-    scope = variable.getDeclaringScopeImpl()
-  }
-
  cached
  predicate access(Ruby::AstNode access, VariableReal variable) {
-    exists(string name, Scope::Range scope |
-      pragma[only_bind_into](name) = variableNameInScope(access, scope)
+    exists(Local l |
+      variable = TLocalVariableReal(l) and
+      access = l.getAnAccess()
    |
-      hasScopeAndName(variable, scope, name) and
-      not access.getLocation().strictlyBefore(variable.getLocationImpl()) and
-      // In case of overlapping parameter names, later parameters should not
-      // be considered accesses to the first parameter
-      if parameterAssignment(_, _, access, _)
-      then scopeDefinesParameterVariable(_, _, access, _)
-      else any()
+      l instanceof ImplicitLocal
      or
-      exists(Scope::Range declScope |
-        hasScopeAndName(variable, declScope, pragma[only_bind_into](name)) and
-        inherits(scope, name, declScope)
-      )
+      /*
+       * In the example below, `a` is declared in the scope of `M`, but only the
+       * second mention of `a` is an actual access:
+       *
+       * ```rb
+       * module M
+       *   puts a # calls method `a`
+       *   a = 1  # declares `a`
+       *   puts a # accesses variable `a`
+       * end
+       * ```
+       */
+
+      not access.getLocation().strictlyBefore(l.getDefiningNode().getLocation())
    )
  }

  private class Access extends Ruby::Token {
    Access() {
-      access(this.(Ruby::Identifier), _) or
+      access(this, _) or
      this instanceof Ruby::GlobalVariable or
      this instanceof Ruby::InstanceVariable or
-      this instanceof Ruby::ClassVariable or
-      this instanceof Ruby::Self
+      this instanceof Ruby::ClassVariable
    }
  }

@@ -398,29 +501,6 @@ private module Cached {

 import Cached

-/** Holds if this scope inherits `name` from an outer scope `outer`. */
-private predicate inherits(Scope::Range scope, string name, Scope::Range outer) {
-  (
-    scope instanceof Ruby::Block or
-    scope instanceof Ruby::DoBlock or
-    scope instanceof Ruby::Lambda
-  ) and
-  not scopeDefinesParameterVariable(scope, name, _, _) and
-  (
-    outer = scope.getOuterScope() and
-    (
-      scopeDefinesParameterVariable(outer, name, _, _)
-      or
-      exists(Ruby::AstNode i |
-        scopeAssigns(outer, name, i) and
-        i.getLocation().strictlyBefore(scope.getLocation())
-      )
-    )
-    or
-    inherits(scope.getOuterScope(), name, outer)
-  )
-}
-
 abstract class VariableImpl extends TVariable {
  abstract string getNameImpl();

@@ -429,10 +509,9 @@ abstract class VariableImpl extends TVariable {
  abstract Location getLocationImpl();
 }

-class TVariableReal =
-  TGlobalVariable or TClassVariable or TInstanceVariable or TLocalVariableReal or TSelfVariable;
+class TVariableReal = TGlobalVariable or TClassVariable or TInstanceVariable or TLocalVariableReal;

-class TLocalVariable = TLocalVariableReal or TLocalVariableSynth or TSelfVariable;
+class TLocalVariable = TLocalVariableReal or TLocalVariableSynth;

 /**
 * A "real" (i.e. non-synthesized) variable. This class only exists to
@@ -458,19 +537,19 @@ private class VariableRealAdapter extends VariableImpl, TVariableReal instanceof
 }

 class LocalVariableReal extends VariableReal, TLocalVariableReal {
-  private Scope::Range scope;
-  private string name;
-  private Ruby::AstNode i;
+  private Local l;

-  LocalVariableReal() { this = TLocalVariableReal(scope, name, i) }
+  LocalVariableReal() { this = TLocalVariableReal(l) }

-  final override string getNameImpl() { result = name }
+  Ruby::AstNode getDefiningNode() { result = l.getDefiningNode() }

-  final override Location getLocationImpl() { result = i.getLocation() }
+  final override string getNameImpl() { result = l.getName() }

-  final override Scope::Range getDeclaringScopeImpl() { result = scope }
+  final override Location getLocationImpl() { result = l.getLocation() }

-  final VariableAccess getDefiningAccessImpl() { toGenerated(result) = i }
+  final override Scope::Range getDeclaringScopeImpl() { result = l.getScope() }
+
+  final VariableAccess getDefiningAccessImpl() { toGenerated(result) = l.getDefiningNode() }
 }

 class LocalVariableSynth extends VariableImpl, TLocalVariableSynth {
@@ -531,34 +610,16 @@ class ClassVariableImpl extends VariableReal, TClassVariable {
  final override Scope::Range getDeclaringScopeImpl() { result = scope }
 }

-class SelfVariableImpl extends VariableReal, TSelfVariable {
-  private SelfBase::Range scope;
+class SelfVariableImpl extends LocalVariableReal {
+  private ImplicitLocal l;

-  SelfVariableImpl() { this = TSelfVariable(scope) }
-
-  final override string getNameImpl() { result = "self" }
-
-  final override Location getLocationImpl() { result = scope.getLocation() }
-
-  final override Scope::Range getDeclaringScopeImpl() { result = scope }
+  SelfVariableImpl() { this = TLocalVariableReal(l) }
 }

 abstract class VariableAccessImpl extends Expr, TVariableAccess {
  abstract VariableImpl getVariableImpl();
 }

-module LocalVariableAccess {
-  predicate range(Ruby::Identifier id, TLocalVariableReal v) {
-    access(id, v) and
-    (
-      explicitWriteAccess(id, _) or
-      implicitWriteAccess(id) or
-      vcall(id) or
-      id = any(Ruby::VariableReferencePattern vr).getName()
-    )
-  }
-}
-
 class TVariableAccessReal =
  TLocalVariableAccessReal or TGlobalVariableAccess or TInstanceVariableAccess or
      TClassVariableAccess;
@@ -681,7 +742,8 @@ private class SelfVariableAccessReal extends SelfVariableAccessImpl, TSelfReal {

  SelfVariableAccessReal() {
    exists(Ruby::Self self |
-      this = TSelfReal(self) and var = TSelfVariable(scopeOf(self).getEnclosingSelfScope())
+      this = TSelfReal(self) and
+      access(self, var)
    )
  }

--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -14,6 +14,7 @@ dependencies:
  codeql/ssa: ${workspace}
  codeql/tutorial: ${workspace}
  codeql/util: ${workspace}
+  codeql/namebinding: ${workspace}
 dataExtensions:
  - codeql/ruby/frameworks/**/model.yml
  - codeql/ruby/frameworks/**/*.model.yml
--- a/ruby/ql/test/library-tests/variables/parameter.expected
+++ b/ruby/ql/test/library-tests/variables/parameter.expected
@@ -28,6 +28,7 @@ parameterVariable
 | parameters.rb:59:22:59:26 | (..., ...) | parameters.rb:59:25:59:25 | c |
 | scopes.rb:2:14:2:14 | x | scopes.rb:2:14:2:14 | x |
 | scopes.rb:9:14:9:14 | x | scopes.rb:9:14:9:14 | x |
+| scopes.rb:69:15:69:15 | x | scopes.rb:69:15:69:15 | x |
 | ssa.rb:1:7:1:7 | b | ssa.rb:1:7:1:7 | b |
 | ssa.rb:18:8:18:8 | x | ssa.rb:18:8:18:8 | x |
 | ssa.rb:25:8:25:15 | elements | ssa.rb:25:8:25:15 | elements |
--- a/ruby/ql/test/library-tests/variables/scopes.rb
+++ b/ruby/ql/test/library-tests/variables/scopes.rb
@@ -47,3 +47,27 @@ module M
  #{var2}
 EOF
 end
+
+module ExceptionVariable
+  class MyException < Exception
+  end
+
+  x = 1
+  puts x
+
+  begin
+    raise MyException
+  rescue MyException => x # reuses `x` from above
+    puts x
+  end
+  puts x # prints `MyException`, not `1`
+end
+
+module ParameterShadowing
+  x = 1
+  xs = [1, 2, 3]
+  xs.each do |x|
+    puts x
+  end
+  puts x # prints `1`, not `3`
+end
--- a/ruby/ql/test/library-tests/variables/ssa.expected
+++ b/ruby/ql/test/library-tests/variables/ssa.expected
@@ -86,12 +86,12 @@ definition
 | parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a |
 | parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b |
 | parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c |
-| scopes.rb:1:1:49:4 | self (scopes.rb) | scopes.rb:1:1:49:4 | self |
-| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:49:4 | self |
+| scopes.rb:1:1:73:3 | self (scopes.rb) | scopes.rb:1:1:73:3 | self |
+| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:73:3 | self |
 | scopes.rb:4:4:4:4 | a | scopes.rb:4:4:4:4 | a |
 | scopes.rb:7:1:7:1 | a | scopes.rb:7:1:7:1 | a |
 | scopes.rb:9:9:18:3 | <captured entry> a | scopes.rb:7:1:7:1 | a |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self |
 | scopes.rb:11:4:11:4 | a | scopes.rb:7:1:7:1 | a |
 | scopes.rb:13:4:13:4 | a | scopes.rb:7:1:7:1 | a |
 | scopes.rb:13:7:13:7 | b | scopes.rb:13:7:13:7 | b |
@@ -99,13 +99,18 @@ definition
 | scopes.rb:13:11:13:11 | c | scopes.rb:13:11:13:11 | c |
 | scopes.rb:13:14:13:14 | d | scopes.rb:13:14:13:14 | d |
 | scopes.rb:13:19:13:32 | __synth__3 | scopes.rb:13:4:13:32 | __synth__3 |
-| scopes.rb:26:1:26:12 | self (A) | scopes.rb:26:1:26:12 | self |
 | scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:1 | x |
-| scopes.rb:28:1:30:3 | self (B) | scopes.rb:28:1:30:3 | self |
-| scopes.rb:34:1:36:3 | self (C) | scopes.rb:34:1:36:3 | self |
 | scopes.rb:41:1:49:3 | self (M) | scopes.rb:41:1:49:3 | self |
 | scopes.rb:42:2:42:4 | var | scopes.rb:42:2:42:4 | var |
 | scopes.rb:46:5:46:8 | var2 | scopes.rb:46:5:46:8 | var2 |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self |
+| scopes.rb:55:3:55:3 | x | scopes.rb:55:3:55:3 | x |
+| scopes.rb:60:25:60:25 | x | scopes.rb:55:3:55:3 | x |
+| scopes.rb:66:1:73:3 | self (ParameterShadowing) | scopes.rb:66:1:73:3 | self |
+| scopes.rb:67:3:67:3 | x | scopes.rb:67:3:67:3 | x |
+| scopes.rb:68:3:68:4 | xs | scopes.rb:68:3:68:4 | xs |
+| scopes.rb:69:11:71:5 | <captured entry> self | scopes.rb:66:1:73:3 | self |
+| scopes.rb:69:15:69:15 | x | scopes.rb:69:15:69:15 | x |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self |
 | ssa.rb:1:7:1:7 | b | ssa.rb:1:7:1:7 | b |
 | ssa.rb:2:3:2:3 | i | ssa.rb:2:3:2:3 | i |
@@ -262,20 +267,20 @@ read
 | parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:60:11:60:11 | a |
 | parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:60:16:60:16 | b |
 | parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c | parameters.rb:60:21:60:21 | c |
-| scopes.rb:1:1:49:4 | self (scopes.rb) | scopes.rb:1:1:49:4 | self | scopes.rb:8:1:8:6 | self |
-| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:3:4:3:9 | self |
-| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:3:9:3:9 | self |
-| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:5:4:5:9 | self |
+| scopes.rb:1:1:73:3 | self (scopes.rb) | scopes.rb:1:1:73:3 | self | scopes.rb:8:1:8:6 | self |
+| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:3:4:3:9 | self |
+| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:3:9:3:9 | self |
+| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:5:4:5:9 | self |
 | scopes.rb:4:4:4:4 | a | scopes.rb:4:4:4:4 | a | scopes.rb:5:9:5:9 | a |
 | scopes.rb:7:1:7:1 | a | scopes.rb:7:1:7:1 | a | scopes.rb:8:6:8:6 | a |
 | scopes.rb:9:9:18:3 | <captured entry> a | scopes.rb:7:1:7:1 | a | scopes.rb:10:9:10:9 | a |
 | scopes.rb:9:9:18:3 | <captured entry> a | scopes.rb:7:1:7:1 | a | scopes.rb:11:4:11:4 | a |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:10:4:10:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:12:4:12:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:14:4:14:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:15:4:15:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:16:4:16:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:17:4:17:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:10:4:10:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:12:4:12:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:14:4:14:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:15:4:15:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:16:4:16:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:17:4:17:9 | self |
 | scopes.rb:11:4:11:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:12:9:12:9 | a |
 | scopes.rb:13:4:13:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
 | scopes.rb:13:7:13:7 | b | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
@@ -294,6 +299,18 @@ read
 | scopes.rb:41:1:49:3 | self (M) | scopes.rb:41:1:49:3 | self | scopes.rb:45:5:45:7 | self |
 | scopes.rb:42:2:42:4 | var | scopes.rb:42:2:42:4 | var | scopes.rb:44:5:44:7 | var |
 | scopes.rb:46:5:46:8 | var2 | scopes.rb:46:5:46:8 | var2 | scopes.rb:47:5:47:8 | var2 |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:56:3:56:8 | self |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:59:5:59:21 | self |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:61:5:61:10 | self |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:63:3:63:8 | self |
+| scopes.rb:55:3:55:3 | x | scopes.rb:55:3:55:3 | x | scopes.rb:56:8:56:8 | x |
+| scopes.rb:60:25:60:25 | x | scopes.rb:55:3:55:3 | x | scopes.rb:61:10:61:10 | x |
+| scopes.rb:60:25:60:25 | x | scopes.rb:55:3:55:3 | x | scopes.rb:63:8:63:8 | x |
+| scopes.rb:66:1:73:3 | self (ParameterShadowing) | scopes.rb:66:1:73:3 | self | scopes.rb:72:3:72:8 | self |
+| scopes.rb:67:3:67:3 | x | scopes.rb:67:3:67:3 | x | scopes.rb:72:8:72:8 | x |
+| scopes.rb:68:3:68:4 | xs | scopes.rb:68:3:68:4 | xs | scopes.rb:69:3:69:4 | xs |
+| scopes.rb:69:11:71:5 | <captured entry> self | scopes.rb:66:1:73:3 | self | scopes.rb:70:5:70:10 | self |
+| scopes.rb:69:15:69:15 | x | scopes.rb:69:15:69:15 | x | scopes.rb:70:10:70:10 | x |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self | ssa.rb:3:3:3:8 | self |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self | ssa.rb:4:3:4:12 | self |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self | ssa.rb:7:5:7:10 | self |
@@ -443,12 +460,12 @@ firstRead
 | parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:60:11:60:11 | a |
 | parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:60:16:60:16 | b |
 | parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c | parameters.rb:60:21:60:21 | c |
-| scopes.rb:1:1:49:4 | self (scopes.rb) | scopes.rb:1:1:49:4 | self | scopes.rb:8:1:8:6 | self |
-| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:3:4:3:9 | self |
+| scopes.rb:1:1:73:3 | self (scopes.rb) | scopes.rb:1:1:73:3 | self | scopes.rb:8:1:8:6 | self |
+| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:3:4:3:9 | self |
 | scopes.rb:4:4:4:4 | a | scopes.rb:4:4:4:4 | a | scopes.rb:5:9:5:9 | a |
 | scopes.rb:7:1:7:1 | a | scopes.rb:7:1:7:1 | a | scopes.rb:8:6:8:6 | a |
 | scopes.rb:9:9:18:3 | <captured entry> a | scopes.rb:7:1:7:1 | a | scopes.rb:10:9:10:9 | a |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:10:4:10:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:10:4:10:9 | self |
 | scopes.rb:11:4:11:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:12:9:12:9 | a |
 | scopes.rb:13:4:13:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
 | scopes.rb:13:7:13:7 | b | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
@@ -460,6 +477,14 @@ firstRead
 | scopes.rb:41:1:49:3 | self (M) | scopes.rb:41:1:49:3 | self | scopes.rb:45:5:45:7 | self |
 | scopes.rb:42:2:42:4 | var | scopes.rb:42:2:42:4 | var | scopes.rb:44:5:44:7 | var |
 | scopes.rb:46:5:46:8 | var2 | scopes.rb:46:5:46:8 | var2 | scopes.rb:47:5:47:8 | var2 |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:56:3:56:8 | self |
+| scopes.rb:55:3:55:3 | x | scopes.rb:55:3:55:3 | x | scopes.rb:56:8:56:8 | x |
+| scopes.rb:60:25:60:25 | x | scopes.rb:55:3:55:3 | x | scopes.rb:61:10:61:10 | x |
+| scopes.rb:66:1:73:3 | self (ParameterShadowing) | scopes.rb:66:1:73:3 | self | scopes.rb:72:3:72:8 | self |
+| scopes.rb:67:3:67:3 | x | scopes.rb:67:3:67:3 | x | scopes.rb:72:8:72:8 | x |
+| scopes.rb:68:3:68:4 | xs | scopes.rb:68:3:68:4 | xs | scopes.rb:69:3:69:4 | xs |
+| scopes.rb:69:11:71:5 | <captured entry> self | scopes.rb:66:1:73:3 | self | scopes.rb:70:5:70:10 | self |
+| scopes.rb:69:15:69:15 | x | scopes.rb:69:15:69:15 | x | scopes.rb:70:10:70:10 | x |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self | ssa.rb:3:3:3:8 | self |
 | ssa.rb:1:7:1:7 | b | ssa.rb:1:7:1:7 | b | ssa.rb:5:6:5:6 | b |
 | ssa.rb:2:3:2:3 | i | ssa.rb:2:3:2:3 | i | ssa.rb:3:8:3:8 | i |
@@ -532,14 +557,14 @@ adjacentReads
 | parameters.rb:25:1:28:3 | self (opt_param) | parameters.rb:25:1:28:3 | self | parameters.rb:26:3:26:11 | self | parameters.rb:27:3:27:11 | self |
 | parameters.rb:25:15:25:18 | name | parameters.rb:25:15:25:18 | name | parameters.rb:25:40:25:43 | name | parameters.rb:26:8:26:11 | name |
 | parameters.rb:54:9:57:3 | <captured entry> self | parameters.rb:1:1:62:1 | self | parameters.rb:55:4:55:9 | self | parameters.rb:56:4:56:9 | self |
-| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:3:4:3:9 | self | scopes.rb:3:9:3:9 | self |
-| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:3:9:3:9 | self | scopes.rb:5:4:5:9 | self |
+| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:3:4:3:9 | self | scopes.rb:3:9:3:9 | self |
+| scopes.rb:2:9:6:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:3:9:3:9 | self | scopes.rb:5:4:5:9 | self |
 | scopes.rb:9:9:18:3 | <captured entry> a | scopes.rb:7:1:7:1 | a | scopes.rb:10:9:10:9 | a | scopes.rb:11:4:11:4 | a |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:10:4:10:9 | self | scopes.rb:12:4:12:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:12:4:12:9 | self | scopes.rb:14:4:14:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:14:4:14:9 | self | scopes.rb:15:4:15:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:15:4:15:9 | self | scopes.rb:16:4:16:9 | self |
-| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:49:4 | self | scopes.rb:16:4:16:9 | self | scopes.rb:17:4:17:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:10:4:10:9 | self | scopes.rb:12:4:12:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:12:4:12:9 | self | scopes.rb:14:4:14:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:14:4:14:9 | self | scopes.rb:15:4:15:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:15:4:15:9 | self | scopes.rb:16:4:16:9 | self |
+| scopes.rb:9:9:18:3 | <captured entry> self | scopes.rb:1:1:73:3 | self | scopes.rb:16:4:16:9 | self | scopes.rb:17:4:17:9 | self |
 | scopes.rb:13:10:13:15 | __synth__2__1 | scopes.rb:13:10:13:15 | __synth__2__1 | scopes.rb:13:11:13:11 | __synth__2__1 | scopes.rb:13:14:13:14 | __synth__2__1 |
 | scopes.rb:13:19:13:32 | __synth__3 | scopes.rb:13:4:13:32 | __synth__3 | scopes.rb:13:4:13:4 | __synth__3 | scopes.rb:13:7:13:7 | __synth__3 |
 | scopes.rb:13:19:13:32 | __synth__3 | scopes.rb:13:4:13:32 | __synth__3 | scopes.rb:13:7:13:7 | __synth__3 | scopes.rb:13:10:13:15 | __synth__3 |
@@ -547,6 +572,10 @@ adjacentReads
 | scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:1 | x | scopes.rb:31:10:31:10 | x | scopes.rb:34:7:34:7 | x |
 | scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:1 | x | scopes.rb:34:7:34:7 | x | scopes.rb:34:14:34:14 | x |
 | scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:1 | x | scopes.rb:34:14:34:14 | x | scopes.rb:37:5:37:5 | x |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:56:3:56:8 | self | scopes.rb:59:5:59:21 | self |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:59:5:59:21 | self | scopes.rb:61:5:61:10 | self |
+| scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self | scopes.rb:61:5:61:10 | self | scopes.rb:63:3:63:8 | self |
+| scopes.rb:60:25:60:25 | x | scopes.rb:55:3:55:3 | x | scopes.rb:61:10:61:10 | x | scopes.rb:63:8:63:8 | x |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self | ssa.rb:3:3:3:8 | self | ssa.rb:4:3:4:12 | self |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self | ssa.rb:4:3:4:12 | self | ssa.rb:7:5:7:10 | self |
 | ssa.rb:1:1:16:3 | self (m) | ssa.rb:1:1:16:3 | self | ssa.rb:4:3:4:12 | self | ssa.rb:11:5:11:10 | self |
--- a/ruby/ql/test/library-tests/variables/varaccess.expected
+++ b/ruby/ql/test/library-tests/variables/varaccess.expected
@@ -155,43 +155,43 @@ variableAccess
 | parameters.rb:60:16:60:16 | b | parameters.rb:59:23:59:23 | b | parameters.rb:59:1:61:3 | tuples_nested |
 | parameters.rb:60:21:60:21 | c | parameters.rb:59:25:59:25 | c | parameters.rb:59:1:61:3 | tuples_nested |
 | scopes.rb:2:14:2:14 | x | scopes.rb:2:14:2:14 | x | scopes.rb:2:9:6:3 | do ... end |
-| scopes.rb:3:4:3:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:3:9:3:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:3:4:3:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:3:9:3:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:4:4:4:4 | a | scopes.rb:4:4:4:4 | a | scopes.rb:2:9:6:3 | do ... end |
-| scopes.rb:5:4:5:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:5:4:5:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:5:9:5:9 | a | scopes.rb:4:4:4:4 | a | scopes.rb:2:9:6:3 | do ... end |
-| scopes.rb:7:1:7:1 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:8:1:8:6 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:8:6:8:6 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:7:1:7:1 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:8:1:8:6 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:8:6:8:6 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:9:14:9:14 | x | scopes.rb:9:14:9:14 | x | scopes.rb:9:9:18:3 | do ... end |
-| scopes.rb:10:4:10:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:10:9:10:9 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:11:4:11:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:11:4:11:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:12:4:12:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:12:9:12:9 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:13:4:13:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:10:4:10:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:10:9:10:9 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:11:4:11:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:11:4:11:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:12:4:12:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:12:9:12:9 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:13:4:13:4 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:13:7:13:7 | b | scopes.rb:13:7:13:7 | b | scopes.rb:9:9:18:3 | do ... end |
 | scopes.rb:13:11:13:11 | c | scopes.rb:13:11:13:11 | c | scopes.rb:9:9:18:3 | do ... end |
 | scopes.rb:13:14:13:14 | d | scopes.rb:13:14:13:14 | d | scopes.rb:9:9:18:3 | do ... end |
-| scopes.rb:14:4:14:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:14:9:14:9 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:15:4:15:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:14:4:14:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:14:9:14:9 | a | scopes.rb:7:1:7:1 | a | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:15:4:15:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:15:9:15:9 | b | scopes.rb:13:7:13:7 | b | scopes.rb:9:9:18:3 | do ... end |
-| scopes.rb:16:4:16:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:16:4:16:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:16:9:16:9 | c | scopes.rb:13:11:13:11 | c | scopes.rb:9:9:18:3 | do ... end |
-| scopes.rb:17:4:17:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:17:4:17:9 | self | scopes.rb:1:1:73:3 | self | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:17:9:17:9 | d | scopes.rb:13:14:13:14 | d | scopes.rb:9:9:18:3 | do ... end |
-| scopes.rb:24:1:24:6 | script | scopes.rb:24:1:24:6 | script | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:28:8:28:8 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:24:1:24:6 | script | scopes.rb:24:1:24:6 | script | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:28:8:28:8 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:29:3:29:3 | x | scopes.rb:29:3:29:3 | x | scopes.rb:28:1:30:3 | B |
-| scopes.rb:31:10:31:10 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:31:10:31:10 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:32:3:32:3 | x | scopes.rb:32:3:32:3 | x | scopes.rb:31:1:33:3 | class << ... |
-| scopes.rb:34:7:34:7 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:49:4 | scopes.rb |
-| scopes.rb:34:14:34:14 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:34:7:34:7 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:73:3 | scopes.rb |
+| scopes.rb:34:14:34:14 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:35:3:35:3 | x | scopes.rb:35:3:35:3 | x | scopes.rb:34:1:36:3 | C |
-| scopes.rb:37:5:37:5 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:37:5:37:5 | x | scopes.rb:27:1:27:1 | x | scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:38:3:38:3 | x | scopes.rb:38:3:38:3 | x | scopes.rb:37:1:39:3 | foo |
 | scopes.rb:42:2:42:4 | var | scopes.rb:42:2:42:4 | var | scopes.rb:41:1:49:3 | M |
 | scopes.rb:43:2:43:4 | foo | scopes.rb:43:2:43:4 | foo | scopes.rb:41:1:49:3 | M |
@@ -199,6 +199,23 @@ variableAccess
 | scopes.rb:45:5:45:7 | self | scopes.rb:41:1:49:3 | self | scopes.rb:41:1:49:3 | M |
 | scopes.rb:46:5:46:8 | var2 | scopes.rb:46:5:46:8 | var2 | scopes.rb:41:1:49:3 | M |
 | scopes.rb:47:5:47:8 | var2 | scopes.rb:46:5:46:8 | var2 | scopes.rb:41:1:49:3 | M |
+| scopes.rb:55:3:55:3 | x | scopes.rb:55:3:55:3 | x | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:56:3:56:8 | self | scopes.rb:51:1:64:3 | self | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:56:8:56:8 | x | scopes.rb:55:3:55:3 | x | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:59:5:59:21 | self | scopes.rb:51:1:64:3 | self | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:60:25:60:25 | x | scopes.rb:55:3:55:3 | x | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:61:5:61:10 | self | scopes.rb:51:1:64:3 | self | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:61:10:61:10 | x | scopes.rb:55:3:55:3 | x | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:63:3:63:8 | self | scopes.rb:51:1:64:3 | self | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:63:8:63:8 | x | scopes.rb:55:3:55:3 | x | scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:67:3:67:3 | x | scopes.rb:67:3:67:3 | x | scopes.rb:66:1:73:3 | ParameterShadowing |
+| scopes.rb:68:3:68:4 | xs | scopes.rb:68:3:68:4 | xs | scopes.rb:66:1:73:3 | ParameterShadowing |
+| scopes.rb:69:3:69:4 | xs | scopes.rb:68:3:68:4 | xs | scopes.rb:66:1:73:3 | ParameterShadowing |
+| scopes.rb:69:15:69:15 | x | scopes.rb:69:15:69:15 | x | scopes.rb:69:11:71:5 | do ... end |
+| scopes.rb:70:5:70:10 | self | scopes.rb:66:1:73:3 | self | scopes.rb:66:1:73:3 | ParameterShadowing |
+| scopes.rb:70:10:70:10 | x | scopes.rb:69:15:69:15 | x | scopes.rb:69:11:71:5 | do ... end |
+| scopes.rb:72:3:72:8 | self | scopes.rb:66:1:73:3 | self | scopes.rb:66:1:73:3 | ParameterShadowing |
+| scopes.rb:72:8:72:8 | x | scopes.rb:67:3:67:3 | x | scopes.rb:66:1:73:3 | ParameterShadowing |
 | ssa.rb:1:7:1:7 | b | ssa.rb:1:7:1:7 | b | ssa.rb:1:1:16:3 | m |
 | ssa.rb:2:3:2:3 | i | ssa.rb:2:3:2:3 | i | ssa.rb:1:1:16:3 | m |
 | ssa.rb:3:3:3:8 | self | ssa.rb:1:1:16:3 | self | ssa.rb:1:1:16:3 | m |
@@ -350,6 +367,9 @@ explicitWrite
 | scopes.rb:42:2:42:4 | var | scopes.rb:42:2:42:9 | ... = ... |
 | scopes.rb:43:2:43:4 | foo | scopes.rb:43:2:43:13 | ... = ... |
 | scopes.rb:46:5:46:8 | var2 | scopes.rb:46:5:46:13 | ... = ... |
+| scopes.rb:55:3:55:3 | x | scopes.rb:55:3:55:7 | ... = ... |
+| scopes.rb:67:3:67:3 | x | scopes.rb:67:3:67:7 | ... = ... |
+| scopes.rb:68:3:68:4 | xs | scopes.rb:68:3:68:16 | ... = ... |
 | ssa.rb:2:3:2:3 | i | ssa.rb:2:3:2:7 | ... = ... |
 | ssa.rb:6:5:6:5 | i | ssa.rb:6:5:6:9 | ... = ... |
 | ssa.rb:10:5:10:5 | i | ssa.rb:10:5:10:9 | ... = ... |
@@ -400,6 +420,8 @@ implicitWrite
 | parameters.rb:59:25:59:25 | c |
 | scopes.rb:2:14:2:14 | x |
 | scopes.rb:9:14:9:14 | x |
+| scopes.rb:60:25:60:25 | x |
+| scopes.rb:69:15:69:15 | x |
 | ssa.rb:1:7:1:7 | b |
 | ssa.rb:18:8:18:8 | x |
 | ssa.rb:25:8:25:15 | elements |
@@ -550,6 +572,18 @@ readAccess
 | scopes.rb:44:5:44:7 | var |
 | scopes.rb:45:5:45:7 | self |
 | scopes.rb:47:5:47:8 | var2 |
+| scopes.rb:56:3:56:8 | self |
+| scopes.rb:56:8:56:8 | x |
+| scopes.rb:59:5:59:21 | self |
+| scopes.rb:61:5:61:10 | self |
+| scopes.rb:61:10:61:10 | x |
+| scopes.rb:63:3:63:8 | self |
+| scopes.rb:63:8:63:8 | x |
+| scopes.rb:69:3:69:4 | xs |
+| scopes.rb:70:5:70:10 | self |
+| scopes.rb:70:10:70:10 | x |
+| scopes.rb:72:3:72:8 | self |
+| scopes.rb:72:8:72:8 | x |
 | ssa.rb:3:3:3:8 | self |
 | ssa.rb:3:8:3:8 | i |
 | ssa.rb:4:3:4:12 | self |
@@ -647,6 +681,7 @@ captureAccess
 | scopes.rb:15:4:15:9 | self |
 | scopes.rb:16:4:16:9 | self |
 | scopes.rb:17:4:17:9 | self |
+| scopes.rb:70:5:70:10 | self |
 | ssa.rb:26:7:26:10 | elem |
 | ssa.rb:27:5:27:13 | self |
 | ssa.rb:27:10:27:13 | elem |
--- a/ruby/ql/test/library-tests/variables/variable.expected
+++ b/ruby/ql/test/library-tests/variables/variable.expected
@@ -94,7 +94,7 @@
 | parameters.rb:59:23:59:23 | b |
 | parameters.rb:59:25:59:25 | c |
 | scopes.rb:1:1:1:15 | self |
-| scopes.rb:1:1:49:4 | self |
+| scopes.rb:1:1:73:3 | self |
 | scopes.rb:2:14:2:14 | x |
 | scopes.rb:4:4:4:4 | a |
 | scopes.rb:7:1:7:1 | a |
@@ -124,6 +124,13 @@
 | scopes.rb:42:2:42:4 | var |
 | scopes.rb:43:2:43:4 | foo |
 | scopes.rb:46:5:46:8 | var2 |
+| scopes.rb:51:1:64:3 | self |
+| scopes.rb:52:3:53:5 | self |
+| scopes.rb:55:3:55:3 | x |
+| scopes.rb:66:1:73:3 | self |
+| scopes.rb:67:3:67:3 | x |
+| scopes.rb:68:3:68:4 | xs |
+| scopes.rb:69:15:69:15 | x |
 | ssa.rb:1:1:16:3 | self |
 | ssa.rb:1:1:103:3 | self |
 | ssa.rb:1:7:1:7 | b |
--- a/ruby/ql/test/library-tests/variables/varscopes.expected
+++ b/ruby/ql/test/library-tests/variables/varscopes.expected
@@ -47,7 +47,7 @@
 | parameters.rb:54:9:57:3 | do ... end |
 | parameters.rb:59:1:61:3 | tuples_nested |
 | scopes.rb:1:1:1:15 | a |
-| scopes.rb:1:1:49:4 | scopes.rb |
+| scopes.rb:1:1:73:3 | scopes.rb |
 | scopes.rb:2:9:6:3 | do ... end |
 | scopes.rb:9:9:18:3 | do ... end |
 | scopes.rb:26:1:26:12 | A |
@@ -56,6 +56,10 @@
 | scopes.rb:34:1:36:3 | C |
 | scopes.rb:37:1:39:3 | foo |
 | scopes.rb:41:1:49:3 | M |
+| scopes.rb:51:1:64:3 | ExceptionVariable |
+| scopes.rb:52:3:53:5 | MyException |
+| scopes.rb:66:1:73:3 | ParameterShadowing |
+| scopes.rb:69:11:71:5 | do ... end |
 | ssa.rb:1:1:16:3 | m |
 | ssa.rb:1:1:103:3 | ssa.rb |
 | ssa.rb:18:1:23:3 | m1 |