Skip to content

Commit 44eccb5

Browse files
committed
Make generator opcodes' names more consistent
1 parent f9214e8 commit 44eccb5

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

lib/Backend/IR.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,8 +760,8 @@ LabelInstr::IsUnreferenced(void) const
760760
inline BOOL
761761
LabelInstr::IsGeneratorEpilogueLabel(void) const
762762
{
763-
return this->m_opcode == Js::OpCode::GeneratorEpilogueNoFrameNullOut ||
764-
this->m_opcode == Js::OpCode::GeneratorEpilogueFrameNullOut;
763+
return this->m_opcode == Js::OpCode::GeneratorEpilogueNoFrameNullOutLabel ||
764+
this->m_opcode == Js::OpCode::GeneratorEpilogueFrameNullOutLabel;
765765
}
766766

767767
inline void

lib/Backend/Lower.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3122,8 +3122,8 @@ Lowerer::LowerRange(IR::Instr *instrStart, IR::Instr *instrEnd, bool defaultDoFa
31223122
#endif
31233123
case Js::OpCode::GeneratorBailInLabel:
31243124
case Js::OpCode::GeneratorResumeYieldLabel:
3125-
case Js::OpCode::GeneratorEpilogueFrameNullOut:
3126-
case Js::OpCode::GeneratorEpilogueNoFrameNullOut:
3125+
case Js::OpCode::GeneratorEpilogueFrameNullOutLabel:
3126+
case Js::OpCode::GeneratorEpilogueNoFrameNullOutLabel:
31273127
Assert(this->m_func->GetJITFunctionBody()->IsCoroutine());
31283128
break;
31293129

@@ -26473,8 +26473,8 @@ Lowerer::ValidOpcodeAfterLower(IR::Instr* instr, Func * func)
2647326473
#endif
2647426474
case Js::OpCode::GeneratorBailInLabel:
2647526475
case Js::OpCode::GeneratorResumeYieldLabel:
26476-
case Js::OpCode::GeneratorEpilogueFrameNullOut:
26477-
case Js::OpCode::GeneratorEpilogueNoFrameNullOut:
26476+
case Js::OpCode::GeneratorEpilogueFrameNullOutLabel:
26477+
case Js::OpCode::GeneratorEpilogueNoFrameNullOutLabel:
2647826478
return func->GetJITFunctionBody()->IsCoroutine();
2647926479

2648026480
case Js::OpCode::LazyBailOutThunkLabel:
@@ -29130,12 +29130,12 @@ Lowerer::LowerGeneratorHelper::EnsureEpilogueLabels()
2913029130
return;
2913129131
}
2913229132

29133-
IR::LabelInstr* withSignalGeneratorDone = IR::LabelInstr::New(Js::OpCode::GeneratorEpilogueFrameNullOut, this->func, false);
29133+
IR::LabelInstr* withSignalGeneratorDone = IR::LabelInstr::New(Js::OpCode::GeneratorEpilogueFrameNullOutLabel, this->func, false);
2913429134
LABELNAMESET(withSignalGeneratorDone, "Epilogue_WithSignalGeneratorDone");
2913529135
withSignalGeneratorDone->m_hasNonBranchRef = true;
2913629136
this->epilogueForReturnStatements = withSignalGeneratorDone;
2913729137

29138-
IR::LabelInstr* withoutSignalGeneratorDone = IR::LabelInstr::New(Js::OpCode::GeneratorEpilogueNoFrameNullOut, this->func, false);
29138+
IR::LabelInstr* withoutSignalGeneratorDone = IR::LabelInstr::New(Js::OpCode::GeneratorEpilogueNoFrameNullOutLabel, this->func, false);
2913929139
LABELNAMESET(withoutSignalGeneratorDone, "Epilogue_NoSignalGeneratorDone");
2914029140
withoutSignalGeneratorDone->m_hasNonBranchRef = true;
2914129141
this->epilogueForBailOut = withoutSignalGeneratorDone;

lib/Runtime/ByteCode/OpCodes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,8 +856,8 @@ MACRO_BACKEND_ONLY(GeneratorOutputBailInTrace, Empty, OpSideEffect
856856
MACRO_BACKEND_ONLY(GeneratorOutputBailInTraceLabel, Empty, None)
857857
MACRO_BACKEND_ONLY(GeneratorBailInLabel, Empty, None)
858858
MACRO_BACKEND_ONLY(GeneratorResumeYieldLabel, Empty, None)
859-
MACRO_BACKEND_ONLY(GeneratorEpilogueFrameNullOut, Empty, None)
860-
MACRO_BACKEND_ONLY(GeneratorEpilogueNoFrameNullOut, Empty, None)
859+
MACRO_BACKEND_ONLY(GeneratorEpilogueFrameNullOutLabel, Empty, None)
860+
MACRO_BACKEND_ONLY(GeneratorEpilogueNoFrameNullOutLabel, Empty, None)
861861

862862
// All SIMD ops are backend only for non-asmjs.
863863
#define MACRO_SIMD(opcode, asmjsLayout, opCodeAttrAsmJs, OpCodeAttr, ...) MACRO_BACKEND_ONLY(opcode, Empty, OpCodeAttr)

0 commit comments

Comments
 (0)