1 files changed, 10 insertions, 11 deletions
diff --git a/ext/ffi/00_ffi.js b/ext/ffi/00_ffi.js
index 9dd675f88..db58dda80 100644
--- a/ext/ffi/00_ffi.js
+++ b/ext/ffi/00_ffi.js
@@ -4,7 +4,6 @@ import { core, primordials } from "ext:core/mod.js";
 const ops = core.ops;
 const {
   ArrayBufferIsView,
-  ArrayBufferPrototype,
   ArrayBufferPrototypeGetByteLength,
   ArrayPrototypeMap,
   ArrayPrototypeJoin,
@@ -16,7 +15,6 @@ const {
   NumberIsSafeInteger,
   TypedArrayPrototypeGetBuffer,
   TypedArrayPrototypeGetByteLength,
-  TypedArrayPrototypeGetSymbolToStringTag,
   TypeError,
   Uint8Array,
   Int32Array,
@@ -32,6 +30,11 @@ const {
   SafeArrayIterator,
   SafeWeakMap,
 } = primordials;
+const {
+  isArrayBuffer,
+  isDataView,
+  isTypedArray,
+} = core;
 import { pathFromURL } from "ext:deno_web/00_infra.js";
 const {
   op_ffi_call_nonblocking,
@@ -46,14 +49,10 @@ const {
  * @returns {number}
  */
 function getBufferSourceByteLength(source) {
-  if (ArrayBufferIsView(source)) {
-    if (TypedArrayPrototypeGetSymbolToStringTag(source) !== undefined) {
-      // TypedArray
-      return TypedArrayPrototypeGetByteLength(source);
-    } else {
-      // DataView
-      return DataViewPrototypeGetByteLength(source);
-    }
+  if (isTypedArray(source)) {
+    return TypedArrayPrototypeGetByteLength(source);
+  } else if (isDataView(source)) {
+    return DataViewPrototypeGetByteLength(source);
   }
   return ArrayBufferPrototypeGetByteLength(source);
 }
@@ -232,7 +231,7 @@ class UnsafePointer {
       } else {
         pointer = ops.op_ffi_ptr_of(value);
       }
-    } else if (ObjectPrototypeIsPrototypeOf(ArrayBufferPrototype, value)) {
+    } else if (isArrayBuffer(value)) {
       if (value.length === 0) {
         pointer = ops.op_ffi_ptr_of_exact(new Uint8Array(value));
       } else {