nodejs
diff --git a/‎src/encoding_binding.cc‎
Lines changed: 2 additions & 0 deletions b/‎src/encoding_binding.cc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/string_bytes.cc‎
Lines changed: 19 additions & 0 deletions b/‎src/string_bytes.cc‎
Lines changed: 19 additions & 0 deletions
@@ -186,6 +186,8 @@ void BindingData::DecodeUTF8(const FunctionCallbackInfo<Value>& args) {
       return node::THROW_ERR_ENCODING_INVALID_ENCODED_DATA(
           env->isolate(), "The encoded data was not valid for encoding utf-8");
     }
+
+    // TODO(chalker): save on utf8 validity recheck in StringBytes::Encode()
   }
 
   if (length == 0) return args.GetReturnValue().SetEmptyString();
 
@@ -539,6 +539,25 @@ MaybeLocal<Value> StringBytes::Encode(Isolate* isolate,
         return ExternOneByteString::NewFromCopy(isolate, buf, buflen);
       }
 
+      if (buflen >= 32 && simdutf::validate_utf8(buf, buflen)) {
+        // We know that we are non-ASCII (and are unlikely Latin1), use 2-byte
+        // In the most likely case of valid UTF-8, we can use this fast impl
+        // For very short input, it is slower, so we limit min size
+        size_t u16size = simdutf::utf16_length_from_utf8(buf, buflen);
+        if (u16size > static_cast<size_t>(v8::String::kMaxLength)) {
+          isolate->ThrowException(ERR_STRING_TOO_LONG(isolate));
+          return MaybeLocal<Value>();
+        }
+        uint16_t* dst = node::UncheckedMalloc<uint16_t>(u16size);
+        if (u16size != 0 && dst == nullptr) {
+          THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);
+          return MaybeLocal<Value>();
+        }
+        size_t utf16len = simdutf::convert_valid_utf8_to_utf16(
+            buf, buflen, reinterpret_cast<char16_t*>(dst));
+        return ExternTwoByteString::New(isolate, dst, utf16len);
+      }
+
       val =
           String::NewFromUtf8(isolate, buf, v8::NewStringType::kNormal, buflen);
       Local<String> str;
Original file line number	Diff line number	Diff line change
@@ -186,6 +186,8 @@ void BindingData::DecodeUTF8(const FunctionCallbackInfo<Value>& args) {
186	186	return node::THROW_ERR_ENCODING_INVALID_ENCODED_DATA(
187	187	env->isolate(), "The encoded data was not valid for encoding utf-8");
188	188	}
	189	+
	190	+ // TODO(chalker): save on utf8 validity recheck in StringBytes::Encode()
189	191	}
190	192
191	193	if (length == 0) return args.GetReturnValue().SetEmptyString();