wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1199172 - Only treat non-static constructor methods as the actual class constructor. (r=shu)

Browse Source
This commit is contained in:
Eric Faust 2015-08-27 15:27:07 -07:00
parent 4bb887fa2a
commit 6d419d0546
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/frontend/BytecodeEmitter.cpp
View File

@ -7461,7 +7461,8 @@ BytecodeEmitter::emitClass(ParseNode* pn)
for (ParseNode* mn = classMethods->pn_head; mn; mn = mn->pn_next) {
ClassMethod& method = mn->as<ClassMethod>();
ParseNode& methodName = method.name();
if (methodName.isKind(PNK_OBJECT_PROPERTY_NAME) &&
if (!method.isStatic() &&
methodName.isKind(PNK_OBJECT_PROPERTY_NAME) &&
methodName.pn_atom == cx->names().constructor)
{
constructor = &method.method();

15
js/src/tests/ecma_6/Class/staticConstructor.js
View File

@ -3,6 +3,21 @@ class test {
constructor() { }
static constructor() { }
}
class testWithExtends {
constructor() { };
static constructor() { };
}
class testOrder {
static constructor() { };
constructor() { };
}
class testOrderWithExtends extends null {
static constructor() { };
constructor() { };
}
`;
if (classesEnabled())