1 files changed, 15 insertions, 9 deletions
diff --git a/deps/v8/test/cctest/compiler/test-run-machops.cc b/deps/v8/test/cctest/compiler/test-run-machops.cc
index 1e5a73389e..ccc05ce11b 100644
--- a/deps/v8/test/cctest/compiler/test-run-machops.cc
+++ b/deps/v8/test/cctest/compiler/test-run-machops.cc
@@ -10,9 +10,10 @@
 #include "src/base/ieee754.h"
 #include "src/base/overflowing-math.h"
 #include "src/base/utils/random-number-generator.h"
+#include "src/common/ptr-compr-inl.h"
+#include "src/objects/objects-inl.h"
 #include "src/utils/boxed-float.h"
 #include "src/utils/utils.h"
-#include "src/objects/objects-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
 #include "test/cctest/compiler/value-helper.h"
@@ -410,12 +411,15 @@ TEST(CompressDecompressTaggedAnyPointer) {
 }
 
 TEST(CompressDecompressTaggedAnySigned) {
-  RawMachineAssemblerTester<int64_t> m;
+  RawMachineAssemblerTester<void*> m;
   Smi smi = Smi::FromInt(123);
-  int64_t smiPointer = static_cast<int64_t>(smi.ptr());
-  Node* node = m.Int64Constant(smiPointer);
+  Node* node = m.Int64Constant(static_cast<int64_t>(smi.ptr()));
   m.Return(m.ChangeCompressedToTagged(m.ChangeTaggedToCompressed(node)));
-  CHECK_EQ(smiPointer, m.Call());
+
+  Object result = Object(reinterpret_cast<Address>(m.Call()));
+  Address smiPointer =
+      DecompressTaggedAny(m.isolate(), CompressTagged(smi.ptr()));
+  CHECK_EQ(smiPointer, result.ptr());
 }
 
 TEST(CompressDecompressTaggedPointer) {
@@ -432,13 +436,15 @@ TEST(CompressDecompressTaggedPointer) {
 }
 
 TEST(CompressDecompressTaggedSigned) {
-  RawMachineAssemblerTester<int64_t> m;
+  RawMachineAssemblerTester<void*> m;
   Smi smi = Smi::FromInt(123);
-  int64_t smiPointer = static_cast<int64_t>(smi.ptr());
-  Node* node = m.Int64Constant(smiPointer);
+  Address smiPointer = smi.ptr();
+  Node* node = m.Int64Constant(static_cast<int64_t>(smiPointer));
   m.Return(m.ChangeCompressedSignedToTaggedSigned(
       m.ChangeTaggedSignedToCompressedSigned(node)));
-  CHECK_EQ(smiPointer, m.Call());
+
+  Object result = Object(reinterpret_cast<Address>(m.Call()));
+  CHECK_EQ(smiPointer, result.ptr());
 }
 #endif  // V8_COMPRESS_POINTERS