wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 23:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Issue #2645 - Fix type confusion for ResumeKind"

Browse source 
This reverts commit 19c4996881.
This commit is contained in:
roytam1 2024-10-24 22:55:27 +08:00
commit f890f88314
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/src/vm/Interpreter.cpp
View file

@ -1960,13 +1960,8 @@ CASE(JSOP_RETRVAL)
/* Resume execution in the calling frame. */ /* Resume execution in the calling frame. */
if (MOZ_LIKELY(interpReturnOK)) { if (MOZ_LIKELY(interpReturnOK)) {
if (JSOp(*REGS.pc) == JSOP_RESUME) {
ADVANCE_AND_DISPATCH(JSOP_RESUME_LENGTH);
}
TypeScript::Monitor(cx, script, REGS.pc, REGS.sp[-1]); TypeScript::Monitor(cx, script, REGS.pc, REGS.sp[-1]);
MOZ_ASSERT(CodeSpec[*REGS.pc].length == JSOP_CALL_LENGTH);
ADVANCE_AND_DISPATCH(JSOP_CALL_LENGTH); ADVANCE_AND_DISPATCH(JSOP_CALL_LENGTH);
} }

2
js/src/vm/Opcodes.h
View file

@ -2106,7 +2106,7 @@
* Operands: resume kind (GeneratorObject::ResumeKind) * Operands: resume kind (GeneratorObject::ResumeKind)
* Stack: gen, val => rval * Stack: gen, val => rval
*/ \ */ \
macro(JSOP_RESUME, 205,"resume", NULL, 2, 2, 1, JOF_UINT16|JOF_INVOKE) \ macro(JSOP_RESUME, 205,"resume", NULL, 3, 2, 1, JOF_UINT8|JOF_INVOKE) \
/* /*
* Pops the top two values on the stack as 'obj' and 'v', pushes 'v' to * Pops the top two values on the stack as 'obj' and 'v', pushes 'v' to
* 'obj'. * 'obj'.

4
js/src/vm/TypeInference.cpp
View file

@ -3335,7 +3335,9 @@ js::TypeMonitorResult(JSContext* cx, JSScript* script, jsbytecode* pc, TypeSet::
void void
js::TypeMonitorResult(JSContext* cx, JSScript* script, jsbytecode* pc, const js::Value& rval) js::TypeMonitorResult(JSContext* cx, JSScript* script, jsbytecode* pc, const js::Value& rval)
{ {
MOZ_ASSERT(CodeSpec[*pc].format & JOF_TYPESET); /* Allow the non-TYPESET scenario to simplify stubs used in compound opcodes. */
if (!(CodeSpec[*pc].format & JOF_TYPESET))
return;
if (!script->hasBaselineScript()) if (!script->hasBaselineScript())
return; return;