From 9540125771eda9094c53e6eb2dd66c284896441a Mon Sep 17 00:00:00 2001
From: Nick Rolfe <nickrolfe@github.com>
Date: Thu, 29 Apr 2021 13:58:16 +0100
Subject: [PATCH] Remove fromGeneratedInclSynth predicate

---
 ql/src/codeql_ruby/ast/internal/AST.qll                        | 2 --
 .../codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll  | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ql/src/codeql_ruby/ast/internal/AST.qll b/ql/src/codeql_ruby/ast/internal/AST.qll
index f193ec558f8..0971118ef39 100644
--- a/ql/src/codeql_ruby/ast/internal/AST.qll
+++ b/ql/src/codeql_ruby/ast/internal/AST.qll
@@ -392,8 +392,6 @@ import Cached
 
 TAstNode fromGenerated(Generated::AstNode n) { n = toGenerated(result) }
 
-TAstNode fromGeneratedInclSynth(Generated::AstNode n) { n = toGeneratedInclSynth(result) }
-
 class TCall = TMethodCall or TYieldCall;
 
 class TMethodCall =
diff --git a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
index aefc449cb45..bd5e91670fd 100644
--- a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -1318,8 +1318,7 @@ private module Cached {
   /** Gets the CFG scope of node `n`. */
   cached
   CfgScope getCfgScopeImpl(AstNode n) {
-    result =
-      parent*(ASTInternal::fromGeneratedInclSynth(scopeOf(ASTInternal::toGeneratedInclSynth(n))))
+    result = parent*(ASTInternal::fromGenerated(scopeOf(ASTInternal::toGeneratedInclSynth(n))))
   }
 
   private predicate isAbnormalExitType(SuccessorType t) {