maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix crash in transformations (#33768)

Browse source
This commit is contained in:
Ron Buckton 2019-10-02 16:13:32 -07:00 committed by GitHub
parent 58854a6182
commit c774762723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 105 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/factory.ts
View file

@ -1065,7 +1065,9 @@ namespace ts {
}
export function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier) {
Debug.assert(!(node.flags & NodeFlags.OptionalChain), "Cannot update a PropertyAccessChain using updatePropertyAccess. Use updatePropertyAccessChain instead.");
if (isOptionalChain(node)) {
return updatePropertyAccessChain(node, expression, node.questionDotToken, name);
}
// Because we are updating existed propertyAccess we want to inherit its emitFlags
// instead of using the default from createPropertyAccess
return node.expression !== expression
@ -1103,7 +1105,9 @@ namespace ts {
}
export function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression) {
Debug.assert(!(node.flags & NodeFlags.OptionalChain), "Cannot update an ElementAccessChain using updateElementAccess. Use updateElementAccessChain instead.");
if (isOptionalChain(node)) {
return updateElementAccessChain(node, expression, node.questionDotToken, argumentExpression);
}
return node.expression !== expression
|| node.argumentExpression !== argumentExpression
? updateNode(createElementAccess(expression, argumentExpression), node)
@ -1137,7 +1141,9 @@ namespace ts {
}
export function updateCall(node: CallExpression, expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[]) {
Debug.assert(!(node.flags & NodeFlags.OptionalChain), "Cannot update a CallChain using updateCall. Use updateCallChain instead.");
if (isOptionalChain(node)) {
return updateCallChain(node, expression, node.questionDotToken, typeArguments, argumentsArray);
}
return node.expression !== expression
|| node.typeArguments !== typeArguments
|| node.arguments !== argumentsArray

8
src/compiler/utilities.ts
View file

@ -5906,9 +5906,11 @@ namespace ts {
}
export function isOptionalChain(node: Node): node is PropertyAccessChain | ElementAccessChain | CallChain {
return isPropertyAccessChain(node)
|| isElementAccessChain(node)
|| isCallChain(node);
const kind = node.kind;
return !!(node.flags & NodeFlags.OptionalChain) &&
(kind === SyntaxKind.PropertyAccessExpression
|| kind === SyntaxKind.ElementAccessExpression
|| kind === SyntaxKind.CallExpression);
}
export function isNewExpression(node: Node): node is NewExpression {

9
tests/baselines/reference/callChain.js
View file

@ -31,7 +31,11 @@ o3["b"]?.(1, ...[2, 3], 4).c;
declare const o4: undefined | (<T>(f: (a: T) => T) => T);
declare function incr(x: number): number;
const v: number | undefined = o4?.(incr);
const v: number | undefined = o4?.(incr);
// GH#33744
declare const o5: <T>() => undefined | (() => void);
o5<number>()?.();
//// [callChain.js]
"use strict";
@ -42,7 +46,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
r[k] = a[j];
return r;
};
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13;
(_a = o1) === null || _a === void 0 ? void 0 : _a();
(_b = o1) === null || _b === void 0 ? void 0 : _b(1);
(_c = o1) === null || _c === void 0 ? void 0 : _c.apply(void 0, [1, 2]);
@ -68,3 +72,4 @@ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u,
(_9 = (_8 = o3)["b"]) === null || _9 === void 0 ? void 0 : _9.call.apply(_9, __spreadArrays([_8], [1, 2])).c;
(_11 = (_10 = o3)["b"]) === null || _11 === void 0 ? void 0 : _11.call.apply(_11, __spreadArrays([_10, 1], [2, 3], [4])).c;
var v = (_12 = o4) === null || _12 === void 0 ? void 0 : _12(incr);
(_13 = o5()) === null || _13 === void 0 ? void 0 : _13();

8
tests/baselines/reference/callChain.symbols
View file

@ -148,3 +148,11 @@ const v: number | undefined = o4?.(incr);
>o4 : Symbol(o4, Decl(callChain.ts, 30, 13))
>incr : Symbol(incr, Decl(callChain.ts, 30, 57))
// GH#33744
declare const o5: <T>() => undefined | (() => void);
>o5 : Symbol(o5, Decl(callChain.ts, 35, 13))
>T : Symbol(T, Decl(callChain.ts, 35, 19))
o5<number>()?.();
>o5 : Symbol(o5, Decl(callChain.ts, 35, 13))

9
tests/baselines/reference/callChain.types
View file

@ -255,3 +255,12 @@ const v: number | undefined = o4?.(incr);
>o4 : (<T>(f: (a: T) => T) => T) | undefined
>incr : (x: number) => number
// GH#33744
declare const o5: <T>() => undefined | (() => void);
>o5 : <T>() => (() => void) | undefined
o5<number>()?.();
>o5<number>()?.() : void | undefined
>o5<number>() : (() => void) | undefined
>o5 : <T>() => (() => void) | undefined

8
tests/baselines/reference/elementAccessChain.js
View file

@ -19,11 +19,14 @@ o5.b?.()["c"].d?.e;
o5.b?.()["c"].d?.["e"];
o5["b"]?.()["c"].d?.e;
o5["b"]?.()["c"].d?.["e"];
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
o6<number>()?.["x"];
//// [elementAccessChain.js]
"use strict";
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
(_a = o1) === null || _a === void 0 ? void 0 : _a["b"];
(_b = o2) === null || _b === void 0 ? void 0 : _b["b"].c;
(_c = o2) === null || _c === void 0 ? void 0 : _c.b["c"];
@ -35,3 +38,4 @@ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u,
(_q = (_p = (_o = o5).b) === null || _p === void 0 ? void 0 : _p.call(_o)["c"].d) === null || _q === void 0 ? void 0 : _q["e"];
(_t = (_s = (_r = o5)["b"]) === null || _s === void 0 ? void 0 : _s.call(_r)["c"].d) === null || _t === void 0 ? void 0 : _t.e;
(_w = (_v = (_u = o5)["b"]) === null || _v === void 0 ? void 0 : _v.call(_u)["c"].d) === null || _w === void 0 ? void 0 : _w["e"];
(_x = o6()) === null || _x === void 0 ? void 0 : _x["x"];

9
tests/baselines/reference/elementAccessChain.symbols
View file

@ -97,3 +97,12 @@ o5["b"]?.()["c"].d?.["e"];
>"b" : Symbol(b, Decl(elementAccessChain.ts, 15, 19))
>d : Symbol(d, Decl(elementAccessChain.ts, 15, 32))
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
>o6 : Symbol(o6, Decl(elementAccessChain.ts, 22, 13))
>T : Symbol(T, Decl(elementAccessChain.ts, 22, 19))
>x : Symbol(x, Decl(elementAccessChain.ts, 22, 41))
o6<number>()?.["x"];
>o6 : Symbol(o6, Decl(elementAccessChain.ts, 22, 13))

11
tests/baselines/reference/elementAccessChain.types
View file

@ -130,3 +130,14 @@ o5["b"]?.()["c"].d?.["e"];
>d : { e: string; } | undefined
>"e" : "e"
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
>o6 : <T>() => { x: number; } | undefined
>x : number
o6<number>()?.["x"];
>o6<number>()?.["x"] : number | undefined
>o6<number>() : { x: number; } | undefined
>o6 : <T>() => { x: number; } | undefined
>"x" : "x"

8
tests/baselines/reference/propertyAccessChain.js
View file

@ -13,13 +13,17 @@ o4.b?.c.d?.e;
declare const o5: { b?(): { c: { d?: { e: string } } } };
o5.b?.().c.d?.e;
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
o6<number>()?.x;
//// [propertyAccessChain.js]
"use strict";
var _a, _b, _c, _d, _e, _f, _g, _h;
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
(_a = o1) === null || _a === void 0 ? void 0 : _a.b;
(_b = o2) === null || _b === void 0 ? void 0 : _b.b.c;
(_c = o3.b) === null || _c === void 0 ? void 0 : _c.c;
(_e = (_d = o4.b) === null || _d === void 0 ? void 0 : _d.c.d) === null || _e === void 0 ? void 0 : _e.e;
(_h = (_g = (_f = o5).b) === null || _g === void 0 ? void 0 : _g.call(_f).c.d) === null || _h === void 0 ? void 0 : _h.e;
(_j = o6()) === null || _j === void 0 ? void 0 : _j.x;

11
tests/baselines/reference/propertyAccessChain.symbols
View file

@ -68,3 +68,14 @@ o5.b?.().c.d?.e;
>d : Symbol(d, Decl(propertyAccessChain.ts, 12, 32))
>e : Symbol(e, Decl(propertyAccessChain.ts, 12, 38))
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
>o6 : Symbol(o6, Decl(propertyAccessChain.ts, 16, 13))
>T : Symbol(T, Decl(propertyAccessChain.ts, 16, 19))
>x : Symbol(x, Decl(propertyAccessChain.ts, 16, 41))
o6<number>()?.x;
>o6<number>()?.x : Symbol(x, Decl(propertyAccessChain.ts, 16, 41))
>o6 : Symbol(o6, Decl(propertyAccessChain.ts, 16, 13))
>x : Symbol(x, Decl(propertyAccessChain.ts, 16, 41))

11
tests/baselines/reference/propertyAccessChain.types
View file

@ -69,3 +69,14 @@ o5.b?.().c.d?.e;
>d : { e: string; } | undefined
>e : string | undefined
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
>o6 : <T>() => { x: number; } | undefined
>x : number
o6<number>()?.x;
>o6<number>()?.x : number | undefined
>o6<number>() : { x: number; } | undefined
>o6 : <T>() => { x: number; } | undefined
>x : number | undefined

6
tests/cases/conformance/expressions/optionalChaining/callChain/callChain.ts
View file

@ -32,4 +32,8 @@ o3["b"]?.(1, ...[2, 3], 4).c;
declare const o4: undefined | (<T>(f: (a: T) => T) => T);
declare function incr(x: number): number;
const v: number | undefined = o4?.(incr);
const v: number | undefined = o4?.(incr);
// GH#33744
declare const o5: <T>() => undefined | (() => void);
o5<number>()?.();

4
tests/cases/conformance/expressions/optionalChaining/elementAccessChain/elementAccessChain.ts
View file

@ -20,3 +20,7 @@ o5.b?.()["c"].d?.e;
o5.b?.()["c"].d?.["e"];
o5["b"]?.()["c"].d?.e;
o5["b"]?.()["c"].d?.["e"];
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
o6<number>()?.["x"];

4
tests/cases/conformance/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.ts
View file

@ -14,3 +14,7 @@ o4.b?.c.d?.e;
declare const o5: { b?(): { c: { d?: { e: string } } } };
o5.b?.().c.d?.e;
// GH#33744
declare const o6: <T>() => undefined | ({ x: number });
o6<number>()?.x;