Skip to content

Commit e7a3fb6

Browse files
committed
Set isInlined in InlineGetterSetter
1 parent f4d44b7 commit e7a3fb6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lib/Backend/Inline.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Inline::Optimize(Func *func, __in_ecount_opt(callerArgOutCount) IR::Instr *calle
132132
break;
133133
}
134134

135-
this->InlineGetterSetterFunction(instr, inlineeData, symThis, inlineCacheIndex, getter /*isGetter*/, recursiveInlineDepth);
135+
this->InlineGetterSetterFunction(instr, inlineeData, symThis, inlineCacheIndex, getter /*isGetter*/, &isInlined, recursiveInlineDepth);
136136

137137
break;
138138
}
@@ -3329,14 +3329,15 @@ Inline::SimulateCallForGetterSetter(IR::Instr *accessorInstr, IR::Instr* insertI
33293329
}
33303330

33313331
IR::Instr *
3332-
Inline::InlineGetterSetterFunction(IR::Instr *accessorInstr, const Js::FunctionCodeGenJitTimeData *const inlineeData, const StackSym *symCallerThis, const uint inlineCacheIndex, bool isGetter, uint recursiveInlineDepth)
3332+
Inline::InlineGetterSetterFunction(IR::Instr *accessorInstr, const Js::FunctionCodeGenJitTimeData *const inlineeData, const StackSym *symCallerThis, const uint inlineCacheIndex, bool isGetter, bool *pIsInlined, uint recursiveInlineDepth)
33333333
{
33343334
// This function is recursive, so when jitting in the foreground, probe the stack
33353335
if (!this->topFunc->IsBackgroundJIT())
33363336
{
33373337
PROBE_STACK(this->topFunc->GetScriptContext(), Js::Constants::MinStackDefault);
33383338
}
33393339

3340+
*pIsInlined = true;
33403341
IR::Instr *instrNext = accessorInstr->m_next;
33413342

33423343
Js::FunctionBody *funcCaller = accessorInstr->m_func->GetJnFunction();

lib/Backend/Inline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Inline
4040
#ifdef ENABLE_DOM_FAST_PATH
4141
IR::Instr * InlineDOMGetterSetterFunction(IR::Instr *ldFldInstr, const Js::FunctionCodeGenJitTimeData *const inlineeData, const Js::FunctionCodeGenJitTimeData *const inlinerData);
4242
#endif
43-
IR::Instr * InlineGetterSetterFunction(IR::Instr *accessorInstr, const Js::FunctionCodeGenJitTimeData *const inlineeData, const StackSym *symCallerThis, const uint inlineCacheIndex, bool isGetter, uint recursiveInlineDepth);
43+
IR::Instr * InlineGetterSetterFunction(IR::Instr *accessorInstr, const Js::FunctionCodeGenJitTimeData *const inlineeData, const StackSym *symCallerThis, const uint inlineCacheIndex, bool isGetter, bool *pIsInlined, uint recursiveInlineDepth);
4444
IR::Instr * InlineFunctionCommon(IR::Instr *callInstr, StackSym* originalCallTargetStackSym, Js::FunctionBody *funcBody, Func *inlinee, IR::Instr *instrNext,
4545
IR::RegOpnd * returnValueOpnd, IR::Instr *inlineBailoutChecksBeforeInstr, const StackSym *symCallerThis, uint recursiveInlineDepth, bool safeThis = false, bool isApplyTarget = false);
4646
IR::Instr * SimulateCallForGetterSetter(IR::Instr *accessorInstr, IR::Instr* insertInstr, IR::PropertySymOpnd* methodOpnd, bool isGetter);

0 commit comments

Comments
 (0)