Merge branch 'master' into pr/yullin/continue_break_after_label

Author: yullin-ms

lib/Backend/ObjTypeSpecFldInfo.cpp

@@ -742,7 +742,7 @@ ObjTypeSpecFldInfo* ObjTypeSpecFldInfo::CreateFrom(uint id, Js::PolymorphicInlin
     uint16 firstNonEmptyCacheIndex = UINT16_MAX;
     uint16 slotIndex = 0;
     bool areEquivalent = true;
-    bool canDepolymorphize = topFunctionBody != functionBody && PHASE_ON(Js::DepolymorphizeInlineesPhase, topFunctionBody);
+    bool canDepolymorphize = topFunctionBody != functionBody && !PHASE_OFF(Js::DepolymorphizeInlineesPhase, topFunctionBody);
     bool usesAuxSlot = false;
     bool isProto = false;
     bool isAccessor = false;

lib/Common/ConfigFlagsList.h

@@ -763,7 +763,7 @@ PHASE(All)
 #define DEFAULT_CONFIG_LibraryStackFrameDebugger    (false)
 
 #define DEFAULT_CONFIG_FuncObjectInlineCacheThreshold   (2) // Maximum number of inline caches a function body may have to allow for inline caches to be allocated on the function object.
-#define DEFAULT_CONFIG_ShareInlineCaches (true)
+#define DEFAULT_CONFIG_ShareInlineCaches (false)
 #define DEFAULT_CONFIG_InlineCacheInvalidationListCompactionThreshold (4)
 #define DEFAULT_CONFIG_ConstructorCacheInvalidationThreshold (500)
 

lib/Runtime/ByteCode/FuncInfo.h

@@ -674,7 +674,7 @@ class FuncInfo
         }
 
         // If we share inline caches we should never have more than one entry in the list.
-        Assert(Js::FunctionBody::ShouldShareInlineCaches() || cacheList->Count() <= 1);
+        Assert(!Js::FunctionBody::ShouldShareInlineCaches() || cacheList->Count() <= 1);
 
         InlineCacheUnit cacheIdUnit;
 

lib/Runtime/Library/DateImplementation.cpp

@@ -1266,13 +1266,23 @@ namespace Js {
                 goto LError;
             }
 
-            for (lwT = ch - '0'; !FBig(*pch) && isdigit(*pch); pch++)
+            for (lwT = ch - '0'; ; pch++)
             {
+                // for time zone offset HH:mm, we already got HH so skip ':' and grab mm
+                if (((ss == ssAddOffset) || (ss == ssSubOffset)) && (*pch == ':')) 
+                {
+                    continue;
+                }
+                if (FBig(*pch) || !isdigit(*pch))
+                {
+                    break;
+                }
                 // to avoid overflow
                 if (pch - pchBase > 6)
                 {
                     goto LError;
                 }
+                // convert string to number, e.g. 07:30 -> 730
                 lwT = lwT * 10 + *pch - '0';
             }
 
@@ -1292,6 +1302,7 @@ namespace Js {
 
                     if (lwNil != lwOffset)
                         goto LError;
+                    // convert into minutes, e.g. 730 -> 7*60+30
                     lwOffset = lwT < 24 ? lwT * 60 :
                         (lwT % 100) + (lwT / 100) * 60;
                     if (ssSubOffset == ss)