Modifications

chakra-core · Oct 4, 2018 · 540a95d · 540a95d
1 parent 54b0bba
commit 540a95d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/lib/Runtime/Library/EngineInterfaceObjectBuiltIns.h b/lib/Runtime/Library/EngineInterfaceObjectBuiltIns.h
@@ -90,8 +90,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)

diff --git a/lib/Runtime/Library/JsBuiltIn/JsBuiltIn.js b/lib/Runtime/Library/JsBuiltIn/JsBuiltIn.js
@@ -34,7 +34,6 @@
     __chakraLibrary.raiseFunctionArgument_NeedFunction = platform.raiseFunctionArgument_NeedFunction;
     __chakraLibrary.functionBind = platform.builtInJavascriptFunctionEntryBind;
     __chakraLibrary.objectDefineProperty = _objectDefineProperty;
-    __chakraLibrary.isNaN = platform.builtInJavascriptNumberEntryIsNaN;
 
     _objectDefineProperty(__chakraLibrary.ArrayIterator.prototype, 'next',
         // Object's getter and setter can get overriden on the prototype, in that case while setting the value attributes, we will end up with TypeError
@@ -492,7 +491,7 @@
             //Let elementK be the result of ? Get(O, ! ToString(k)).
             let elementK = o[k];
             //If SameValueZero(searchElement, elementK) is true, return true.
-            if ((searchElement === elementK) || (__chakraLibrary.isNaN(searchElement) && __chakraLibrary.isNaN(elementK))) {
+            if ((searchElement === elementK) || (searchElement !== searchElement && elementK !== elementK)) { // check for isNaN
                 return true;
             }
             //Increase k by 1.