Changeset 199724 in webkit for trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

Timestamp:

Apr 19, 2016, 6:29:54 AM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r199712.
​https://bugs.webkit.org/show_bug.cgi?id=156741

It caused a serious regression on 32 bit platform (Requested
by gskachkov on #webkit).

Reverted changeset:

"calling super() a second time in a constructor should throw"
​https://bugs.webkit.org/show_bug.cgi?id=151113
​http://trac.webkit.org/changeset/199712

Patch by Commit Queue <​[email protected]> on 2016-04-19

File:

• trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -759 +759 @@
         generator.emitMove(callArguments.thisRegister(), generator.newTarget());
         RegisterID* ret = generator.emitConstruct(returnValue.get(), func.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
-
-        bool isConstructorKindDerived = generator.constructorKind() == ConstructorKind::Derived;
-        bool doWeUseArrowFunctionInConstructor = isConstructorKindDerived && generator.needsToUpdateArrowFunctionContext();
-
-        if (generator.isDerivedConstructorContext() || (doWeUseArrowFunctionInConstructor && generator.isSuperCallUsedInInnerArrowFunction()))
-            generator.emitLoadThisFromArrowFunctionLexicalEnvironment();
-        
-        RefPtr<Label> thisIsEmptyLabel = generator.newLabel();
-        generator.emitJumpIfTrue(generator.emitIsEmpty(generator.newTemporary(), generator.thisRegister()), thisIsEmptyLabel.get());
-        generator.emitThrowReferenceError(ASCIILiteral("'super()' can't be called more than once in a constructor."));
-        generator.emitLabel(thisIsEmptyLabel.get());
-
         generator.emitMove(generator.thisRegister(), ret);
         
-        if (generator.isDerivedConstructorContext() || doWeUseArrowFunctionInConstructor)
+        bool isConstructorKindDerived = generator.constructorKind() == ConstructorKind::Derived;
+        if (generator.isDerivedConstructorContext() || (isConstructorKindDerived && generator.needsToUpdateArrowFunctionContext()))
             generator.emitPutThisToArrowFunctionContextScope();