From 7fa175f6d3e243a4ff9f97bd5efc970856210d46 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Tue, 25 Jul 2017 21:36:12 -0300
Subject: [PATCH] assert: fix deepEqual inconsistencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/14491
Fixes: https://github.com/nodejs/node/issues/14441
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Khaidi Chu <i@2333.moe>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
---
 lib/assert.js                     | 11 +++++++++--
 test/parallel/test-assert-deep.js | 20 ++++++++++++++++++++
 test/parallel/test-assert.js      |  4 ++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/lib/assert.js b/lib/assert.js
index 6f340d8ef4e46b..73c4a1c444e2df 100644
--- a/lib/assert.js
+++ b/lib/assert.js
@@ -279,8 +279,15 @@ function innerDeepEqual(actual, expected, strict, memos) {
       position: 0
     };
   } else {
-    if (memos.actual.has(actual)) {
-      return memos.actual.get(actual) === memos.expected.get(expected);
+    // We prevent up to two map.has(x) calls by directly retrieving the value
+    // and checking for undefined. The map can only contain numbers, so it is
+    // safe to check for undefined only.
+    const expectedMemoA = memos.actual.get(actual);
+    if (expectedMemoA !== undefined) {
+      const expectedMemoB = memos.expected.get(expected);
+      if (expectedMemoB !== undefined) {
+        return expectedMemoA === expectedMemoB;
+      }
     }
     memos.position++;
   }
diff --git a/test/parallel/test-assert-deep.js b/test/parallel/test-assert-deep.js
index 74c4eb44ffc7b4..25e94b0f2fd187 100644
--- a/test/parallel/test-assert-deep.js
+++ b/test/parallel/test-assert-deep.js
@@ -303,6 +303,26 @@ assertOnlyDeepEqual(
   new Set([undefined])
 );
 
+// Circular structures
+{
+  const a = {};
+  const b = {};
+  a.a = a;
+  b.a = {};
+  b.a.a = a;
+  assertDeepAndStrictEqual(a, b);
+}
+
+{
+  const a = new Set();
+  const b = new Set();
+  const c = new Set();
+  a.add(a);
+  b.add(b);
+  c.add(a);
+  assertDeepAndStrictEqual(b, c);
+}
+
 {
   const values = [
     123,
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
index ab45aa6c4b63c4..98c0f9eef2994f 100644
--- a/test/parallel/test-assert.js
+++ b/test/parallel/test-assert.js
@@ -550,8 +550,8 @@ a.throws(makeBlock(thrower, TypeError), function(err) {
 
   const h = {ref: g};
 
-  a.throws(makeBlock(a.deepEqual, f, h), /AssertionError/);
-  a.throws(makeBlock(a.deepStrictEqual, f, h), /AssertionError/);
+  a.doesNotThrow(makeBlock(a.deepEqual, f, h));
+  a.doesNotThrow(makeBlock(a.deepStrictEqual, f, h));
 }
 // GH-7178. Ensure reflexivity of deepEqual with `arguments` objects.
 const args = (function() { return arguments; })();