mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge.
This commit is contained in:
commit
f1b0597661
@ -1248,6 +1248,12 @@ IsSlotUndemotable(Oracle* oracle, JSContext* cx, LinkableFragment* f, unsigned s
|
||||
return oracle->isGlobalSlotUndemotable(cx, gslots[slot - f->nStackTypes]);
|
||||
}
|
||||
|
||||
static JS_REQUIRES_STACK bool
|
||||
IsSlotUndemotable(Oracle* oracle, JSContext* cx, LinkableFragment* f, unsigned slot)
|
||||
{
|
||||
return IsSlotUndemotable(oracle, cx, f, slot, cx->fp->regs->pc);
|
||||
}
|
||||
|
||||
class FrameInfoCache
|
||||
{
|
||||
struct HashPolicy
|
||||
|
@ -918,15 +918,15 @@ class TraceRecorder
|
||||
{
|
||||
/*************************************************************** Recording session constants */
|
||||
|
||||
/* Cached oracle keeps track of hit counts for program counter locations */
|
||||
Oracle* oracle;
|
||||
|
||||
/* The context in which recording started. */
|
||||
JSContext* const cx;
|
||||
|
||||
/* Cached value of JS_TRACE_MONITOR(cx). */
|
||||
TraceMonitor* const traceMonitor;
|
||||
|
||||
/* Cached oracle keeps track of hit counts for program counter locations */
|
||||
Oracle* oracle;
|
||||
|
||||
/* The Fragment being recorded by this recording session. */
|
||||
VMFragment* const fragment;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user