Not depending on return value of super(). Fixes #9020. (#9060)

* Not depending on return value of super(). Fixes #9020.

* Feedback from nicolo-ribaudo

* Feedback -- fixing bad call to replaceWithMultiple
This commit is contained in:
Joel Denning 2018-12-04 13:50:17 -07:00 committed by Nicolò Ribaudo
parent 8b132c0889
commit d305419da6
3 changed files with 19 additions and 11 deletions

View File

@ -15,9 +15,10 @@ class Foo extends function () {} {
};
if (true) {
console.log(_this2 = super(), foo());
console.log((super(), _this2 = this), foo());
} else {
_this2 = super();
super();
_this2 = this;
console.log(foo());
}
}

View File

@ -461,9 +461,14 @@ function getThisBinding(thisEnvFn, inConstructor) {
if (supers.has(child.node)) return;
supers.add(child.node);
child.replaceWith(
t.assignmentExpression("=", t.identifier(thisBinding), child.node),
);
child.replaceWithMultiple([
child.node,
t.assignmentExpression(
"=",
t.identifier(thisBinding),
t.identifier("this"),
),
]);
},
});
});

View File

@ -82,8 +82,8 @@ describe("arrow function conversion", () => {
() => this;
`,
`
var _supercall = (..._args) => _this = super(..._args),
_this;
var _supercall = (..._args) => (super(..._args), _this = this),
_this;
(function () {
_supercall(345);
@ -115,9 +115,10 @@ describe("arrow function conversion", () => {
(function () {
_this;
});
_this = super();
super();
_this = this;
this;
() => _this = super();
() => (super(), _this = this);
() => this;
`,
{ methodName: "constructor", extend: true },
@ -144,9 +145,10 @@ describe("arrow function conversion", () => {
_this;
}).bind(_arrowCheckId);
_this = super();
super();
_this = this;
this;
() => _this = super();
() => (super(), _this = this);
() => this;
`,
{