[pull] master from Melon-Tropics:master

doc/api/fs.md

@@ -3835,6 +3835,9 @@ fs.watch('somedir', (eventType, filename) => {
 <!-- YAML
 added: v0.1.31
 changes:
+  - version: v10.5.0
+    pr-url: https://github.com/nodejs/node/pull/20220
+    description: The `bigint` option is now supported.
   - version: v7.6.0
     pr-url: https://github.com/nodejs/node/pull/10739
     description: The `filename` parameter can be a WHATWG `URL` object using
@@ -3843,6 +3846,7 @@ changes:
 
 * `filename` {string|Buffer|URL}
 * `options` {Object}
+  * `bigint` {boolean} **Default:** `false`
   * `persistent` {boolean} **Default:** `true`
   * `interval` {integer} **Default:** `5007`
 * `listener` {Function}
@@ -3868,7 +3872,8 @@ fs.watchFile('message.text', (curr, prev) => {
 });
 ```
 
-These stat objects are instances of `fs.Stat`.
+These stat objects are instances of `fs.Stat`. If the `bigint` option is `true`,
+the numeric values in these objects are specified as `BigInt`s.
 
 To be notified when the file was modified, not just accessed, it is necessary
 to compare `curr.mtime` and `prev.mtime`.

src/node_http_common-inl.h

@@ -123,9 +123,9 @@ NgHeader<T>::NgHeader(
 
 template <typename T>
 NgHeader<T>::NgHeader(NgHeader<T>&& other) noexcept
-    : token_(other.token_),
-      name_(std::move(other.name_)),
+    : name_(std::move(other.name_)),
       value_(std::move(other.value_)),
+      token_(other.token_),
       flags_(other.flags_) {
   other.token_ = -1;
   other.flags_ = 0;

src/node_http_common.h

@@ -494,7 +494,7 @@ class NgHeader : public MemoryRetainer {
   inline std::string value() const;
   inline size_t length() const;
 
-  void MemoryInfo(MemoryTracker* tracker) const {
+  void MemoryInfo(MemoryTracker* tracker) const override {
     tracker->TrackField("name", name_);
     tracker->TrackField("value", value_);
   }

test/wasi/c/link.c

@@ -0,0 +1,17 @@
+#include <assert.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#define OLD "/sandbox/input.txt"
+#define NEW "/tmp/output.txt"
+
+int main() {
+  struct stat st_old;
+  struct stat st_new;
+
+  assert(0 == stat(OLD, &st_old));
+  assert(0 == link(OLD, NEW));
+  assert(0 == stat(NEW, &st_new));
+  assert(st_old.st_ino == st_new.st_ino);
+  return 0;
+}

test/wasi/test-wasi.js

@@ -64,6 +64,7 @@ if (process.argv[2] === 'wasi-child') {
   runWASI({ test: 'getentropy' });
   runWASI({ test: 'getrusage' });
   runWASI({ test: 'gettimeofday' });
+  runWASI({ test: 'link' });
   runWASI({ test: 'main_args' });
   runWASI({ test: 'notdir' });
   // runWASI({ test: 'poll' });