src: fix internalModuleStat v8 fast path

PR-URL: #58054
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>

Author: anonrig

lib/fs.js

@@ -1428,7 +1428,7 @@ function handleDirents({ result, currentPath, context }) {
 constdirent=getDirent(currentPath,names[i],types[i]);
 ArrayPrototypePush(context.readdirResults,dirent);
 
-if(dirent.isDirectory()||binding.internalModuleStat(binding,fullPath)===1){
+if(dirent.isDirectory()||binding.internalModuleStat(fullPath)===1){
 ArrayPrototypePush(context.pathsQueue,fullPath);
 }
 }
@@ -1438,7 +1438,7 @@ function handleFilePaths({ result, currentPath, context }) {
 for(leti=0;i<result.length;i++){
 constresultPath=pathModule.join(currentPath,result[i]);
 constrelativeResultPath=pathModule.relative(context.basePath,resultPath);
-conststat=binding.internalModuleStat(binding,resultPath);
+conststat=binding.internalModuleStat(resultPath);
 ArrayPrototypePush(context.readdirResults,relativeResultPath);
 
 if(stat===1){

lib/internal/fs/promises.js

@@ -910,7 +910,7 @@ async function readdirRecursive(originalPath, options) {
 const{0: path,1: readdir}=ArrayPrototypePop(queue);
 for(constentofreaddir){
 constdirentPath=pathModule.join(path,ent);
-conststat=binding.internalModuleStat(binding,direntPath);
+conststat=binding.internalModuleStat(direntPath);
 ArrayPrototypePush(
 result,
 pathModule.relative(originalPath,direntPath),

lib/internal/modules/cjs/loader.js

@@ -255,9 +255,9 @@ function stat(filename) {
 constresult=statCache.get(filename);
 if(result!==undefined){returnresult;}
 }
-constresult=internalFsBinding.internalModuleStat(internalFsBinding,filename);
+constresult=internalFsBinding.internalModuleStat(filename);
 if(statCache!==null&&result>=0){
-// Only set cache when `internalModuleStat(internalFsBinding, filename)` succeeds.
+// Only set cache when `internalModuleStat(filename)` succeeds.
 statCache.set(filename,result);
 }
 returnresult;

lib/internal/modules/esm/resolve.js

@@ -248,7 +248,6 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
 }
 
 conststats=internalFsBinding.internalModuleStat(
-internalFsBinding,
 StringPrototypeEndsWith(internalFsBinding,path,'/') ? StringPrototypeSlice(path,-1) : path,
 );
 

lib/internal/modules/package_json_reader.js

@@ -235,7 +235,6 @@ function getPackageJSONURL(specifier, base) {
 letlastPath;
 do{
 conststat=internalFsBinding.internalModuleStat(
-internalFsBinding,
 StringPrototypeSlice(packageJSONPath,0,packageJSONPath.length-13),
 );
 // Check for !stat.isDirectory()

src/node_external_reference.h

@@ -32,9 +32,8 @@ using CFunctionCallback = void (*)(v8::Local<v8::Value> unused,
 using CFunctionCallbackReturnDouble =
 double (*)(v8::Local<v8::Object> unused, v8::Local<v8::Object> receiver);
 using CFunctionCallbackReturnInt32 =
-int32_t (*)(v8::Local<v8::Object> unused,
- v8::Local<v8::Object> receiver,
-const v8::FastOneByteString& input,
+int32_t (*)(v8::Local<v8::Value> receiver,
+ v8::Local<v8::Value> input,
 // NOLINTNEXTLINE(runtime/references) This is V8 api.
  v8::FastApiCallbackOptions& options);
 using CFunctionCallbackValueReturnDouble =

src/node_file.cc

@@ -23,6 +23,7 @@
 #include"aliased_buffer-inl.h"
 #include"memory_tracker-inl.h"
 #include"node_buffer.h"
+#include"node_debug.h"
 #include"node_errors.h"
 #include"node_external_reference.h"
 #include"node_file-inl.h"
@@ -63,8 +64,6 @@ using v8::BigInt;
 using v8::Context;
 using v8::EscapableHandleScope;
 using v8::FastApiCallbackOptions;
-using v8::FastOneByteString;
-using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::HandleScope;
@@ -1056,9 +1055,9 @@ static void ExistsSync(const FunctionCallbackInfo<Value>& args) {
 staticvoidInternalModuleStat(const FunctionCallbackInfo<Value>& args) {
  Environment* env = Environment::GetCurrent(args);
 
-CHECK_GE(args.Length(), 2);
-CHECK(args[1]->IsString());
- BufferValue path(env->isolate(), args[1]);
+CHECK_EQ(args.Length(), 1);
+CHECK(args[0]->IsString());
+ BufferValue path(env->isolate(), args[0]);
 CHECK_NOT_NULL(*path);
 ToNamespacedPath(env, &path);
 
@@ -1074,15 +1073,17 @@ static void InternalModuleStat(const FunctionCallbackInfo<Value>& args) {
 }
 
 staticint32_tFastInternalModuleStat(
- Local<Object> unused,
- Local<Object> recv,
-const FastOneByteString& input,
+ Local<Value> recv,
+ Local<Value> input_,
 // NOLINTNEXTLINE(runtime/references) This is V8 api.
  FastApiCallbackOptions& options) {
- Environment* env = Environment::GetCurrent(options.isolate);
- HandleScope scope(env->isolate());
+TRACK_V8_FAST_API_CALL("fs.internalModuleStat");
+ HandleScope scope(options.isolate);
+
+CHECK(input_->IsString());
+ Utf8Value input(options.isolate, input_.As<String>());
 
-auto path = std::filesystem::path(input.data, input.data + input.length);
+auto path = std::filesystem::path(input.ToStringView());
 
 switch (std::filesystem::status(path).type()) {
 case std::filesystem::file_type::directory:

test/parallel/test-permission-fs-internal-module-stat.js

@@ -1,8 +1,9 @@
-// Flags: --expose-internals --permission --allow-fs-read=test/common* --allow-fs-read=tools* --allow-fs-read=test/parallel* --allow-child-process
+// Flags: --expose-internals --permission --allow-fs-read=test/common* --allow-fs-read=tools* --allow-fs-read=test/parallel* --allow-child-process --allow-natives-syntax
 'use strict';
 
 constcommon=require('../common');
 const{ isMainThread }=require('worker_threads');
+const{ strictEqual }=require('assert');
 
 if(!isMainThread){
 common.skip('This test only works on a main thread');
@@ -18,9 +19,20 @@ const fixtures = require('../common/fixtures');
 constblockedFile=fixtures.path('permission','deny','protected-file.md');
 constinternalFsBinding=internalBinding('fs');
 
-// Run this inside a for loop to trigger the fast API
-for(leti=0;i<10_000;i++){
-// internalModuleStat does not use permission model.
-// doesNotThrow
-internalFsBinding.internalModuleStat(internalFsBinding,blockedFile);
+strictEqual(internalFsBinding.internalModuleStat(blockedFile),0);
+
+// Only javascript methods can be optimized through %OptimizeFunctionOnNextCall
+// This is why we surround the C++ method we want to optimize with a JS function.
+functiontestFastPaths(file){
+returninternalFsBinding.internalModuleStat(file);
+}
+
+eval('%PrepareFunctionForOptimization(testFastPaths)');
+testFastPaths(blockedFile);
+eval('%OptimizeFunctionOnNextCall(testFastPaths)');
+strictEqual(testFastPaths(blockedFile),0);
+
+if(common.isDebug){
+const{ getV8FastApiCallCount }=internalBinding('debug');
+strictEqual(getV8FastApiCallCount('fs.internalModuleStat'),1);
 }