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

Backed out changeset 213b09228bdf (bug 1141865)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-06-03 12:41:25 +02:00
parent a5c5d82e86
commit 4d397a9f8e
10 changed files with 21 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/frontend/SharedContext.h
View File

@ -243,8 +243,8 @@ class SharedContext
switch (allowed) {
case AllowedSyntax::NewTarget:
// Any function supports new.target
return true;
// For now, disallow new.target inside generators
return !func->isGenerator();
case AllowedSyntax::SuperProperty:
return func->allowSuperProperty();
default:;
@ -373,6 +373,11 @@ class FunctionBox : public ObjectBox, public SharedContext
}
bool allowSyntax(AllowedSyntax allowed) const {
// For now (!) we don't allow new.target in generators, and can't
// check that for functions we haven't finished parsing, as they
// don't have initialized scripts. Check from our stashed bits instead.
if (allowed == AllowedSyntax::NewTarget)
return !isGenerator();
return FunctionAllowsSyntax(function(), allowed);
}
};

19
js/src/jit/BaselineCompiler.cpp
View File

@ -3678,19 +3678,6 @@ BaselineCompiler::emit_JSOP_RESUME()
masm.loadPtr(Address(scratch1, JSScript::offsetOfBaselineScript()), scratch1);
masm.branchPtr(Assembler::BelowOrEqual, scratch1, ImmPtr(BASELINE_DISABLED_SCRIPT), &interpret);
Register constructing = regs.takeAny();
ValueOperand newTarget = regs.takeAnyValue();
masm.loadValue(Address(genObj, GeneratorObject::offsetOfNewTargetSlot()), newTarget);
masm.move32(Imm32(0), constructing);
{
Label notConstructing;
masm.branchTestObject(Assembler::NotEqual, newTarget, &notConstructing);
masm.pushValue(newTarget);
masm.move32(Imm32(CalleeToken_FunctionConstructing), constructing);
masm.bind(&notConstructing);
}
regs.add(newTarget);
// Push |undefined| for all formals.
Register scratch2 = regs.takeAny();
Label loop, loopDone;
@ -3715,14 +3702,10 @@ BaselineCompiler::emit_JSOP_RESUME()
masm.makeFrameDescriptor(scratch2, JitFrame_BaselineJS);
masm.Push(Imm32(0)); // actual argc
// Duplicate PushCalleeToken with a variable instead.
masm.orPtr(constructing, callee);
masm.Push(callee);
masm.PushCalleeToken(callee, false);
masm.Push(scratch2); // frame descriptor
regs.add(callee);
regs.add(constructing);
// Load the return value.
ValueOperand retVal = regs.takeAnyValue();

24
js/src/tests/ecma_6/Class/newTargetGenerators.js
View File

@ -1,24 +0,0 @@
function *generatorNewTarget(expected) {
assertEq(new.target, expected);
assertEq(eval('new.target'), expected);
assertEq((() => new.target)(), expected);
yield (() => new.target);
}
const ITERATIONS = 25;
for (let i = 0; i < ITERATIONS; i++)
assertEq(generatorNewTarget(undefined).next().value(), undefined);
for (let i = 0; i < ITERATIONS; i++)
assertEq(new generatorNewTarget(generatorNewTarget).next().value(),
generatorNewTarget);
// also check to make sure it's useful in yield inside generators.
// Plus, this code is so ugly, how could it not be a test? ;)
// Thanks to anba for supplying this ludicrous expression.
assertDeepEq([...new function*(i) { yield i; if(i > 0) yield* new new.target(i-1) }(10)],
[ 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 ]);
if (typeof reportCompare === 'function')
reportCompare(0,0,"OK");

5
js/src/tests/js1_8_5/reflect-parse/newTarget.js
View File

@ -15,9 +15,8 @@ function testNewTarget() {
assertInFunctionExpr("()=>new.target", arrowExpr([], newTarget()));
assertError("(() => new.target))", SyntaxError);
// valid in generators, too!
assertStmt("function *foo() { new.target; }", genFunDecl(ident("foo"), [],
blockStmt([exprStmt(newTarget())])));
// invalid (for now!) in generators
assertError("function *foo() { new.target; }", SyntaxError);
// new.target is a member expression. You should be able to call, invoke, or
// access properties of it.

4
js/src/vm/GeneratorObject.cpp
View File

@ -49,7 +49,6 @@ GeneratorObject::create(JSContext* cx, AbstractFramePtr frame)
GeneratorObject* genObj = &obj->as<GeneratorObject>();
genObj->setCallee(*frame.callee());
genObj->setThisValue(frame.thisValue());
genObj->setNewTarget(frame.newTarget());
genObj->setScopeChain(*frame.scopeChain());
if (frame.script()->needsArgsObj())
genObj->setArgsObj(frame.argsObj());
@ -163,9 +162,8 @@ GeneratorObject::resume(JSContext* cx, InterpreterActivation& activation,
RootedFunction callee(cx, &genObj->callee());
RootedValue thisv(cx, genObj->thisValue());
RootedValue newTarget(cx, genObj->newTarget());
RootedObject scopeChain(cx, &genObj->scopeChain());
if (!activation.resumeGeneratorFrame(callee, thisv, newTarget, scopeChain))
if (!activation.resumeGeneratorFrame(callee, thisv, scopeChain))
return false;
if (genObj->hasArgsObj())

16
js/src/vm/GeneratorObject.h
View File

@ -31,7 +31,6 @@ class GeneratorObject : public NativeObject
ARGS_OBJ_SLOT,
EXPRESSION_STACK_SLOT,
YIELD_INDEX_SLOT,
NEWTARGET_SLOT,
RESERVED_SLOTS
};
@ -118,17 +117,6 @@ class GeneratorObject : public NativeObject
setFixedSlot(EXPRESSION_STACK_SLOT, NullValue());
}
bool isConstructing() const {
return getFixedSlot(NEWTARGET_SLOT).isObject();
}
const Value& newTarget() const {
return getFixedSlot(NEWTARGET_SLOT);
}
void setNewTarget(Value newTarget) {
setFixedSlot(NEWTARGET_SLOT, newTarget);
}
// The yield index slot is abused for a few purposes. It's undefined if
// it hasn't been set yet (before the initial yield), and null if the
// generator is closed. If the generator is running, the yield index is
@ -184,7 +172,6 @@ class GeneratorObject : public NativeObject
setFixedSlot(ARGS_OBJ_SLOT, NullValue());
setFixedSlot(EXPRESSION_STACK_SLOT, NullValue());
setFixedSlot(YIELD_INDEX_SLOT, NullValue());
setFixedSlot(NEWTARGET_SLOT, NullValue());
}
static size_t offsetOfCalleeSlot() {
@ -205,9 +192,6 @@ class GeneratorObject : public NativeObject
static size_t offsetOfExpressionStackSlot() {
return getFixedSlotOffset(EXPRESSION_STACK_SLOT);
}
static size_t offsetOfNewTargetSlot() {
return getFixedSlotOffset(NEWTARGET_SLOT);
}
};
class LegacyGeneratorObject : public GeneratorObject

4
js/src/vm/Interpreter.cpp
View File

@ -3812,10 +3812,6 @@ CASE(JSOP_RESUME)
// popInlineFrame expects there to be an additional value on the stack
// to pop off, so leave "gen" on the stack.
// Again, lie to popInlineFrame. Add a "new.target" to pop later.
if (gen->as<GeneratorObject>().isConstructing())
PUSH_UNDEFINED();
GeneratorObject::ResumeKind resumeKind = GeneratorObject::getResumeKind(REGS.pc);
bool ok = GeneratorObject::resume(cx, activation, gen, val, resumeKind);
SET_SCRIPT(REGS.fp()->script());

19
js/src/vm/Stack-inl.h
View File

@ -348,7 +348,7 @@ InterpreterStack::pushInlineFrame(JSContext* cx, InterpreterRegs& regs, const Ca
MOZ_ALWAYS_INLINE bool
InterpreterStack::resumeGeneratorCallFrame(JSContext* cx, InterpreterRegs& regs,
HandleFunction callee, HandleValue thisv,
HandleValue newTarget, HandleObject scopeChain)
HandleObject scopeChain)
{
MOZ_ASSERT(callee->isGenerator());
RootedScript script(cx, callee->getOrCreateScript(cx));
@ -361,11 +361,9 @@ InterpreterStack::resumeGeneratorCallFrame(JSContext* cx, InterpreterRegs& regs,
LifoAlloc::Mark mark = allocator_.mark();
bool constructing = newTarget.isObject();
// Include callee, |this|, and maybe |new.target|
// Include callee, |this|.
unsigned nformal = callee->nargs();
unsigned nvals = 2 + constructing + nformal + script->nslots();
unsigned nvals = 2 + nformal + script->nslots();
uint8_t* buffer = allocateFrame(cx, sizeof(InterpreterFrame) + nvals * sizeof(Value));
if (!buffer)
@ -375,12 +373,9 @@ InterpreterStack::resumeGeneratorCallFrame(JSContext* cx, InterpreterRegs& regs,
argv[-2] = ObjectValue(*callee);
argv[-1] = thisv;
SetValueRangeToUndefined(argv, nformal);
if (constructing)
argv[nformal] = newTarget;
InterpreterFrame* fp = reinterpret_cast<InterpreterFrame*>(argv + nformal + constructing);
InterpreterFrame::Flags flags = constructing ? ToFrameFlags(INITIAL_CONSTRUCT)
: ToFrameFlags(INITIAL_NONE);
InterpreterFrame* fp = reinterpret_cast<InterpreterFrame*>(argv + nformal);
InterpreterFrame::Flags flags = ToFrameFlags(INITIAL_NONE);
fp->mark_ = mark;
fp->initCallFrame(cx, prev, prevpc, prevsp, *callee, script, argv, 0, flags);
fp->resumeGeneratorFrame(scopeChain);
@ -970,10 +965,10 @@ InterpreterActivation::popInlineFrame(InterpreterFrame* frame)
inline bool
InterpreterActivation::resumeGeneratorFrame(HandleFunction callee, HandleValue thisv,
HandleValue newTarget, HandleObject scopeChain)
HandleObject scopeChain)
{
InterpreterStack& stack = cx_->asJSContext()->runtime()->interpreterStack();
if (!stack.resumeGeneratorCallFrame(cx_->asJSContext(), regs_, callee, thisv, newTarget, scopeChain))
if (!stack.resumeGeneratorCallFrame(cx_->asJSContext(), regs_, callee, thisv, scopeChain))
return false;
MOZ_ASSERT(regs_.fp()->script()->compartment() == compartment_);

2
js/src/vm/Stack.cpp
View File

@ -285,7 +285,7 @@ InterpreterFrame::epilogue(JSContext* cx)
if (MOZ_UNLIKELY(cx->compartment()->isDebuggee()))
DebugScopes::onPopCall(this, cx);
if (!fun()->isGenerator() && isConstructing() && thisValue().isObject() && returnValue().isPrimitive())
if (isConstructing() && thisValue().isObject() && returnValue().isPrimitive())
setReturnValue(ObjectValue(constructorThis()));
}

4
js/src/vm/Stack.h
View File

@ -1041,7 +1041,7 @@ class InterpreterStack
bool resumeGeneratorCallFrame(JSContext* cx, InterpreterRegs& regs,
HandleFunction callee, HandleValue thisv,
HandleValue newTarget, HandleObject scopeChain);
HandleObject scopeChain);
inline void purge(JSRuntime* rt);
@ -1249,7 +1249,7 @@ class InterpreterActivation : public Activation
inline void popInlineFrame(InterpreterFrame* frame);
inline bool resumeGeneratorFrame(HandleFunction callee, HandleValue thisv,
HandleValue newTarget, HandleObject scopeChain);
HandleObject scopeChain);
InterpreterFrame* current() const {
return regs_.fp();