[1.11>master] [MERGE #6387 @pleath] Remove unneeded InitConst op from byte code

Merge pull request #6387 from pleath:noinitconst

Author: pleath

lib/Backend/GlobOpt.cpp

@@ -4783,7 +4783,6 @@ GlobOpt::ValueNumberDst(IR::Instr **pInstr, Value *src1Val, Value *src2Val)
         // fall-through
 
     case Js::OpCode::BytecodeArgOutCapture:
-    case Js::OpCode::InitConst:
     case Js::OpCode::LdAsmJsFunc:
     case Js::OpCode::Ld_A:
     case Js::OpCode::Ld_I4:

lib/Backend/IRBuilder.cpp

@@ -1818,10 +1818,6 @@ IRBuilder::BuildReg2(Js::OpCode newOpcode, uint32 offset, Js::RegSlot R0, Js::Re
         this->AddInstr(instr, offset);
         return;
     }
-    case Js::OpCode::InitConst:
-        // Don't use InitConst in the JIT, as some dataflow tracking is missing, and we don't currently optimize for it.
-        newOpcode = Js::OpCode::Ld_A;
-        break;
     }
 
     IR::RegOpnd *   dstOpnd = this->BuildDstOpnd(R0, TyVar, false, reuseLoc);

lib/Backend/Lower.cpp

@@ -1782,7 +1782,6 @@ Lowerer::LowerRange(IR::Instr *instrStart, IR::Instr *instrEnd, bool defaultDoFa
             }
             //fallthrough
         case Js::OpCode::Ld_A:
-        case Js::OpCode::InitConst:
             if (instr->IsJitProfilingInstr() && instr->AsJitProfilingInstr()->isBeginSwitch) {
                 LowerProfiledBeginSwitch(instr->AsJitProfilingInstr());
                 break;

lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h

@@ -5,6 +5,6 @@
 // NOTE: If there is a merge conflict the correct fix is to make a new GUID.
 // This file was generated with tools\update_bytecode_version.ps1
 
-// {5C20FA9E-A347-4731-A0DE-148B4FA12B04}
+// {81AEEA4B-AE4E-40C0-848F-6DB7C5F49F55}
 const GUID byteCodeCacheReleaseFileVersion =
-{ 0x5C20FA9E, 0xA347, 0x4731, { 0xA0, 0xDE, 0x14, 0x8B, 0x4F, 0xA1, 0x2B, 0x04 } };
+{ 0x81AEEA4B, 0xAE4E, 0x40C0, { 0x84, 0x8F, 0x6D, 0xB7, 0xC5, 0xF4, 0x9F, 0x55 } };

lib/Runtime/ByteCode/ByteCodeEmitter.cpp

@@ -4889,15 +4889,6 @@ void ByteCodeGenerator::EmitPropStore(Js::RegSlot rhsLocation, Symbol *sym, Iden
             this->UpdateDebuggerPropertyInitializationOffset(location, sym->GetPosition(), false);
         }
     }
-    else if (isConstDecl)
-    {
-        this->m_writer.Reg2(Js::OpCode::InitConst, sym->GetLocation(), rhsLocation);
-
-        if (this->ShouldTrackDebuggerMetadata())
-        {
-            this->UpdateDebuggerPropertyInitializationOffset(sym->GetLocation(), sym->GetPosition());
-        }
-    }
     else
     {
         if (!isConstDecl && sym->GetDecl() && sym->GetDecl()->nop == knopConstDecl)
@@ -4910,7 +4901,7 @@ void ByteCodeGenerator::EmitPropStore(Js::RegSlot rhsLocation, Symbol *sym, Iden
         {
             this->m_writer.Reg2(Js::OpCode::Ld_A, sym->GetLocation(), rhsLocation);
 
-            if (this->ShouldTrackDebuggerMetadata() && isLetDecl)
+            if (this->ShouldTrackDebuggerMetadata() && (isLetDecl || isConstDecl))
             {
                 this->UpdateDebuggerPropertyInitializationOffset(sym->GetLocation(), sym->GetPosition());
             }

lib/Runtime/ByteCode/OpCodes.h

@@ -383,7 +383,6 @@ MACRO_EXTEND_WMS(       InitUndeclLocalConstFld,    ElementP,       OpByteCodeOn
 MACRO_WMS_ROOT(         InitUndeclRootConstFld,     ElementRootU,   OpSideEffect)
 MACRO_EXTEND_WMS(       InitUndeclConsoleLetFld,    ElementScopedU, OpSideEffect)
 MACRO_EXTEND_WMS(       InitUndeclConsoleConstFld,  ElementScopedU, OpSideEffect)
-MACRO_WMS(              InitConst,                  Reg2,           OpTempNumberTransfer|OpTempObjectTransfer|OpNonIntTransfer|OpCanCSE)    // Create and initialize 'const' as property of global object
 MACRO_WMS(              InitConstSlot,              ElementSlot,    None)
 
 // Re-evaluate following 4 opcodes and InitInnerLetFld for obj type spec and inline cache lookup when we add sharing of types having properties with non-default
@@ -627,7 +626,7 @@ MACRO_WMS(              NewStackScFunc,     ElementSlotI1,  OpSideEffect|OpByteC
 MACRO_EXTEND_WMS(       NewInnerScFunc,     ElementSlot,    OpSideEffect)   // Create new ScriptFunction instance
 MACRO_EXTEND_WMS(       NewInnerScGenFunc,  ElementSlot,    OpSideEffect)   // Create new JavascriptGeneratorFunction instance
 MACRO_EXTEND_WMS(       NewInnerStackScFunc,ElementSlot,    OpSideEffect|OpByteCodeOnly)  // Create new ScriptFunction instance
-MACRO_EXTEND_WMS(       NewScFuncHomeObj,   ElementSlot,    OpSideEffect)   // Create new ScriptFunction instance that has home object
+MACRO_WMS(              NewScFuncHomeObj,   ElementSlot,    OpSideEffect)   // Create new ScriptFunction instance that has home object
 MACRO_EXTEND_WMS(       NewScGenFuncHomeObj,       ElementSlot,      OpSideEffect)   // Create new JavascriptGeneratorFunction instance that has home object
 MACRO_EXTEND_WMS(       NewInnerScFuncHomeObj,     ElementSlotI3,    OpSideEffect)   // Create new ScriptFunction instance that has home object
 MACRO_EXTEND_WMS(       NewInnerScGenFuncHomeObj,  ElementSlotI3,    OpSideEffect)   // Create new JavascriptGeneratorFunction instance that has home object

lib/Runtime/Language/InterpreterHandler.inl

@@ -135,7 +135,6 @@ EXDEF2_WMS(A1toA1Mem,               Typeof_ReuseLoc,            JavascriptOperat
   DEF2_WMS(CMMem,                   CmSrEq_A,                   JavascriptOperators::StrictEqual)
   DEF2_WMS(CMMem,                   CmSrNeq_A,                  JavascriptOperators::NotStrictEqual)
   DEF2_WMS(FALLTHROUGH,             BeginSwitch,                /* Common case with Ld_A */)
-  DEF2_WMS(FALLTHROUGH,             InitConst,                  /* Common case with Ld_A */)
   DEF2_WMS(FALLTHROUGH,             Ld_A_ReuseLoc,              /* Common case with Ld_A */)
   DEF2_WMS(A1toA1_ALLOW_STACK,      Ld_A,                       OP_Ld_A)
   DEF2_WMS(INNERtoA1,               LdInnerScope,               OP_Ld_A)
@@ -345,7 +344,7 @@ EXDEF2    (EMPTY,                   ChkNewCallFlag,             OP_ChkNewCallFla
 EXDEF3_WMS(CUSTOM_L_Value,          NewInnerStackScFunc,        OP_NewInnerStackScFunc, ElementSlot)
 EXDEF2_WMS(GET_ELEM_SLOT_FB,        NewInnerScFunc,             ScriptFunction::OP_NewScFunc)
 EXDEF2_WMS(GET_ELEM_SLOT_FB,        NewInnerScGenFunc,          JavascriptGeneratorFunction::OP_NewScGenFunc)
-EXDEF2_WMS(GET_SLOT_FB_HMO,         NewScFuncHomeObj,           ScriptFunction::OP_NewScFuncHomeObj)
+  DEF2_WMS(GET_SLOT_FB_HMO,         NewScFuncHomeObj,           ScriptFunction::OP_NewScFuncHomeObj)
 EXDEF2_WMS(GET_SLOT_FB_HMO,         NewScGenFuncHomeObj,        JavascriptGeneratorFunction::OP_NewScGenFuncHomeObj)
 EXDEF2_WMS(GET_ELEM_SLOT_FB_HMO,    NewInnerScFuncHomeObj,      ScriptFunction::OP_NewScFuncHomeObj)
 EXDEF2_WMS(GET_ELEM_SLOT_FB_HMO,    NewInnerScGenFuncHomeObj,   JavascriptGeneratorFunction::OP_NewScGenFuncHomeObj)