Merge pull request #2098 from asger-semmle/ts-computed-field-name-context

Approved by esben-semmle

Author: semmle-qlci

change-notes/1.23/extractor-javascript.md

@@ -9,3 +9,4 @@
   global scripts are now extracted as modules.
 * Top-level `await` is now supported.
 * A bug was fixed in how the TypeScript extractor handles default-exported anonymous classes.
+* A bug was fixed in how the TypeScript extractor handles computed instance field names.

javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java

@@ -1377,9 +1377,8 @@ public Label visit(MemberDefinition<?> nd, Context c) {
       trapwriter.addTuple("properties", methkey, c.parent, c.childIndex, kind, tostring);
       locationManager.emitNodeLocation(nd, methkey);
       visitAll(nd.getDecorators(), methkey, IdContext.varBind, -1, -1);
-      visit(nd.getKey(), methkey, 0, nd.isComputed() ? IdContext.varBind : IdContext.label);
 
-      // the initialiser expression of an instance field is evaluated as part of
+      // the name and initialiser expression of an instance field is evaluated as part of
       // the constructor, so we adjust our syntactic context to reflect this
       MethodDefinition ctor = null;
       if (nd instanceof FieldDefinition && !nd.isStatic() && !ctors.isEmpty()) ctor = ctors.peek();
@@ -1388,6 +1387,7 @@ public Label visit(MemberDefinition<?> nd, Context c) {
         constructorKey = trapwriter.localID(ctor.getValue());
         contextManager.enterContainer(constructorKey);
       }
+      visit(nd.getKey(), methkey, 0, nd.isComputed() ? IdContext.varBind : IdContext.label);
       visit(nd.getValue(), methkey, 1, c.idcontext);
       if (ctor != null) contextManager.leaveContainer();
 

javascript/extractor/src/com/semmle/js/extractor/Main.java

@@ -37,7 +37,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2019-10-07";
+  public static final String EXTRACTOR_VERSION = "2019-10-08";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 

javascript/extractor/tests/cfg/output/trap/fields.js.trap

@@ -457,8 +457,7 @@ hasLocation(#20156,#20157)
 #20158=*
 exprs(#20158,0,#20156,0,"x")
 hasLocation(#20158,#20059)
-enclosingStmt(#20158,#20139)
-exprContainers(#20158,#20001)
+exprContainers(#20158,#20146)
 literals("x","x",#20158)
 #20159=*
 properties(#20159,#20139,4,8,"static y;")
@@ -650,8 +649,7 @@ hasLocation(#20207,#20208)
 #20209=*
 exprs(#20209,0,#20207,0,"z")
 hasLocation(#20209,#20128)
-enclosingStmt(#20209,#20180)
-exprContainers(#20209,#20001)
+exprContainers(#20209,#20188)
 literals("z","z",#20209)
 #20210=*
 entry_cfg_node(#20210,#20001)

javascript/extractor/tests/esnext/output/trap/fields.js.trap

@@ -258,18 +258,17 @@ properties(#20090,#20086,2,8,"x = new.target;")
 locations_default(#20091,#10000,2,3,2,17)
 hasLocation(#20090,#20091)
 #20092=*
-exprs(#20092,0,#20090,0,"x")
-hasLocation(#20092,#20031)
-enclosingStmt(#20092,#20086)
-exprContainers(#20092,#20001)
-literals("x","x",#20092)
 #20093=*
+exprs(#20093,0,#20090,0,"x")
+hasLocation(#20093,#20031)
+exprContainers(#20093,#20092)
+literals("x","x",#20093)
 #20094=*
 exprs(#20094,82,#20090,1,"new.target")
 #20095=@"loc,{#10000},2,7,2,16"
 locations_default(#20095,#10000,2,7,2,16)
 hasLocation(#20094,#20095)
-exprContainers(#20094,#20093)
+exprContainers(#20094,#20092)
 #20096=*
 properties(#20096,#20086,3,0,"constructor() {}")
 #20097=@"loc,{#10000},1,9,1,8"
@@ -281,21 +280,21 @@ hasLocation(#20098,#20097)
 enclosingStmt(#20098,#20086)
 exprContainers(#20098,#20001)
 literals("constructor","constructor",#20098)
-exprs(#20093,9,#20096,1,"() {}")
-hasLocation(#20093,#20097)
-enclosingStmt(#20093,#20086)
-exprContainers(#20093,#20001)
+exprs(#20092,9,#20096,1,"() {}")
+hasLocation(#20092,#20097)
+enclosingStmt(#20092,#20086)
+exprContainers(#20092,#20001)
 #20099=*
 scopes(#20099,1)
-scopenodes(#20093,#20099)
+scopenodes(#20092,#20099)
 scopenesting(#20099,#20089)
 #20100=@"var;{arguments};{#20099}"
 variables(#20100,"arguments",#20099)
 isArgumentsObject(#20100)
 #20101=*
-stmts(#20101,1,#20093,-2,"{}")
+stmts(#20101,1,#20092,-2,"{}")
 hasLocation(#20101,#20097)
-stmtContainers(#20101,#20093)
+stmtContainers(#20101,#20092)
 isMethod(#20096)
 #20102=*
 stmts(#20102,26,#20001,1,"class B ... er.x;\n}")
@@ -328,26 +327,25 @@ properties(#20107,#20102,2,8,"y = super.x;")
 locations_default(#20108,#10000,6,3,6,14)
 hasLocation(#20107,#20108)
 #20109=*
-exprs(#20109,0,#20107,0,"y")
-hasLocation(#20109,#20054)
-enclosingStmt(#20109,#20102)
-exprContainers(#20109,#20001)
-literals("y","y",#20109)
 #20110=*
+exprs(#20110,0,#20107,0,"y")
+hasLocation(#20110,#20054)
+exprContainers(#20110,#20109)
+literals("y","y",#20110)
 #20111=*
 exprs(#20111,14,#20107,1,"super.x")
 #20112=@"loc,{#10000},6,7,6,13"
 locations_default(#20112,#10000,6,7,6,13)
 hasLocation(#20111,#20112)
-exprContainers(#20111,#20110)
+exprContainers(#20111,#20109)
 #20113=*
 exprs(#20113,81,#20111,0,"super")
 hasLocation(#20113,#20058)
-exprContainers(#20113,#20110)
+exprContainers(#20113,#20109)
 #20114=*
 exprs(#20114,0,#20111,1,"x")
 hasLocation(#20114,#20062)
-exprContainers(#20114,#20110)
+exprContainers(#20114,#20109)
 literals("x","x",#20114)
 #20115=*
 properties(#20115,#20102,3,0,"constru ... rgs); }")
@@ -360,54 +358,54 @@ hasLocation(#20117,#20116)
 enclosingStmt(#20117,#20102)
 exprContainers(#20117,#20001)
 literals("constructor","constructor",#20117)
-exprs(#20110,9,#20115,1,"(...arg ... rgs); }")
-hasLocation(#20110,#20116)
-enclosingStmt(#20110,#20102)
-exprContainers(#20110,#20001)
+exprs(#20109,9,#20115,1,"(...arg ... rgs); }")
+hasLocation(#20109,#20116)
+enclosingStmt(#20109,#20102)
+exprContainers(#20109,#20001)
 #20118=*
 scopes(#20118,1)
-scopenodes(#20110,#20118)
+scopenodes(#20109,#20118)
 scopenesting(#20118,#20105)
 #20119=@"var;{args};{#20118}"
 variables(#20119,"args",#20118)
 #20120=*
-exprs(#20120,78,#20110,0,"args")
+exprs(#20120,78,#20109,0,"args")
 hasLocation(#20120,#20116)
-exprContainers(#20120,#20110)
+exprContainers(#20120,#20109)
 literals("args","args",#20120)
 decl(#20120,#20119)
 #20121=@"var;{arguments};{#20118}"
 variables(#20121,"arguments",#20118)
 isArgumentsObject(#20121)
-hasRestParameter(#20110)
+hasRestParameter(#20109)
 #20122=*
-stmts(#20122,1,#20110,-2,"{ super(...args); }")
+stmts(#20122,1,#20109,-2,"{ super(...args); }")
 hasLocation(#20122,#20116)
-stmtContainers(#20122,#20110)
+stmtContainers(#20122,#20109)
 #20123=*
 stmts(#20123,2,#20122,0,"super(...args);")
 hasLocation(#20123,#20116)
-stmtContainers(#20123,#20110)
+stmtContainers(#20123,#20109)
 #20124=*
 exprs(#20124,13,#20123,0,"super(...args)")
 hasLocation(#20124,#20116)
 enclosingStmt(#20124,#20123)
-exprContainers(#20124,#20110)
+exprContainers(#20124,#20109)
 #20125=*
 exprs(#20125,81,#20124,-1,"super")
 hasLocation(#20125,#20116)
 enclosingStmt(#20125,#20123)
-exprContainers(#20125,#20110)
+exprContainers(#20125,#20109)
 #20126=*
 exprs(#20126,66,#20124,0,"...args")
 hasLocation(#20126,#20116)
 enclosingStmt(#20126,#20123)
-exprContainers(#20126,#20110)
+exprContainers(#20126,#20109)
 #20127=*
 exprs(#20127,79,#20126,0,"args")
 hasLocation(#20127,#20116)
 enclosingStmt(#20127,#20123)
-exprContainers(#20127,#20110)
+exprContainers(#20127,#20109)
 literals("args","args",#20127)
 bind(#20127,#20119)
 isMethod(#20115)
@@ -435,12 +433,11 @@ properties(#20132,#20128,2,8,"async;")
 locations_default(#20133,#10000,10,3,10,8)
 hasLocation(#20132,#20133)
 #20134=*
-exprs(#20134,0,#20132,0,"async")
-hasLocation(#20134,#20073)
-enclosingStmt(#20134,#20128)
-exprContainers(#20134,#20001)
-literals("async","async",#20134)
 #20135=*
+exprs(#20135,0,#20132,0,"async")
+hasLocation(#20135,#20073)
+exprContainers(#20135,#20134)
+literals("async","async",#20135)
 #20136=*
 properties(#20136,#20128,3,0,"constructor() {}")
 #20137=@"loc,{#10000},9,9,9,8"
@@ -452,21 +449,21 @@ hasLocation(#20138,#20137)
 enclosingStmt(#20138,#20128)
 exprContainers(#20138,#20001)
 literals("constructor","constructor",#20138)
-exprs(#20135,9,#20136,1,"() {}")
-hasLocation(#20135,#20137)
-enclosingStmt(#20135,#20128)
-exprContainers(#20135,#20001)
+exprs(#20134,9,#20136,1,"() {}")
+hasLocation(#20134,#20137)
+enclosingStmt(#20134,#20128)
+exprContainers(#20134,#20001)
 #20139=*
 scopes(#20139,1)
-scopenodes(#20135,#20139)
+scopenodes(#20134,#20139)
 scopenesting(#20139,#20131)
 #20140=@"var;{arguments};{#20139}"
 variables(#20140,"arguments",#20139)
 isArgumentsObject(#20140)
 #20141=*
-stmts(#20141,1,#20135,-2,"{}")
+stmts(#20141,1,#20134,-2,"{}")
 hasLocation(#20141,#20137)
-stmtContainers(#20141,#20135)
+stmtContainers(#20141,#20134)
 isMethod(#20136)
 #20142=*
 entry_cfg_node(#20142,#20001)
@@ -476,59 +473,59 @@ hasLocation(#20142,#20143)
 #20144=*
 exit_cfg_node(#20144,#20001)
 hasLocation(#20144,#20078)
-successor(#20134,#20132)
-successor(#20135,#20136)
+successor(#20135,#20132)
+successor(#20134,#20136)
 #20145=*
-entry_cfg_node(#20145,#20135)
+entry_cfg_node(#20145,#20134)
 hasLocation(#20145,#20137)
 successor(#20132,#20141)
 #20146=*
-exit_cfg_node(#20146,#20135)
+exit_cfg_node(#20146,#20134)
 hasLocation(#20146,#20137)
 successor(#20141,#20146)
-successor(#20145,#20134)
-successor(#20138,#20135)
+successor(#20145,#20135)
+successor(#20138,#20134)
 successor(#20136,#20128)
 successor(#20130,#20138)
 successor(#20128,#20144)
 successor(#20114,#20111)
 successor(#20113,#20114)
 successor(#20111,#20107)
-successor(#20109,#20113)
-successor(#20110,#20115)
+successor(#20110,#20113)
+successor(#20109,#20115)
 #20147=*
-entry_cfg_node(#20147,#20110)
+entry_cfg_node(#20147,#20109)
 hasLocation(#20147,#20116)
 #20148=*
-exit_cfg_node(#20148,#20110)
+exit_cfg_node(#20148,#20109)
 hasLocation(#20148,#20116)
 successor(#20122,#20123)
 successor(#20123,#20125)
 successor(#20127,#20126)
 successor(#20126,#20124)
 successor(#20125,#20127)
 successor(#20107,#20148)
-successor(#20124,#20109)
+successor(#20124,#20110)
 successor(#20120,#20122)
 successor(#20147,#20120)
-successor(#20117,#20110)
+successor(#20117,#20109)
 successor(#20115,#20102)
 successor(#20106,#20117)
 successor(#20104,#20106)
 successor(#20102,#20130)
 successor(#20094,#20090)
-successor(#20092,#20094)
-successor(#20093,#20096)
+successor(#20093,#20094)
+successor(#20092,#20096)
 #20149=*
-entry_cfg_node(#20149,#20093)
+entry_cfg_node(#20149,#20092)
 hasLocation(#20149,#20097)
 successor(#20090,#20101)
 #20150=*
-exit_cfg_node(#20150,#20093)
+exit_cfg_node(#20150,#20092)
 hasLocation(#20150,#20097)
 successor(#20101,#20150)
-successor(#20149,#20092)
-successor(#20098,#20093)
+successor(#20149,#20093)
+successor(#20098,#20092)
 successor(#20096,#20086)
 successor(#20088,#20098)
 successor(#20086,#20104)