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

Bug 1209026 - Use infallible new for some Label allocations. r=jonco

Browse Source
This commit is contained in:
Jan de Mooij 2015-10-06 09:48:41 +01:00
parent b37841304f
commit a2bc87fa0b
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/jit-test/tests/gc/oomInGetJumpLabelForBranch.js Normal file
View File

@ -0,0 +1,3 @@
// |jit-test| --no-threads
load(libdir + 'oomTest.js');
oomTest(() => getBacktrace({thisprops: gc() && delete addDebuggee.enabled}));

2
js/src/jit/CodeGenerator.cpp
View File

@ -658,7 +658,7 @@ CodeGenerator::getJumpLabelForBranch(MBasicBlock* block)
// important here as these tests are extremely unlikely to be used in loop
// backedges, so emit inline code for the patchable jump. Heap allocating
// the label allows it to be used by out of line blocks.
Label* res = alloc().lifoAlloc()->new_<Label>();
Label* res = alloc().lifoAlloc()->newInfallible<Label>();
Label after;
masm.jump(&after);
masm.bind(res);

2
js/src/jit/x64/CodeGenerator-x64.cpp
View File

@ -531,7 +531,7 @@ CodeGeneratorX64::visitAsmJSStoreHeap(LAsmJSStoreHeap* ins)
if (mir->isAtomicAccess())
jumpTo = gen->outOfBoundsLabel();
else
rejoin = jumpTo = alloc().lifoAlloc()->new_<Label>();
rejoin = jumpTo = alloc().lifoAlloc()->newInfallible<Label>();
maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr), jumpTo);
}

2
js/src/jit/x86/CodeGenerator-x86.cpp
View File

@ -636,7 +636,7 @@ CodeGeneratorX86::visitAsmJSStoreHeap(LAsmJSStoreHeap* ins)
if (mir->isAtomicAccess())
jumpTo = gen->outOfBoundsLabel();
else
rejoin = jumpTo = alloc().lifoAlloc()->new_<Label>();
rejoin = jumpTo = alloc().lifoAlloc()->newInfallible<Label>();
maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr), jumpTo);
}