Updated bytecode and other suggested changes

Author: yullin-ms

lib/Runtime/Base/JnDirectFields.h

@@ -670,6 +670,8 @@ ENTRY(builtInJavascriptArrayEntryIndexOf)
 ENTRY(builtInJavascriptArrayEntrySome)
 ENTRY(builtInJavascriptArrayEntryEvery)
 ENTRY(builtInJavascriptArrayEntryIncludes)
+ENTRY(builtInMathMin)
+ENTRY(builtInMathMax)
 ENTRY(EngineInterface)
 ENTRY(builtInCallInstanceFunction)
 

lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h

@@ -3,8 +3,7 @@
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 // 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
 
-// {9FAAF688-ACBA-4092-BA5B-77D97D3CD53A}
+// {D8913E7E-E430-4B28-81DD-EDD3EE5F263B}
 const GUID byteCodeCacheReleaseFileVersion =
-{ 0x9FAAF688, 0xACBA, 0x4092, { 0xBA, 0x5B, 0x77, 0xD9, 0x7D, 0x3C, 0xD5, 0x3A } };
+{ 0xD8913E7E, 0xE430, 0x4B28, { 0x81, 0xDD, 0xED, 0xD3, 0xEE, 0x5F, 0x26, 0x3B } };

lib/Runtime/Language/AsmJsBuiltInNames.h

@@ -4,6 +4,11 @@
 //-------------------------------------------------------------------------------------------------------
 
 // Default all macros to nothing
+
+#ifndef ASMJS_JSBUILTIN_MATH_FUNC_NAMES
+#define ASMJS_JSBUILTIN_MATH_FUNC_NAMES(propertyId, funcName)
+#endif
+
 #ifndef ASMJS_MATH_FUNC_NAMES
 #define ASMJS_MATH_FUNC_NAMES(name, propertyName, funcInfo)
 #endif
@@ -24,6 +29,11 @@
 #define ASMJS_TYPED_ARRAY_NAMES(name, propertyName) ASMJS_ARRAY_NAMES(name, propertyName)
 #endif
 
+#ifdef ENABLE_JS_BUILTINS
+ASMJS_JSBUILTIN_MATH_FUNC_NAMES(Js::PropertyIds::min,   Min     )
+ASMJS_JSBUILTIN_MATH_FUNC_NAMES(Js::PropertyIds::max,   Max     )
+#endif
+
 ASMJS_MATH_FUNC_NAMES(sin,      sin,    Math::EntryInfo::Sin    )
 ASMJS_MATH_FUNC_NAMES(cos,      cos,    Math::EntryInfo::Cos    )
 ASMJS_MATH_FUNC_NAMES(tan,      tan,    Math::EntryInfo::Tan    )
@@ -66,6 +76,7 @@ ASMJS_TYPED_ARRAY_NAMES(Float64Array, Float64Array)
 ASMJS_ARRAY_NAMES(byteLength,   byteLength)
 
 // help the caller to undefine all the macros
+#undef ASMJS_JSBUILTIN_MATH_FUNC_NAMES
 #undef ASMJS_MATH_FUNC_NAMES
 #undef ASMJS_MATH_CONST_NAMES
 #undef ASMJS_MATH_DOUBLE_CONST_NAMES

lib/Runtime/Language/AsmJsLink.cpp

@@ -191,6 +191,18 @@ namespace Js{
     bool ASMLink::CheckIsBuiltinFunction(ScriptContext* scriptContext, const Var object, PropertyId propertyId, const FunctionInfo& funcInfo)
     {
         Var mathFuncObj = JavascriptOperators::OP_GetProperty(object, propertyId, scriptContext);
+#ifdef ENABLE_JS_BUILTINS
+        if (scriptContext->IsJsBuiltInEnabled())
+        {
+            switch (propertyId)
+            {
+#define ASMJS_JSBUILTIN_MATH_FUNC_NAMES(propertyId, funcName) case propertyId: \
+                return VarIs<JavascriptFunction>(mathFuncObj) && \
+                    VarTo<JavascriptFunction>(mathFuncObj) == scriptContext->GetLibrary()->GetMath##funcName##Function();
+#include "AsmJsBuiltInNames.h"
+            }
+        }
+#endif
         return VarIs<JavascriptFunction>(mathFuncObj) &&
             VarTo<JavascriptFunction>(mathFuncObj)->GetFunctionInfo()->GetOriginalEntryPoint() == funcInfo.GetOriginalEntryPoint();
     }

lib/Runtime/Library/EngineInterfaceObjectBuiltIns.h

@@ -56,8 +56,6 @@ GlobalBuiltInConstructor(Symbol)
 
 GlobalMathBuiltIn(Abs)
 GlobalMathBuiltIn(Floor)
-GlobalMathBuiltIn(Max)
-GlobalMathBuiltIn(Min)
 GlobalMathBuiltIn(Pow)
 
 GlobalBuiltIn(JavascriptObject, DefineProperty)
@@ -91,8 +89,6 @@ GlobalBuiltIn(JavascriptString, Substring)
 GlobalBuiltIn(JavascriptString, Repeat)
 GlobalBuiltIn(JavascriptString, IndexOf)
 
-GlobalBuiltIn(JavascriptNumber, IsNaN)
-
 GlobalBuiltIn(GlobalObject, IsFinite) // TODO(jahorto): consider switching to Number.isFinite
 GlobalBuiltIn(GlobalObject, IsNaN) // TODO(jahorto): consider switching to Number.isNaN
 GlobalBuiltIn(GlobalObject, Eval) // TODO(jahorto): consider deleting (currently used by WinRT Promises)

lib/Runtime/Library/InJavascript/Intl.js.bc.32b.h

@@ -340,6 +340,14 @@ namespace Js
         Field(JavascriptFunction*) getStackTrace;
 #ifdef EDIT_AND_CONTINUE
         Field(JavascriptFunction*) editSource;
+#endif
+        Field(JavascriptFunction*) mathMin;
+        Field(JavascriptFunction*) mathMax;
+
+#ifdef ENABLE_JS_BUILTINS
+    public:
+        JavascriptFunction* GetMathMinFunction() const { return mathMin; }
+        JavascriptFunction* GetMathMaxFunction() const { return mathMax; }
 #endif
     };
 }