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

[INFER] Fixes from botched merge.

Browse Source
This commit is contained in:
Brian Hackett 2011-03-03 21:24:13 -08:00
parent 41091b1bb6
commit 801f764f4c
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/jsarray.cpp
View File

@ -2059,6 +2059,7 @@ js::array_sort(JSContext *cx, uintN argc, Value *vp)
if (!JS_CHECK_OPERATION_LIMIT(cx) || DeleteArrayElement(cx, obj, --len, true) < 0)
return false;
}
vp->setObject(*obj);
return true;
}

2
js/src/jsinfer.cpp
View File

@ -64,8 +64,6 @@
#include "jsobjinlines.h"
#include "jsscriptinlines.h"
#include <zlib.h>
#ifdef JS_HAS_XML_SUPPORT
#include "jsxml.h"
#endif

10
js/src/methodjit/Compiler.cpp
View File

@ -788,9 +788,13 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
jit->nEqualityICs = equalityICs.length();
cursor += sizeof(ic::EqualityICInfo) * jit->nEqualityICs;
for (size_t i = 0; i < jit->nEqualityICs; i++) {
uint32 offs = uint32(equalityICs[i].jumpTarget - script->code);
JS_ASSERT(jumpMap[offs].isValid());
jitEqualityICs[i].target = fullCode.locationOf(jumpMap[offs]);
if (equalityICs[i].trampoline) {
jitEqualityICs[i].target = stubCode.locationOf(equalityICs[i].trampolineStart);
} else {
uint32 offs = uint32(equalityICs[i].jumpTarget - script->code);
JS_ASSERT(jumpMap[offs].isValid());
jitEqualityICs[i].target = fullCode.locationOf(jumpMap[offs]);
}
jitEqualityICs[i].stubEntry = stubCode.locationOf(equalityICs[i].stubEntry);
jitEqualityICs[i].stubCall = stubCode.locationOf(equalityICs[i].stubCall);
jitEqualityICs[i].stub = equalityICs[i].stub;

17
js/src/tests/js1_5/Regress/regress-127557.js
View File

@ -61,19 +61,10 @@ var actualvalues = [];
var expect= '';
var expectedvalues = [];
function f(x,y)
{
function h()
{
return h_peer();
}
function h_peer()
{
return (x + cnCOMMA + y);
}
return h;
}
var f = Function("x","y","\
function h() { return h_peer(); } \
function h_peer() { return (x + cnCOMMA + y); } \
return h");
if (typeof clone == 'function')
{

2
js/src/tests/js1_5/extensions/regress-300079.js
View File

@ -59,7 +59,7 @@ function test()
else {
expect = 'PASSED';
f = eval("(function (a) {return (function () { return a * a;}); })()");
f = Function("a", "return (function () { return a * a;});")();
g = clone(f, {a: 3});
f = null;
gc();