remove the body field from StaticInitializer and relax the valuye type on MemberDefinition

erik-krogh · erik-krogh · commit c8c7a1f77201 · 2021-09-14T20:40:45.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/ast/DefaultVisitor.java b/javascript/extractor/src/com/semmle/js/ast/DefaultVisitor.java
@@ -785,6 +785,6 @@ public R visit(GeneratedCodeExpr nd, C c) {
 
   @Override
   public R visit(StaticInitializer nd, C c) {
-    return visit((MemberDefinition<Expression>) nd, c);
+    return visit((MemberDefinition<BlockStatement>) nd, c);
   }
 }
diff --git a/javascript/extractor/src/com/semmle/js/ast/MemberDefinition.java b/javascript/extractor/src/com/semmle/js/ast/MemberDefinition.java
@@ -9,7 +9,7 @@
  * <p>A member definition has a name and an optional initial value, whose type is given by the type
  * parameter {@code V}.
  */
-public abstract class MemberDefinition<V extends Expression> extends Node {
+public abstract class MemberDefinition<V extends Node> extends Node {
   /** A bitmask of flags defined in {@linkplain DeclarationFlags}. */
   private final int flags;
 
@@ -21,7 +21,7 @@ public abstract class MemberDefinition<V extends Expression> extends Node {
    */
   private final Expression key;
 
-  /** The initial value of the member. */
+  /** The initial value / initializer of the member. */
   private final V value;
 
   /** The decorators applied to this member, if any. */
diff --git a/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java b/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java
@@ -902,6 +902,6 @@ public INode visit(GeneratedCodeExpr nd, Void c) {
 
   @Override
   public INode visit(StaticInitializer nd, Void c) {
-    return new StaticInitializer(visit(nd.getLoc()), copy(nd.getBody()));
+    return new StaticInitializer(visit(nd.getLoc()), copy(nd.getValue()));
   }
 }
diff --git a/javascript/extractor/src/com/semmle/js/ast/StaticInitializer.java b/javascript/extractor/src/com/semmle/js/ast/StaticInitializer.java
@@ -1,38 +1,19 @@
 package com.semmle.js.ast;
 
 /**
- * A static initializer block in a class.
- * E.g. 
- * ```TypeScript
- * class Foo {
- *  static bar : number;
- *  static {
- *   Foo.bar = 42;
- *  }
- * }
+ * A static initializer block in a class. E.g. ```TypeScript class Foo { static
+ * bar : number; static { Foo.bar = 42; } }
  */
-public class StaticInitializer extends MemberDefinition<Expression> {
-  private final BlockStatement body;
-
+public class StaticInitializer extends MemberDefinition<BlockStatement> {
   public StaticInitializer(SourceLocation loc, BlockStatement body) {
-    super("StaticInitializer", loc, DeclarationFlags.static_, null, null);
-    this.body = body;
-  }
-
-  /**
-   * Gets the body of this static initializer.
-   * @return The body of this static initializer.
-   */
-  public BlockStatement getBody() {
-    return body;
+    super("StaticInitializer", loc, DeclarationFlags.static_, null, body);
   }
 
   @Override
   public boolean isConcrete() {
     return false;
   }
 
-
   @Override
   public <C, R> R accept(Visitor<C, R> v, C c) {
     return v.visit(this, c);
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -1646,11 +1646,6 @@ public Label visit(MemberDefinition<?> nd, Context c) {
         }
       }
 
-      if (nd instanceof StaticInitializer) {
-        StaticInitializer si = (StaticInitializer) nd;
-        visit(si.getBody(), methkey, 3, IdContext.VAR_BIND);
-      }
-
       if (nd instanceof FieldDefinition) {
         FieldDefinition field = (FieldDefinition) nd;
         if (field.isParameterField() && constructorKey != null) {
diff --git a/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
@@ -1165,7 +1165,7 @@ public Void visit(ClassExpression nd, SuccessorInfo i) {
 
     private Void visit(Node nd, AClass ac, SuccessorInfo i) {
       for (MemberDefinition<?> md : ac.getBody().getBody()) {
-        if (md.isConstructor() && md.isConcrete()) constructor2Class.put(md.getValue(), ac);
+        if (md.isConstructor() && md.isConcrete()) constructor2Class.put((Expression)md.getValue(), ac);
       }
       visitSequence(ac.getId(), ac.getSuperClass(), ac.getBody(), nd);
       writeSuccessors(nd, visitSequence(getStaticInitializers(ac.getBody()), getDecoratorsOfClass(ac), i.getAllSuccessors()));
@@ -1627,7 +1627,7 @@ private List<Node> getStaticInitializers(ClassBody nd) {
       List<Node> nodes = new ArrayList<>();
       for (MemberDefinition<?> node : nd.getBody()) {
         if (node instanceof FieldDefinition && ((FieldDefinition)node).isStatic()) nodes.add(node);
-        if (node instanceof StaticInitializer) nodes.add(((StaticInitializer)node).getBody());
+        if (node instanceof StaticInitializer) nodes.add(node.getValue());
       }
       return nodes;
     }

Original file line number	Diff line number	Diff line change
`@@ -785,6 +785,6 @@ public R visit(GeneratedCodeExpr nd, C c) {`
`785`	`785`
`786`	`786`	`@Override`
`787`	`787`	`public R visit(StaticInitializer nd, C c) {`
`788`		`- return visit((MemberDefinition<Expression>) nd, c);`
	`788`	`+ return visit((MemberDefinition<BlockStatement>) nd, c);`
`789`	`789`	`}`
`790`	`790`	`}`
Original file line number	Diff line number	Diff line change
`@@ -902,6 +902,6 @@ public INode visit(GeneratedCodeExpr nd, Void c) {`
`902`	`902`
`903`	`903`	`@Override`
`904`	`904`	`public INode visit(StaticInitializer nd, Void c) {`
`905`		`- return new StaticInitializer(visit(nd.getLoc()), copy(nd.getBody()));`
	`905`	`+ return new StaticInitializer(visit(nd.getLoc()), copy(nd.getValue()));`
`906`	`906`	`}`
`907`	`907`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1646,11 +1646,6 @@ public Label visit(MemberDefinition<?> nd, Context c) {`
`1646`	`1646`	`}`
`1647`	`1647`	`}`
`1648`	`1648`
`1649`		`- if (nd instanceof StaticInitializer) {`
`1650`		`- StaticInitializer si = (StaticInitializer) nd;`
`1651`		`- visit(si.getBody(), methkey, 3, IdContext.VAR_BIND);`
`1652`		`- }`
`1653`		`-`
`1654`	`1649`	`if (nd instanceof FieldDefinition) {`
`1655`	`1650`	`FieldDefinition field = (FieldDefinition) nd;`
`1656`	`1651`	`if (field.isParameterField() && constructorKey != null) {`
Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ public Void visit(ClassExpression nd, SuccessorInfo i) {`
`1165`	`1165`
`1166`	`1166`	`private Void visit(Node nd, AClass ac, SuccessorInfo i) {`
`1167`	`1167`	`for (MemberDefinition<?> md : ac.getBody().getBody()) {`
`1168`		`- if (md.isConstructor() && md.isConcrete()) constructor2Class.put(md.getValue(), ac);`
	`1168`	`+ if (md.isConstructor() && md.isConcrete()) constructor2Class.put((Expression)md.getValue(), ac);`
`1169`	`1169`	`}`
`1170`	`1170`	`visitSequence(ac.getId(), ac.getSuperClass(), ac.getBody(), nd);`
`1171`	`1171`	`writeSuccessors(nd, visitSequence(getStaticInitializers(ac.getBody()), getDecoratorsOfClass(ac), i.getAllSuccessors()));`
`@@ -1627,7 +1627,7 @@ private List<Node> getStaticInitializers(ClassBody nd) {`
`1627`	`1627`	`List<Node> nodes = new ArrayList<>();`
`1628`	`1628`	`for (MemberDefinition<?> node : nd.getBody()) {`
`1629`	`1629`	`if (node instanceof FieldDefinition && ((FieldDefinition)node).isStatic()) nodes.add(node);`
`1630`		`- if (node instanceof StaticInitializer) nodes.add(((StaticInitializer)node).getBody());`
	`1630`	`+ if (node instanceof StaticInitializer) nodes.add(node.getValue());`
`1631`	`1631`	`}`
`1632`	`1632`	`return nodes;`
`1633`	`1633`	`}`