Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pick/41079/release 4.0 #41204

Merged
merged 2 commits into from
Oct 22, 2020
Merged

Pick/41079/release 4.0 #41204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec2815f
Cherry-pick PR #41079 into release-4.0
elibarzilay Oct 22, 2020
ab1d4f2
Accepted baselines.
DanielRosenwasser Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 61 additions & 36 deletions src/compiler/transformers/generators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,8 @@ namespace ts {
switch (node.kind) {
case SyntaxKind.BinaryExpression:
return visitBinaryExpression(<BinaryExpression>node);
case SyntaxKind.CommaListExpression:
return visitCommaListExpression(<CommaListExpression>node);
case SyntaxKind.ConditionalExpression:
return visitConditionalExpression(<ConditionalExpression>node);
case SyntaxKind.YieldExpression:
Expand Down Expand Up @@ -772,6 +774,65 @@ namespace ts {
return visitEachChild(node, visitor, context);
}

/**
* Visits a comma expression containing `yield`.
*
* @param node The node to visit.
*/
function visitCommaExpression(node: BinaryExpression) {
// [source]
// x = a(), yield, b();
//
// [intermediate]
// a();
// .yield resumeLabel
// .mark resumeLabel
// x = %sent%, b();

let pendingExpressions: Expression[] = [];
visit(node.left);
visit(node.right);
return factory.inlineExpressions(pendingExpressions);

function visit(node: Expression) {
if (isBinaryExpression(node) && node.operatorToken.kind === SyntaxKind.CommaToken) {
visit(node.left);
visit(node.right);
}
else {
if (containsYield(node) && pendingExpressions.length > 0) {
emitWorker(OpCode.Statement, [factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))]);
pendingExpressions = [];
}

pendingExpressions.push(visitNode(node, visitor, isExpression));
}
}
}

/**
* Visits a comma-list expression.
*
* @param node The node to visit.
*/
function visitCommaListExpression(node: CommaListExpression) {
// flattened version of `visitCommaExpression`
let pendingExpressions: Expression[] = [];
for (const elem of node.elements) {
if (isBinaryExpression(elem) && elem.operatorToken.kind === SyntaxKind.CommaToken) {
pendingExpressions.push(visitCommaExpression(elem));
}
else {
if (containsYield(elem) && pendingExpressions.length > 0) {
emitWorker(OpCode.Statement, [factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))]);
pendingExpressions = [];
}
pendingExpressions.push(visitNode(elem, visitor, isExpression));
}
}
return factory.inlineExpressions(pendingExpressions);
}

/**
* Visits a logical binary expression containing `yield`.
*
Expand Down Expand Up @@ -825,42 +886,6 @@ namespace ts {
return resultLocal;
}

/**
* Visits a comma expression containing `yield`.
*
* @param node The node to visit.
*/
function visitCommaExpression(node: BinaryExpression) {
// [source]
// x = a(), yield, b();
//
// [intermediate]
// a();
// .yield resumeLabel
// .mark resumeLabel
// x = %sent%, b();

let pendingExpressions: Expression[] = [];
visit(node.left);
visit(node.right);
return factory.inlineExpressions(pendingExpressions);

function visit(node: Expression) {
if (isBinaryExpression(node) && node.operatorToken.kind === SyntaxKind.CommaToken) {
visit(node.left);
visit(node.right);
}
else {
if (containsYield(node) && pendingExpressions.length > 0) {
emitWorker(OpCode.Statement, [factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))]);
pendingExpressions = [];
}

pendingExpressions.push(visitNode(node, visitor, isExpression));
}
}
}

/**
* Visits a conditional expression containing `yield`.
*
Expand Down
131 changes: 131 additions & 0 deletions tests/baselines/reference/es5-asyncFunctionLongObjectLiteral.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
//// [es5-asyncFunctionLongObjectLiteral.ts]
// the generated code from both should be similar

const fooShort = async () => {
return {
a: await Promise.resolve(0),
b: await Promise.resolve(1),
c: await Promise.resolve(2),
d: await Promise.resolve(3),
e: await Promise.resolve(4),
};
}

const fooLong = async () => {
return {
a: await Promise.resolve(0),
b: await Promise.resolve(1),
c: await Promise.resolve(2),
d: await Promise.resolve(3),
e: await Promise.resolve(4),
f: await Promise.resolve(5),
g: await Promise.resolve(6),
h: await Promise.resolve(7),
i: await Promise.resolve(8),
j: await Promise.resolve(9),
};
}


//// [es5-asyncFunctionLongObjectLiteral.js]
// the generated code from both should be similar
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [op[0] & 2, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
var _this = this;
var fooShort = function () { return __awaiter(_this, void 0, void 0, function () {
var _a;
return __generator(this, function (_b) {
switch (_b.label) {
case 0:
_a = {};
return [4 /*yield*/, Promise.resolve(0)];
case 1:
_a.a = _b.sent();
return [4 /*yield*/, Promise.resolve(1)];
case 2:
_a.b = _b.sent();
return [4 /*yield*/, Promise.resolve(2)];
case 3:
_a.c = _b.sent();
return [4 /*yield*/, Promise.resolve(3)];
case 4:
_a.d = _b.sent();
return [4 /*yield*/, Promise.resolve(4)];
case 5: return [2 /*return*/, (_a.e = _b.sent(),
_a)];
}
});
}); };
var fooLong = function () { return __awaiter(_this, void 0, void 0, function () {
var _a;
return __generator(this, function (_b) {
switch (_b.label) {
case 0:
_a = {};
return [4 /*yield*/, Promise.resolve(0)];
case 1:
_a.a = _b.sent();
return [4 /*yield*/, Promise.resolve(1)];
case 2:
_a.b = _b.sent();
return [4 /*yield*/, Promise.resolve(2)];
case 3:
_a.c = _b.sent();
return [4 /*yield*/, Promise.resolve(3)];
case 4:
_a.d = _b.sent();
return [4 /*yield*/, Promise.resolve(4)];
case 5:
_a.e = _b.sent();
return [4 /*yield*/, Promise.resolve(5)];
case 6:
_a.f = _b.sent();
return [4 /*yield*/, Promise.resolve(6)];
case 7:
_a.g = _b.sent();
return [4 /*yield*/, Promise.resolve(7)];
case 8:
_a.h = _b.sent();
return [4 /*yield*/, Promise.resolve(8)];
case 9:
_a.i = _b.sent();
return [4 /*yield*/, Promise.resolve(9)];
case 10: return [2 /*return*/, (_a.j = _b.sent(),
_a)];
}
});
}); };
107 changes: 107 additions & 0 deletions tests/baselines/reference/es5-asyncFunctionLongObjectLiteral.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
=== tests/cases/compiler/es5-asyncFunctionLongObjectLiteral.ts ===
// the generated code from both should be similar

const fooShort = async () => {
>fooShort : Symbol(fooShort, Decl(es5-asyncFunctionLongObjectLiteral.ts, 2, 5))

return {
a: await Promise.resolve(0),
>a : Symbol(a, Decl(es5-asyncFunctionLongObjectLiteral.ts, 3, 12))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

b: await Promise.resolve(1),
>b : Symbol(b, Decl(es5-asyncFunctionLongObjectLiteral.ts, 4, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

c: await Promise.resolve(2),
>c : Symbol(c, Decl(es5-asyncFunctionLongObjectLiteral.ts, 5, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

d: await Promise.resolve(3),
>d : Symbol(d, Decl(es5-asyncFunctionLongObjectLiteral.ts, 6, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

e: await Promise.resolve(4),
>e : Symbol(e, Decl(es5-asyncFunctionLongObjectLiteral.ts, 7, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

};
}

const fooLong = async () => {
>fooLong : Symbol(fooLong, Decl(es5-asyncFunctionLongObjectLiteral.ts, 12, 5))

return {
a: await Promise.resolve(0),
>a : Symbol(a, Decl(es5-asyncFunctionLongObjectLiteral.ts, 13, 12))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

b: await Promise.resolve(1),
>b : Symbol(b, Decl(es5-asyncFunctionLongObjectLiteral.ts, 14, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

c: await Promise.resolve(2),
>c : Symbol(c, Decl(es5-asyncFunctionLongObjectLiteral.ts, 15, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

d: await Promise.resolve(3),
>d : Symbol(d, Decl(es5-asyncFunctionLongObjectLiteral.ts, 16, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

e: await Promise.resolve(4),
>e : Symbol(e, Decl(es5-asyncFunctionLongObjectLiteral.ts, 17, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

f: await Promise.resolve(5),
>f : Symbol(f, Decl(es5-asyncFunctionLongObjectLiteral.ts, 18, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

g: await Promise.resolve(6),
>g : Symbol(g, Decl(es5-asyncFunctionLongObjectLiteral.ts, 19, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

h: await Promise.resolve(7),
>h : Symbol(h, Decl(es5-asyncFunctionLongObjectLiteral.ts, 20, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

i: await Promise.resolve(8),
>i : Symbol(i, Decl(es5-asyncFunctionLongObjectLiteral.ts, 21, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

j: await Promise.resolve(9),
>j : Symbol(j, Decl(es5-asyncFunctionLongObjectLiteral.ts, 22, 36))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))

};
}

Loading