Ruby: constant lookup is unaffected by blocks

asgerf · asgerf · commit 0ffb0f6d4d09 · 2022-10-24T13:07:21.000+02:00
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll
@@ -408,12 +408,8 @@ private module ResolveImpl {
   string getAnAssumedGlobalConst() {
     exists(ConstantAccess access |
       not exists(access.getScopeExpr()) and
-      result = access.getName()
-    |
-      access.hasGlobalScope()
-      or
-      // At the top-level but not inside a block
-      enclosingModuleNoBlock(access) instanceof Toplevel
+      result = access.getName() and
+      isToplevel(access)
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -408,12 +408,8 @@ private module ResolveImpl {`
`408`	`408`	`string getAnAssumedGlobalConst() {`
`409`	`409`	`exists(ConstantAccess access \|`
`410`	`410`	`not exists(access.getScopeExpr()) and`
`411`		`- result = access.getName()`
`412`		`- \|`
`413`		`- access.hasGlobalScope()`
`414`		`- or`
`415`		`- // At the top-level but not inside a block`
`416`		`- enclosingModuleNoBlock(access) instanceof Toplevel`
	`411`	`+ result = access.getName() and`
	`412`	`+ isToplevel(access)`
`417`	`413`	`)`
`418`	`414`	`}`
`419`	`415`