google-protobuf 3.25.0 → 4.28.3

data/lib/google/protobuf/wrappers_pb.rb

@@ -8,28 +8,7 @@ require 'google/protobuf'
 descriptor_data = "\n\x1egoogle/protobuf/wrappers.proto\x12\x0fgoogle.protobuf\"\x1c\n\x0b\x44oubleValue\x12\r\n\x05value\x18\x01 \x01(\x01\"\x1b\n\nFloatValue\x12\r\n\x05value\x18\x01 \x01(\x02\"\x1b\n\nInt64Value\x12\r\n\x05value\x18\x01 \x01(\x03\"\x1c\n\x0bUInt64Value\x12\r\n\x05value\x18\x01 \x01(\x04\"\x1b\n\nInt32Value\x12\r\n\x05value\x18\x01 \x01(\x05\"\x1c\n\x0bUInt32Value\x12\r\n\x05value\x18\x01 \x01(\r\"\x1a\n\tBoolValue\x12\r\n\x05value\x18\x01 \x01(\x08\"\x1c\n\x0bStringValue\x12\r\n\x05value\x18\x01 \x01(\t\"\x1b\n\nBytesValue\x12\r\n\x05value\x18\x01 \x01(\x0c\x42\x83\x01\n\x13\x63om.google.protobufB\rWrappersProtoP\x01Z1google.golang.org/protobuf/types/known/wrapperspb\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3"
 
 pool = Google::Protobuf::DescriptorPool.generated_pool
-
-begin
-  pool.add_serialized_file(descriptor_data)
-rescue TypeError
-  # Compatibility code: will be removed in the next major version.
-  require 'google/protobuf/descriptor_pb'
-  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
-  parsed.clear_dependency
-  serialized = parsed.class.encode(parsed)
-  file = pool.add_serialized_file(serialized)
-  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
-  imports = [
-  ]
-  imports.each do |type_name, expected_filename|
-    import_file = pool.lookup(type_name).file_descriptor
-    if import_file.name != expected_filename
-      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
-    end
-  end
-  warn "Each proto file must use a consistent fully-qualified name."
-  warn "This will become an error in the next major version."
-end
+pool.add_serialized_file(descriptor_data)
 
 module Google
   module Protobuf

data/lib/google/protobuf.rb

@@ -7,7 +7,7 @@
 
 # require mixins before we hook them into the java & c code
 require 'google/protobuf/message_exts'
-require 'google/protobuf/object_cache'
+require 'google/protobuf/internal/object_cache'
 
 # We define these before requiring the platform-specific modules.
 # That way the module init can grab references to these.

data/lib/google/protobuf_ffi.rb

@@ -15,13 +15,14 @@ require 'google/protobuf/ffi/descriptor'
 require 'google/protobuf/ffi/enum_descriptor'
 require 'google/protobuf/ffi/field_descriptor'
 require 'google/protobuf/ffi/oneof_descriptor'
+require 'google/protobuf/ffi/method_descriptor'
+require 'google/protobuf/ffi/service_descriptor'
 require 'google/protobuf/ffi/descriptor_pool'
 require 'google/protobuf/ffi/file_descriptor'
 require 'google/protobuf/ffi/map'
 require 'google/protobuf/ffi/object_cache'
 require 'google/protobuf/ffi/repeated_field'
 require 'google/protobuf/ffi/message'
-require 'google/protobuf/descriptor_dsl'
 
 module Google
   module Protobuf
@@ -47,4 +48,4 @@ module Google
       nil
     end
   end
-end
+end

data/lib/google/protobuf_native.rb

@@ -16,5 +16,4 @@ else
   end
 end
 
-require 'google/protobuf/descriptor_dsl'
 require 'google/protobuf/repeated_field'

data/lib/google/tasks/ffi.rake

@@ -74,9 +74,7 @@ begin
       FFI::Compiler::CompileTask.new 'protobuf_c_ffi' do |c|
         configure_common_compile_task c
         # Ruby UPB was already compiled with different flags.
-        c.exclude << "/range2-neon.c"
-        c.exclude << "/range2-sse.c"
-        c.exclude << "/naive.c"
+        c.exclude << "/utf8_range.c"
         c.exclude << "/ruby-upb.c"
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.25.0
+  version: 4.28.3
 platform: ruby
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -24,18 +24,32 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13'
 - !ruby/object:Gem::Dependency
@@ -130,15 +144,12 @@ files:
 - ext/google/protobuf_c/shared_message.c
 - ext/google/protobuf_c/shared_message.h
 - ext/google/protobuf_c/third_party/utf8_range/LICENSE
-- ext/google/protobuf_c/third_party/utf8_range/naive.c
-- ext/google/protobuf_c/third_party/utf8_range/range2-neon.c
-- ext/google/protobuf_c/third_party/utf8_range/range2-sse.c
+- ext/google/protobuf_c/third_party/utf8_range/utf8_range.c
 - ext/google/protobuf_c/third_party/utf8_range/utf8_range.h
 - ext/google/protobuf_c/wrap_memcpy.c
 - lib/google/protobuf.rb
 - lib/google/protobuf/any_pb.rb
 - lib/google/protobuf/api_pb.rb
-- lib/google/protobuf/descriptor_dsl.rb
 - lib/google/protobuf/descriptor_pb.rb
 - lib/google/protobuf/duration_pb.rb
 - lib/google/protobuf/empty_pb.rb
@@ -154,12 +165,14 @@ files:
 - lib/google/protobuf/ffi/internal/type_safety.rb
 - lib/google/protobuf/ffi/map.rb
 - lib/google/protobuf/ffi/message.rb
+- lib/google/protobuf/ffi/method_descriptor.rb
 - lib/google/protobuf/ffi/object_cache.rb
 - lib/google/protobuf/ffi/oneof_descriptor.rb
 - lib/google/protobuf/ffi/repeated_field.rb
+- lib/google/protobuf/ffi/service_descriptor.rb
 - lib/google/protobuf/field_mask_pb.rb
+- lib/google/protobuf/internal/object_cache.rb
 - lib/google/protobuf/message_exts.rb
-- lib/google/protobuf/object_cache.rb
 - lib/google/protobuf/plugin_pb.rb
 - lib/google/protobuf/repeated_field.rb
 - lib/google/protobuf/source_context_pb.rb
@@ -175,7 +188,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.25.0/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.28.3/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -184,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/ext/google/protobuf_c/third_party/utf8_range/naive.c

@@ -1,92 +0,0 @@
-#include <stdio.h>
-
-/*
- * http://www.unicode.org/versions/Unicode6.0.0/ch03.pdf - page 94
- *
- * Table 3-7. Well-Formed UTF-8 Byte Sequences
- *
- * +--------------------+------------+-------------+------------+-------------+
- * | Code Points        | First Byte | Second Byte | Third Byte | Fourth Byte |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+0000..U+007F     | 00..7F     |             |            |             |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+0080..U+07FF     | C2..DF     | 80..BF      |            |             |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+0800..U+0FFF     | E0         | A0..BF      | 80..BF     |             |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+1000..U+CFFF     | E1..EC     | 80..BF      | 80..BF     |             |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+D000..U+D7FF     | ED         | 80..9F      | 80..BF     |             |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+E000..U+FFFF     | EE..EF     | 80..BF      | 80..BF     |             |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+10000..U+3FFFF   | F0         | 90..BF      | 80..BF     | 80..BF      |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+40000..U+FFFFF   | F1..F3     | 80..BF      | 80..BF     | 80..BF      |
- * +--------------------+------------+-------------+------------+-------------+
- * | U+100000..U+10FFFF | F4         | 80..8F      | 80..BF     | 80..BF      |
- * +--------------------+------------+-------------+------------+-------------+
- */
-
-/* Return 0 - success,  >0 - index(1 based) of first error char */
-int utf8_naive(const unsigned char *data, int len)
-{
-    int err_pos = 1;
-
-    while (len) {
-        int bytes;
-        const unsigned char byte1 = data[0];
-
-        /* 00..7F */
-        if (byte1 <= 0x7F) {
-            bytes = 1;
-        /* C2..DF, 80..BF */
-        } else if (len >= 2 && byte1 >= 0xC2 && byte1 <= 0xDF &&
-                (signed char)data[1] <= (signed char)0xBF) {
-            bytes = 2;
-        } else if (len >= 3) {
-            const unsigned char byte2 = data[1];
-
-            /* Is byte2, byte3 between 0x80 ~ 0xBF */
-            const int byte2_ok = (signed char)byte2 <= (signed char)0xBF;
-            const int byte3_ok = (signed char)data[2] <= (signed char)0xBF;
-
-            if (byte2_ok && byte3_ok &&
-                     /* E0, A0..BF, 80..BF */
-                    ((byte1 == 0xE0 && byte2 >= 0xA0) ||
-                     /* E1..EC, 80..BF, 80..BF */
-                     (byte1 >= 0xE1 && byte1 <= 0xEC) ||
-                     /* ED, 80..9F, 80..BF */
-                     (byte1 == 0xED && byte2 <= 0x9F) ||
-                     /* EE..EF, 80..BF, 80..BF */
-                     (byte1 >= 0xEE && byte1 <= 0xEF))) {
-                bytes = 3;
-            } else if (len >= 4) {
-                /* Is byte4 between 0x80 ~ 0xBF */
-                const int byte4_ok = (signed char)data[3] <= (signed char)0xBF;
-
-                if (byte2_ok && byte3_ok && byte4_ok &&
-                         /* F0, 90..BF, 80..BF, 80..BF */
-                        ((byte1 == 0xF0 && byte2 >= 0x90) ||
-                         /* F1..F3, 80..BF, 80..BF, 80..BF */
-                         (byte1 >= 0xF1 && byte1 <= 0xF3) ||
-                         /* F4, 80..8F, 80..BF, 80..BF */
-                         (byte1 == 0xF4 && byte2 <= 0x8F))) {
-                    bytes = 4;
-                } else {
-                    return err_pos;
-                }
-            } else {
-                return err_pos;
-            }
-        } else {
-            return err_pos;
-        }
-
-        len -= bytes;
-        err_pos += bytes;
-        data += bytes;
-    }
-
-    return 0;
-}

data/ext/google/protobuf_c/third_party/utf8_range/range2-neon.c

@@ -1,157 +0,0 @@
-/*
- * Process 2x16 bytes in each iteration.
- * Comments removed for brevity. See range-neon.c for details.
- */
-#ifdef __aarch64__
-
-#include <stdio.h>
-#include <stdint.h>
-#include <arm_neon.h>
-
-int utf8_naive(const unsigned char *data, int len);
-
-static const uint8_t _first_len_tbl[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3,
-};
-
-static const uint8_t _first_range_tbl[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,
-};
-
-static const uint8_t _range_min_tbl[] = {
-    0x00, 0x80, 0x80, 0x80, 0xA0, 0x80, 0x90, 0x80,
-    0xC2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-};
-static const uint8_t _range_max_tbl[] = {
-    0x7F, 0xBF, 0xBF, 0xBF, 0xBF, 0x9F, 0xBF, 0x8F,
-    0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-static const uint8_t _range_adjust_tbl[] = {
-    2, 3, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0,
-};
-
-/* Return 0 on success, -1 on error */
-int utf8_range2(const unsigned char *data, int len)
-{
-    if (len >= 32) {
-        uint8x16_t prev_input = vdupq_n_u8(0);
-        uint8x16_t prev_first_len = vdupq_n_u8(0);
-
-        const uint8x16_t first_len_tbl = vld1q_u8(_first_len_tbl);
-        const uint8x16_t first_range_tbl = vld1q_u8(_first_range_tbl);
-        const uint8x16_t range_min_tbl = vld1q_u8(_range_min_tbl);
-        const uint8x16_t range_max_tbl = vld1q_u8(_range_max_tbl);
-        const uint8x16x2_t range_adjust_tbl = vld2q_u8(_range_adjust_tbl);
-
-        const uint8x16_t const_1 = vdupq_n_u8(1);
-        const uint8x16_t const_2 = vdupq_n_u8(2);
-        const uint8x16_t const_e0 = vdupq_n_u8(0xE0);
-
-        uint8x16_t error1 = vdupq_n_u8(0);
-        uint8x16_t error2 = vdupq_n_u8(0);
-        uint8x16_t error3 = vdupq_n_u8(0);
-        uint8x16_t error4 = vdupq_n_u8(0);
-
-        while (len >= 32) {
-            /******************* two blocks interleaved **********************/
-
-#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ < 8)
-            /* gcc doesn't support vldq1_u8_x2 until version 8 */
-            const uint8x16_t input_a = vld1q_u8(data);
-            const uint8x16_t input_b = vld1q_u8(data + 16);
-#else
-            /* Forces a double load on Clang */
-            const uint8x16x2_t input_pair = vld1q_u8_x2(data);
-            const uint8x16_t input_a = input_pair.val[0];
-            const uint8x16_t input_b = input_pair.val[1];
-#endif
-
-            const uint8x16_t high_nibbles_a = vshrq_n_u8(input_a, 4);
-            const uint8x16_t high_nibbles_b = vshrq_n_u8(input_b, 4);
-
-            const uint8x16_t first_len_a =
-                vqtbl1q_u8(first_len_tbl, high_nibbles_a);
-            const uint8x16_t first_len_b =
-                vqtbl1q_u8(first_len_tbl, high_nibbles_b);
-
-            uint8x16_t range_a = vqtbl1q_u8(first_range_tbl, high_nibbles_a);
-            uint8x16_t range_b = vqtbl1q_u8(first_range_tbl, high_nibbles_b);
-
-            range_a =
-                vorrq_u8(range_a, vextq_u8(prev_first_len, first_len_a, 15));
-            range_b =
-                vorrq_u8(range_b, vextq_u8(first_len_a, first_len_b, 15));
-
-            uint8x16_t tmp1_a, tmp2_a, tmp1_b, tmp2_b;
-            tmp1_a = vextq_u8(prev_first_len, first_len_a, 14);
-            tmp1_a = vqsubq_u8(tmp1_a, const_1);
-            range_a = vorrq_u8(range_a, tmp1_a);
-
-            tmp1_b = vextq_u8(first_len_a, first_len_b, 14);
-            tmp1_b = vqsubq_u8(tmp1_b, const_1);
-            range_b = vorrq_u8(range_b, tmp1_b);
-
-            tmp2_a = vextq_u8(prev_first_len, first_len_a, 13);
-            tmp2_a = vqsubq_u8(tmp2_a, const_2);
-            range_a = vorrq_u8(range_a, tmp2_a);
-
-            tmp2_b = vextq_u8(first_len_a, first_len_b, 13);
-            tmp2_b = vqsubq_u8(tmp2_b, const_2);
-            range_b = vorrq_u8(range_b, tmp2_b);
-
-            uint8x16_t shift1_a = vextq_u8(prev_input, input_a, 15);
-            uint8x16_t pos_a = vsubq_u8(shift1_a, const_e0);
-            range_a = vaddq_u8(range_a, vqtbl2q_u8(range_adjust_tbl, pos_a));
-
-            uint8x16_t shift1_b = vextq_u8(input_a, input_b, 15);
-            uint8x16_t pos_b = vsubq_u8(shift1_b, const_e0);
-            range_b = vaddq_u8(range_b, vqtbl2q_u8(range_adjust_tbl, pos_b));
-
-            uint8x16_t minv_a = vqtbl1q_u8(range_min_tbl, range_a);
-            uint8x16_t maxv_a = vqtbl1q_u8(range_max_tbl, range_a);
-
-            uint8x16_t minv_b = vqtbl1q_u8(range_min_tbl, range_b);
-            uint8x16_t maxv_b = vqtbl1q_u8(range_max_tbl, range_b);
-
-            error1 = vorrq_u8(error1, vcltq_u8(input_a, minv_a));
-            error2 = vorrq_u8(error2, vcgtq_u8(input_a, maxv_a));
-
-            error3 = vorrq_u8(error3, vcltq_u8(input_b, minv_b));
-            error4 = vorrq_u8(error4, vcgtq_u8(input_b, maxv_b));
-
-            /************************ next iteration *************************/
-            prev_input = input_b;
-            prev_first_len = first_len_b;
-
-            data += 32;
-            len -= 32;
-        }
-        error1 = vorrq_u8(error1, error2);
-        error1 = vorrq_u8(error1, error3);
-        error1 = vorrq_u8(error1, error4);
-
-        if (vmaxvq_u8(error1))
-            return -1;
-
-        uint32_t token4;
-        vst1q_lane_u32(&token4, vreinterpretq_u32_u8(prev_input), 3);
-
-        const int8_t *token = (const int8_t *)&token4;
-        int lookahead = 0;
-        if (token[3] > (int8_t)0xBF)
-            lookahead = 1;
-        else if (token[2] > (int8_t)0xBF)
-            lookahead = 2;
-        else if (token[1] > (int8_t)0xBF)
-            lookahead = 3;
-
-        data -= lookahead;
-        len += lookahead;
-    }
-
-    return utf8_naive(data, len);
-}
-
-#endif

data/ext/google/protobuf_c/third_party/utf8_range/range2-sse.c

@@ -1,170 +0,0 @@
-/*
- * Process 2x16 bytes in each iteration.
- * Comments removed for brevity. See range-sse.c for details.
- */
-#ifdef __SSE4_1__
-
-#include <stdio.h>
-#include <stdint.h>
-#include <x86intrin.h>
-
-int utf8_naive(const unsigned char *data, int len);
-
-static const int8_t _first_len_tbl[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3,
-};
-
-static const int8_t _first_range_tbl[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,
-};
-
-static const int8_t _range_min_tbl[] = {
-    0x00, 0x80, 0x80, 0x80, 0xA0, 0x80, 0x90, 0x80,
-    0xC2, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
-};
-static const int8_t _range_max_tbl[] = {
-    0x7F, 0xBF, 0xBF, 0xBF, 0xBF, 0x9F, 0xBF, 0x8F,
-    0xF4, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-};
-
-static const int8_t _df_ee_tbl[] = {
-    0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0,
-};
-static const int8_t _ef_fe_tbl[] = {
-    0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-/* Return 0 on success, -1 on error */
-int utf8_range2(const unsigned char *data, int len)
-{
-    if (len >= 32) {
-        __m128i prev_input = _mm_set1_epi8(0);
-        __m128i prev_first_len = _mm_set1_epi8(0);
-
-        const __m128i first_len_tbl =
-            _mm_loadu_si128((const __m128i *)_first_len_tbl);
-        const __m128i first_range_tbl =
-            _mm_loadu_si128((const __m128i *)_first_range_tbl);
-        const __m128i range_min_tbl =
-            _mm_loadu_si128((const __m128i *)_range_min_tbl);
-        const __m128i range_max_tbl =
-            _mm_loadu_si128((const __m128i *)_range_max_tbl);
-        const __m128i df_ee_tbl =
-            _mm_loadu_si128((const __m128i *)_df_ee_tbl);
-        const __m128i ef_fe_tbl =
-            _mm_loadu_si128((const __m128i *)_ef_fe_tbl);
-
-        __m128i error = _mm_set1_epi8(0);
-
-        while (len >= 32) {
-            /***************************** block 1 ****************************/
-            const __m128i input_a = _mm_loadu_si128((const __m128i *)data);
-
-            __m128i high_nibbles =
-                _mm_and_si128(_mm_srli_epi16(input_a, 4), _mm_set1_epi8(0x0F));
-
-            __m128i first_len_a = _mm_shuffle_epi8(first_len_tbl, high_nibbles);
-
-            __m128i range_a = _mm_shuffle_epi8(first_range_tbl, high_nibbles);
-
-            range_a = _mm_or_si128(
-                    range_a, _mm_alignr_epi8(first_len_a, prev_first_len, 15));
-
-            __m128i tmp;
-            tmp = _mm_alignr_epi8(first_len_a, prev_first_len, 14);
-            tmp = _mm_subs_epu8(tmp, _mm_set1_epi8(1));
-            range_a = _mm_or_si128(range_a, tmp);
-
-            tmp = _mm_alignr_epi8(first_len_a, prev_first_len, 13);
-            tmp = _mm_subs_epu8(tmp, _mm_set1_epi8(2));
-            range_a = _mm_or_si128(range_a, tmp);
-
-            __m128i shift1, pos, range2;
-            shift1 = _mm_alignr_epi8(input_a, prev_input, 15);
-            pos = _mm_sub_epi8(shift1, _mm_set1_epi8(0xEF));
-            tmp = _mm_subs_epu8(pos, _mm_set1_epi8(0xF0));
-            range2 = _mm_shuffle_epi8(df_ee_tbl, tmp);
-            tmp = _mm_adds_epu8(pos, _mm_set1_epi8(0x70));
-            range2 = _mm_add_epi8(range2, _mm_shuffle_epi8(ef_fe_tbl, tmp));
-
-            range_a = _mm_add_epi8(range_a, range2);
-
-            __m128i minv = _mm_shuffle_epi8(range_min_tbl, range_a);
-            __m128i maxv = _mm_shuffle_epi8(range_max_tbl, range_a);
-
-            tmp = _mm_or_si128(
-                      _mm_cmplt_epi8(input_a, minv),
-                      _mm_cmpgt_epi8(input_a, maxv)
-                  );
-            error = _mm_or_si128(error, tmp);
-
-            /***************************** block 2 ****************************/
-            const __m128i input_b = _mm_loadu_si128((const __m128i *)(data+16));
-
-            high_nibbles =
-                _mm_and_si128(_mm_srli_epi16(input_b, 4), _mm_set1_epi8(0x0F));
-
-            __m128i first_len_b = _mm_shuffle_epi8(first_len_tbl, high_nibbles);
-
-            __m128i range_b = _mm_shuffle_epi8(first_range_tbl, high_nibbles);
-
-            range_b = _mm_or_si128(
-                    range_b, _mm_alignr_epi8(first_len_b, first_len_a, 15));
-
-
-            tmp = _mm_alignr_epi8(first_len_b, first_len_a, 14);
-            tmp = _mm_subs_epu8(tmp, _mm_set1_epi8(1));
-            range_b = _mm_or_si128(range_b, tmp);
-
-            tmp = _mm_alignr_epi8(first_len_b, first_len_a, 13);
-            tmp = _mm_subs_epu8(tmp, _mm_set1_epi8(2));
-            range_b = _mm_or_si128(range_b, tmp);
-
-            shift1 = _mm_alignr_epi8(input_b, input_a, 15);
-            pos = _mm_sub_epi8(shift1, _mm_set1_epi8(0xEF));
-            tmp = _mm_subs_epu8(pos, _mm_set1_epi8(0xF0));
-            range2 = _mm_shuffle_epi8(df_ee_tbl, tmp);
-            tmp = _mm_adds_epu8(pos, _mm_set1_epi8(0x70));
-            range2 = _mm_add_epi8(range2, _mm_shuffle_epi8(ef_fe_tbl, tmp));
-
-            range_b = _mm_add_epi8(range_b, range2);
-
-            minv = _mm_shuffle_epi8(range_min_tbl, range_b);
-            maxv = _mm_shuffle_epi8(range_max_tbl, range_b);
-
-
-            tmp = _mm_or_si128(
-                      _mm_cmplt_epi8(input_b, minv),
-                      _mm_cmpgt_epi8(input_b, maxv)
-                  );
-            error = _mm_or_si128(error, tmp);
-
-            /************************ next iteration **************************/
-            prev_input = input_b;
-            prev_first_len = first_len_b;
-
-            data += 32;
-            len -= 32;
-        }
-
-        if (!_mm_testz_si128(error, error))
-            return -1;
-
-        int32_t token4 = _mm_extract_epi32(prev_input, 3);
-        const int8_t *token = (const int8_t *)&token4;
-        int lookahead = 0;
-        if (token[3] > (int8_t)0xBF)
-            lookahead = 1;
-        else if (token[2] > (int8_t)0xBF)
-            lookahead = 2;
-        else if (token[1] > (int8_t)0xBF)
-            lookahead = 3;
-
-        data -= lookahead;
-        len += lookahead;
-    }
-
-    return utf8_naive(data, len);
-}
-
-#endif