LibJS: Make Array.prototype.includes() generic

2 files changed, 21 insertions, 16 deletions

diff --git a/Libraries/LibJS/Runtime/ArrayPrototype.cpp b/Libraries/LibJS/Runtime/ArrayPrototype.cpp
index 5bafc64720..24be708df4 100644
--- a/Libraries/LibJS/Runtime/ArrayPrototype.cpp
+++ b/Libraries/LibJS/Runtime/ArrayPrototype.cpp
@@ -557,35 +557,32 @@ Value ArrayPrototype::last_index_of(Interpreter& interpreter)
 
 Value ArrayPrototype::includes(Interpreter& interpreter)
 {
-    auto* array = array_from(interpreter);
-    if (!array)
+    auto* this_object = interpreter.this_value().to_object(interpreter);
+    if (!this_object)
         return {};
-
-    i32 array_size = array->elements().size();
-    if (array_size == 0)
+    i32 length = get_length(interpreter, *this_object);
+    if (interpreter.exception())
+        return {};
+    if (length == 0)
         return Value(false);
-
     i32 from_index = 0;
     if (interpreter.argument_count() >= 2) {
         from_index = interpreter.argument(1).to_i32(interpreter);
         if (interpreter.exception())
             return {};
-        if (from_index >= array_size)
+        if (from_index >= length)
             return Value(false);
-        auto negative_min_index = ((array_size - 1) * -1);
-        if (from_index < negative_min_index)
-            from_index = 0;
-        else if (from_index < 0)
-            from_index = array_size + from_index;
+        if (from_index < 0)
+            from_index = max(length + from_index, 0);
     }
-
     auto value_to_find = interpreter.argument(0);
-    for (i32 i = from_index; i < array_size; ++i) {
-        auto& element = array->elements().at(i);
+    for (i32 i = from_index; i < length; ++i) {
+        auto element = this_object->get_by_index(i).value_or(js_undefined());
+        if (interpreter.exception())
+            return {};
         if (same_value_zero(interpreter, element, value_to_find))
             return Value(true);
     }
-
     return Value(false);
 }
 
diff --git a/Libraries/LibJS/Tests/Array.prototype-generic-functions.js b/Libraries/LibJS/Tests/Array.prototype-generic-functions.js
index 0fee4adcf3..d9cd763269 100644
--- a/Libraries/LibJS/Tests/Array.prototype-generic-functions.js
+++ b/Libraries/LibJS/Tests/Array.prototype-generic-functions.js
@@ -62,6 +62,14 @@ try {
         assert(Array.prototype.lastIndexOf.call({ length: 5, 2: "foo", 4: "foo" }, "foo", -2) === 2);
     }
 
+    {
+        assert(Array.prototype.includes.call({}) === false);
+        assert(Array.prototype.includes.call({ 0: undefined }) === false);
+        assert(Array.prototype.includes.call({ length: 1, 0: undefined }) === true);
+        assert(Array.prototype.includes.call({ length: 1, 2: "foo" }, "foo") === false);
+        assert(Array.prototype.includes.call({ length: 5, 2: "foo" }, "foo") === true);
+    }
+
     const o = { length: 5, 0: "foo", 1: "bar", 3: "baz" };
 
     {