From c560096b1757f4092da01a3d8d09a941ec55337d Mon Sep 17 00:00:00 2001
From: Max Schaefer <max@semmle.com>
Date: Fri, 31 May 2019 12:04:14 +0100
Subject: [PATCH] JavaScript: Make `Script` and `CodeInAttribute` concrete.

---
 javascript/ql/src/semmle/javascript/AST.qll | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/javascript/ql/src/semmle/javascript/AST.qll b/javascript/ql/src/semmle/javascript/AST.qll
index 3e99e2489926..e240a126397f 100644
--- a/javascript/ql/src/semmle/javascript/AST.qll
+++ b/javascript/ql/src/semmle/javascript/AST.qll
@@ -182,7 +182,9 @@ class TopLevel extends @toplevel, StmtContainer {
 /**
  * A stand-alone file or script originating from an HTML `<script>` element.
  */
-abstract class Script extends TopLevel { }
+class Script extends TopLevel {
+  Script() { this instanceof @script or this instanceof @inline_script }
+}
 
 /**
  * A stand-alone file or an external script originating from an HTML `<script>` element.
@@ -197,7 +199,9 @@ class InlineScript extends @inline_script, Script { }
 /**
  * A code snippet originating from an HTML attribute value.
  */
-abstract class CodeInAttribute extends TopLevel { }
+class CodeInAttribute extends TopLevel {
+  CodeInAttribute() { this instanceof @event_handler or this instanceof @javascript_url }
+}
 
 /**
  * A code snippet originating from an event handler attribute.