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

Merge.

Browse Source
This commit is contained in:
David Anderson 2008-08-28 13:15:34 -07:00
commit 48fe80af99
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jstracer.cpp
View File

@ -2670,7 +2670,7 @@ TraceRecorder::cmp(LOpcode op, bool negate)
LIns* r_ins = get(&r);
jsdouble lnum;
jsdouble rnum;
LIns* args[] = { get(&l), cx_ins };
LIns* args[] = { l_ins, cx_ins };
if (JSVAL_IS_STRING(l)) {
l_ins = lir->insCall(F_StringToNumber, args);
} else if (JSVAL_TAG(l) == JSVAL_BOOLEAN) {
@ -3803,9 +3803,9 @@ TraceRecorder::record_JSOP_TYPEOF()
jsval& r = stackval(-1);
LIns* type;
if (JSVAL_IS_STRING(r)) {
type = lir->insImmPtr((void*)cx->runtime->atomState.typeAtoms[JSTYPE_STRING]);
type = INS_CONSTPTR(ATOM_TO_STRING(cx->runtime->atomState.typeAtoms[JSTYPE_STRING]));
} else if (isNumber(r)) {
type = lir->insImmPtr((void*)cx->runtime->atomState.typeAtoms[JSTYPE_NUMBER]);
type = INS_CONSTPTR(ATOM_TO_STRING(cx->runtime->atomState.typeAtoms[JSTYPE_NUMBER]));
} else {
LIns* args[] = { get(&r), cx_ins };
if (JSVAL_TAG(r) == JSVAL_BOOLEAN) {