fixup! buffer: add fast api for isAscii & isUtf8

Author: anonrig

src/node_buffer.cc

@@ -33,6 +33,7 @@
 #include "string_bytes.h"
 
 #include "util-inl.h"
+#include "util.h"
 #include "v8-fast-api-calls.h"
 #include "v8.h"
 
@@ -61,6 +62,7 @@ using v8::BackingStore;
 using v8::BackingStoreInitializationMode;
 using v8::Context;
 using v8::EscapableHandleScope;
+using v8::FastApiCallbackOptions;
 using v8::FastApiTypedArray;
 using v8::FunctionCallbackInfo;
 using v8::Global;
@@ -1176,23 +1178,33 @@ void Swap64(const FunctionCallbackInfo<Value>& args) {
 }
 
 bool FastIsUtf8(v8::Local<v8::Value>,
-                const v8::FastApiTypedArray<uint8_t>& buffer) {
-  uint8_t* buffer_data;
-  CHECK(buffer.getStorageIfAligned(&buffer_data));
+                Local<Value> buffer,
+                FastApiCallbackOptions& options) {
   TRACK_V8_FAST_API_CALL("buffer.isUtf8");
-  return simdutf::validate_utf8(reinterpret_cast<const char*>(buffer_data),
-                                buffer.length());
+  ArrayBufferViewContents<uint8_t> view(buffer);
+  if (view.WasDetached()) {
+    node::THROW_ERR_INVALID_STATE(options.isolate,
+                                  "Cannot validate on a detached buffer");
+    return false;
+  }
+  return simdutf::validate_utf8(reinterpret_cast<const char*>(view.data()),
+                                view.length());
 }
 
 static v8::CFunction fast_is_utf8(v8::CFunction::Make(FastIsUtf8));
 
 bool FastIsAscii(v8::Local<v8::Value>,
-                 const v8::FastApiTypedArray<uint8_t>& buffer) {
-  uint8_t* buffer_data;
-  CHECK(buffer.getStorageIfAligned(&buffer_data));
+                 Local<Value> buffer,
+                 FastApiCallbackOptions& options) {
   TRACK_V8_FAST_API_CALL("buffer.isAscii");
-  return simdutf::validate_ascii(reinterpret_cast<const char*>(buffer_data),
-                                 buffer.length());
+  ArrayBufferViewContents<uint8_t> view(buffer);
+  if (view.WasDetached()) {
+    node::THROW_ERR_INVALID_STATE(options.isolate,
+                                  "Cannot validate on a detached buffer");
+    return false;
+  }
+  return simdutf::validate_ascii(reinterpret_cast<const char*>(view.data()),
+                                 view.length());
 }
 
 static v8::CFunction fast_is_ascii(v8::CFunction::Make(FastIsAscii));

src/node_external_reference.h

@@ -42,8 +42,6 @@ using CFunctionCallbackWithInt64 = void (*)(v8::Local<v8::Object> unused,
 using CFunctionCallbackWithBool = void (*)(v8::Local<v8::Object> unused,
                                            v8::Local<v8::Object> receiver,
                                            bool);
-using CFunctionFastIsUtf8 = bool (*)(
-    v8::Local<v8::Value>, const v8::FastApiTypedArray<uint8_t>& buffer);
 using CFunctionCallbackWithString =
     bool (*)(v8::Local<v8::Value>, const v8::FastOneByteString& input);
 using CFunctionCallbackWithStrings =
@@ -111,7 +109,6 @@ class ExternalReferenceRegistry {
   V(CFunctionCallbackValueReturnDoubleUnusedReceiver)                          \
   V(CFunctionCallbackWithInt64)                                                \
   V(CFunctionCallbackWithBool)                                                 \
-  V(CFunctionFastIsUtf8)                                                       \
   V(CFunctionCallbackWithString)                                               \
   V(CFunctionCallbackWithStrings)                                              \
   V(CFunctionCallbackWithTwoUint8Arrays)                                       \

test/parallel/test-buffer-isutf8-isascii-fast-api.js

@@ -24,11 +24,8 @@ assert.strictEqual(buffer.isAscii(nonAsciiBuffer), false);
 
 // Test detached buffers
 const detachedBuffer = new ArrayBuffer(10);
-try {
-  detachedBuffer.detach();
-} catch (_e) {
-  console.log('Skipping detached buffer tests - detach not supported');
-}
+// Let's detach the buffer if it's supported
+detachedBuffer.detach?.();
 
 if (detachedBuffer.detached) {
   const typedArray = new Uint8Array(detachedBuffer);