Refactor byte code emission for BrOnNoProperty family of cases

Author: pleath

lib/Backend/FlowGraph.cpp

@@ -825,6 +825,7 @@ FlowGraph::RunPeeps()
         case Js::OpCode::BrSrNeq_A:
         case Js::OpCode::BrOnHasProperty:
         case Js::OpCode::BrOnNoProperty:
+        case Js::OpCode::BrOnNoLocalProperty:
         case Js::OpCode::BrHasSideEffects:
         case Js::OpCode::BrNotHasSideEffects:
         case Js::OpCode::BrFncEqApply:

lib/Backend/GlobOpt.cpp

@@ -3393,6 +3393,7 @@ GlobOpt::OptSrc(IR::Opnd *opnd, IR::Instr * *pInstr, Value **indirIndexValRef, I
         case Js::OpCode::ScopedDeleteFldStrict:
         case Js::OpCode::LdMethodFromFlags:
         case Js::OpCode::BrOnNoProperty:
+        case Js::OpCode::BrOnNoLocalProperty:
         case Js::OpCode::BrOnHasProperty:
         case Js::OpCode::LdMethodFldPolyInlineMiss:
         case Js::OpCode::StSlotChkUndecl:

lib/Backend/IRBuilder.cpp

@@ -7292,17 +7292,7 @@ void
 IRBuilder::BuildBrLocalProperty(Js::OpCode newOpcode, uint32 offset)
 {
     Assert(!OpCodeAttr::HasMultiSizeLayout(newOpcode));
-
-    switch (newOpcode)
-    {
-    case Js::OpCode::BrOnNoLocalProperty:
-        newOpcode = Js::OpCode::BrOnNoProperty;
-        break;
-
-    default:
-        Assert(0);
-        break;
-    }
+    Assert(newOpcode == Js::OpCode::BrOnNoLocalProperty);
 
     const unaligned   Js::OpLayoutBrLocalProperty *branchInsn = m_jnReader.BrLocalProperty();
 
@@ -7346,7 +7336,7 @@ IRBuilder::BuildBrEnvProperty(Js::OpCode newOpcode, uint32 offset)
     fieldSym = PropertySym::New(regOpnd->m_sym, propertyId, branchInsn->PropertyIdIndex, (uint)-1, PropertyKindData, m_func);
     fieldOpnd = IR::SymOpnd::New(fieldSym, TyVar, m_func);
 
-    branchInstr = IR::BranchInstr::New(Js::OpCode::BrOnNoProperty, nullptr, fieldOpnd, m_func);
+    branchInstr = IR::BranchInstr::New(newOpcode == Js::OpCode::BrOnNoEnvProperty ? Js::OpCode::BrOnNoProperty : Js::OpCode::BrOnNoLocalProperty, nullptr, fieldOpnd, m_func);
     this->AddBranchInstr(branchInstr, offset, targetOffset);
 }
 

lib/Backend/Lower.cpp

@@ -2244,6 +2244,7 @@ Lowerer::LowerRange(IR::Instr *instrStart, IR::Instr *instrEnd, bool defaultDoFa
 
         case Js::OpCode::BrOnHasProperty:
         case Js::OpCode::BrOnNoProperty:
+        case Js::OpCode::BrOnNoLocalProperty:
             this->LowerBrProperty(instr, IR::HelperOp_HasProperty);
             break;
 
@@ -10782,6 +10783,7 @@ Lowerer::LowerBrProperty(IR::Instr * instr, IR::JnHelperMethod helper)
         instr->m_opcode = Js::OpCode::BrTrue_A;
         break;
     case Js::OpCode::BrOnNoProperty:
+    case Js::OpCode::BrOnNoLocalProperty:
         instr->m_opcode = Js::OpCode::BrFalse_A;
         break;
     default:

lib/Runtime/Base/ThreadConfigFlagsList.h

@@ -36,7 +36,6 @@ FLAG_RELEASE(IsES6ToPrimitiveEnabled, ES6ToPrimitive)
 FLAG_RELEASE(IsES6ToLengthEnabled, ES6ToLength)
 FLAG_RELEASE(IsES6ToStringTagEnabled, ES6ToStringTag)
 FLAG_RELEASE(IsES6UnicodeExtensionsEnabled, ES6Unicode)
-FLAG_RELEASE(IsES6UnscopablesEnabled, ES6Unscopables)
 FLAG_RELEASE(IsES6RegExStickyEnabled, ES6RegExSticky)
 FLAG_RELEASE(IsES2018RegExDotAllEnabled, ES2018RegExDotAll)
 FLAG_RELEASE(IsES6RegExPrototypePropertiesEnabled, ES6RegExPrototypeProperties)

lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h

@@ -4,6 +4,6 @@
 //-------------------------------------------------------------------------------------------------------
 // NOTE: If there is a merge conflict the correct fix is to make a new GUID.
 
-// {68DABE55-D14A-4439-B9D2-B76963387802}
-const GUID byteCodeCacheReleaseFileVersion =
-{ 0x68dabe55, 0xd14a, 0x4439, { 0xb9, 0xd2, 0xb7, 0x69, 0x63, 0x38, 0x78, 0x2 } };
+// {CA631EEC-2284-4F10-B25B-159819C4ECDB}
+const GUID byteCodeCacheReleaseFileVersion = 
+{ 0xca631eec, 0x2284, 0x4f10, { 0xb2, 0x5b, 0x15, 0x98, 0x19, 0xc4, 0xec, 0xdb } };

lib/Runtime/ByteCode/ByteCodeEmitter.cpp

@@ -161,8 +161,9 @@ MACRO_WMS(              BrSrEq_A,           BrReg2,         OpSideEffect|OpOpndH
 MACRO_WMS(              BrSrNeq_A,          BrReg2,         OpSideEffect|OpOpndHasImplicitCall|OpTempNumberSources|OpTempObjectSources)        // Branch if '!=='  (not strict equals)   (NOTE: May have DOM implicit calls)
 MACRO_EXTEND(           BrOnHasProperty,    BrProperty,     OpSideEffect|OpOpndHasImplicitCall|OpTempNumberSources|OpTempObjectSources)        // Branch if object has the given property (NOTE: May have DOM implicit calls)
 MACRO(                  BrOnNoProperty,     BrProperty,     OpSideEffect|OpOpndHasImplicitCall|OpTempNumberSources|OpTempObjectSources)        // Branch if object does not have the given property (NOTE: May have DOM implicit calls)
-MACRO(                  BrOnNoLocalProperty,BrLocalProperty,OpSideEffect|OpOpndHasImplicitCall|OpTempNumberSources|OpTempObjectSources)        // Branch if object does not have the given property (NOTE: May have DOM implicit calls)
-MACRO(                  BrOnNoEnvProperty,  BrEnvProperty,  OpSideEffect|OpOpndHasImplicitCall|OpTempNumberSources|OpTempObjectSources)        // Branch if object does not have the given property (NOTE: May have DOM implicit calls)
+MACRO(                  BrOnNoLocalProperty,BrLocalProperty,OpSideEffect|OpTempNumberSources|OpTempObjectSources)                              // Branch if object does not have the given property (NOTE: May have DOM implicit calls)
+MACRO_EXTEND(           BrOnNoEnvProperty,  BrEnvProperty,  OpSideEffect|OpOpndHasImplicitCall|OpTempNumberSources|OpTempObjectSources)        // Branch if object does not have the given property (NOTE: May have DOM implicit calls)
+MACRO(                  BrOnNoLocalEnvProperty,  BrEnvProperty,  OpSideEffect|OpTempNumberSources|OpTempObjectSources)                     // Branch if object does not have the given property (NOTE: May have DOM implicit calls)
 MACRO_WMS(              BrOnObject_A,       BrReg1,         OpSideEffect|OpTempNumberSources|OpTempObjectSources)                          // Branch if typeId is not primitive type (i.e. > TypeIds_LastJavascriptPrimitiveType)
 MACRO_WMS(              BrNotNull_A,        BrReg1,         OpSideEffect|OpTempNumberSources|OpTempObjectSources)                          // Branch if not NULL
 MACRO_EXTEND_WMS(       BrNotUndecl_A,      BrReg1,         OpSideEffect|OpTempNumberSources|OpTempObjectSources)                          // Branch if source reg is NEQ to Undecl

lib/Runtime/ByteCode/OpCodes.h

@@ -72,7 +72,8 @@ EXDEF2_WMS(BRB,                     BrNotUndecl_A,              OP_BrNotUndecl_A
 EXDEF2    (BRPROP,                  BrOnHasProperty,            OP_BrOnHasProperty)
   DEF2    (BRPROP,                  BrOnNoProperty,             OP_BrOnNoProperty)
   DEF2    (BRLOCALPROP,             BrOnNoLocalProperty,        OP_BrOnNoProperty)
-  DEF2    (BRENVPROP,               BrOnNoEnvProperty,          OP_BrOnNoEnvProperty)
+EXDEF2    (BRENVPROP,               BrOnNoEnvProperty,          OP_BrOnNoEnvProperty)
+  DEF2    (BRENVPROP,               BrOnNoLocalEnvProperty,     OP_BrOnNoEnvProperty)
   DEF2_WMS(BRBS,                    BrFncNeqApply,              JavascriptOperators::OP_BrFncNeqApply)
 //Not emitted for byte code, keep it here for completeness
 //DEF2_WMS(BRBS,                    BrFncEqApply,               JavascriptOperators::OP_BrFncEqApply)