str escape u8 instead of u64

ijl · Jun 13, 2024 · 05fd9e1 · 05fd9e1
1 parent 7f212b8
commit 05fd9e1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/serialize/writer/str.rs b/src/serialize/writer/str.rs
@@ -24,6 +24,12 @@ macro_rules! splat_mm256 {
     };
 }
 
+macro_rules! write_escape {
+    ($escape:expr, $dst:expr) => {
+        core::ptr::copy_nonoverlapping($escape.0.as_ptr(), $dst, 8);
+    };
+}
+
 #[cfg(all(feature = "unstable-simd", target_arch = "x86_64", feature = "avx512"))]
 macro_rules! impl_format_simd_avx512vl {
     ($dst:expr, $src:expr, $value_len:expr) => {
@@ -55,7 +61,7 @@ macro_rules! impl_format_simd_avx512vl {
                     nb -= 1;
 
                     $dst = $dst.add(cn);
-                    core::ptr::write($dst as *mut u64, *(escape.0.as_ptr() as *const u64));
+                    write_escape!(escape, $dst);
                     $dst = $dst.add(escape.1 as usize);
                 } else {
                     nb -= STRIDE;
@@ -87,7 +93,7 @@ macro_rules! impl_format_simd_avx512vl {
                     nb -= 1;
 
                     $dst = $dst.add(cn);
-                    core::ptr::write($dst as *mut u64, *(escape.0.as_ptr() as *const u64));
+                    write_escape!(escape, $dst);
                     $dst = $dst.add(escape.1 as usize);
                 } else {
                     $dst = $dst.add(nb);
@@ -117,7 +123,7 @@ macro_rules! impl_escape_unchecked {
             $nb -= 1;
             $omask >>= 1;
             let escape = QUOTE_TAB[*($src) as usize];
-            core::ptr::write($dst as *mut u64, *(escape.0.as_ptr() as *const u64));
+            write_escape!(escape, $dst);
             $dst = $dst.add(escape.1 as usize);
             $src = $src.add(1);
             if likely!($omask & 1 != 1) {
@@ -202,7 +208,7 @@ macro_rules! impl_format_scalar {
                 $dst = $dst.add(1);
                 if unlikely!(NEED_ESCAPED[*($src.sub(1)) as usize] > 0) {
                     let escape = QUOTE_TAB[*($src.sub(1)) as usize];
-                    core::ptr::write($dst.sub(1) as *mut u64, *(escape.0.as_ptr() as *const u64));
+                    write_escape!(escape, $dst.sub(1));
                     $dst = $dst.add(escape.1 as usize - 1);
                 }
             }

diff --git a/test/test_type.py b/test/test_type.py
@@ -112,6 +112,9 @@ def test_str_escape_quote_multi(self):
             == b'"aa\\"aaaaabbbbbbbbbbbbbbbbbbbb\\"bb"'
         )
 
+    def test_str_escape_quote_buffer(self):
+        orjson.dumps(['"' * 4096] * 1024)
+
     def test_str_escape_backslash_0(self):
         assert orjson.dumps("\\aaaaaaabb") == b'"\\\\aaaaaaabb"'
 
@@ -145,6 +148,9 @@ def test_str_escape_backslash_multi(self):
             == b'"aa\\\\aaaaabbbbbbbbbbbbbbbbbbbb\\\\bb"'
         )
 
+    def test_str_escape_backslash_buffer(self):
+        orjson.dumps(["\\" * 4096] * 1024)
+
     def test_str_escape_x32_0(self):
         assert orjson.dumps("\taaaaaaabb") == b'"\\taaaaaaabb"'
 
@@ -178,6 +184,9 @@ def test_str_escape_x32_multi(self):
             == b'"aa\\taaaaabbbbbbbbbbbbbbbbbbbb\\tbb"'
         )
 
+    def test_str_escape_x32_buffer(self):
+        orjson.dumps(["\t" * 4096] * 1024)
+
     def test_str_emoji(self):
         ref = "®️"
         assert orjson.loads(orjson.dumps(ref)) == ref