dox4/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-11-09 08:42:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
ruby_4_0
ruby/ext/json/json.h
T
Jean BoussierandTakashi Kokubun 342caec27b Upgrade json gem to 1.8.2 
Merge of the following upstream commits:

commit 6d3266dc0edbbdb1dae513f4f3be16198c432af3
Author: Jean Boussier <[email protected]>
Date:   Mon Nov 2 15:51:58 2026 +0100

    Release 2.18.2

commit dcfbbcd36f240c18c3b89e5399105715f70162e3
Author: Jean Boussier <[email protected]>
Date:   Wed Mar 25 11:45:17 2026 +0100

    Fix handling of unescaped control characters preceeded by a backslash

    GHSA-cjpr-jw2g-fw99

commit 6ec6e7baff137e67831a23090061e84bf028dbfc
Author: Jean Boussier <[email protected]>
Date:   Tue Feb 3 08:35:11 2026 +0100

    Release 2.18.1

commit fff25c9f4b9c590a59ed4a2ec3c545121db844d3
Author: Jean Boussier <[email protected]>
Date:   Mon Feb 2 19:44:02 2026 +0100

    fbuffer_append_str: assume string

commit 79b6e168ba02f6ac7a0dac378968b1c918af91db
Author: Jean Boussier <[email protected]>
Date:   Mon Feb 2 22:06:44 2026 +0100

    Ensure `Generator::State` is kept on the stack

    Fix: https://github.com/ruby/json/issues/929

    When calling `cState_partial_generate` from `mHash_to_json` or other
    `to_json` funcs, `VState` becomes unreachable very quickly, hence the
    compiler may optimize it out of the stack, and make it invisible to
    the GC stack scanning. This is particularly liekly given how aggressively
    we inline.

    Repro:

    ```ruby
    require 'json'

    test_data = {
      "flag" => true,
      "data" => 10000.times.map { [1.0] },
      :flag => false,
    }

    10.times do
      test_data.to_json
    end
    ```

    But in practice the cause was just that the issued warning calls
    Hash#inspect on a big hash, which triggers GC.

    So it can be triggered even more reliably with:

    ```ruby
    require 'json'

    module JSON
      module Common
        def self.on_mixed_keys_hash(...)
          GC.start
        end
      end
    end

    test_data = {
      "flag" => true,
      "data" => 10000.times.map { [1.0] },
      :flag => false,
    }

    test_data.to_json
    ```

commit 062fcdd22818d226f0e4b49647eb2aabbfaf002b
Author: BurdetteLamar <[email protected]>
Date:   Thu Jan 22 22:08:15 2026 +0000

    Improve class JSON intro

commit 1b276c8623da0ff9bec62396d9a7172365bc1784
Author: Jean Boussier <[email protected]>
Date:   Fri Jan 16 18:43:08 2026 +0100

    Extract json_fast_memcpy16 for readability

commit 643ee11fed6898b7e6f75f266daa6e4b2a07bb07
Author: Scott Myron <[email protected]>
Date:   Thu Jan 15 19:12:41 2026 -0600

    Use __builtin_memcpy, if available, to copy overlapping byte ranges in copy_remaining_bytes to avoid a branch to MEMCPY. Additionally use a space as padding byte instead of an 'X' so it can be represented diretly on AArch64 with a single instruction.

commit 15eb40dbdfb299813bbbb72f70e12d1614b26200
Author: Nobuyoshi Nakada <[email protected]>
Date:   Wed Jan 14 21:28:37 2026 +0900

    Remove trailing spaces [ci skip]

commit 73818b80c8fe4394153002a60ecd285e8688b4cd
Author: Scott Myron <[email protected]>
Date:   Tue Jan 13 22:17:16 2026 -0600

    initialize search.chunk_end to silence a warning about it being potentially uninitialized

commit 86a5cce405102eca15d639e2dae2f539fb3e7c26
Author: Scott Myron <[email protected]>
Date:   Mon Jan 12 18:57:09 2026 -0600

    use a conditional to select SIMD implementation rather than pointer

commit a51317c94900ec5ea44ef0fd9327cca4d601bb5c
Author: Scott Myron <[email protected]>
Date:   Fri Jan 2 20:47:59 2026 -0600

    Directly write to the output buffer when converting UTF32 to UTF8.

commit 3e23e57568d29aa96f73d5f0c27b8c3676af4ee5
Merge: 976ba366 8ad744c5
Author: Nobuyoshi Nakada <[email protected]>
Date:   Wed Dec 31 21:43:48 2025 +0900

    Merge pull request #921 from nobu/nonportable-code

    Fix non-portable code

commit 8ad744c53269330cc827bf4ae213991ae11712ce
Author: Nobuyoshi Nakada <[email protected]>
Date:   Wed Dec 31 21:40:16 2025 +0900

    Fix non-portable code

    A plain `char` may be `signed` or `unsigned` depending on the
    implementation.  Also, bitwise ORing of `signed` values ​​is not
    guaranteed to be `signed`.  To ensure portability, should logical-OR
    each comparison, but casting to `signed char` is usually sufficient.

commit 976ba36629b2d20fa4de3da12ed405ab178deeba
Author: Scott Myron <[email protected]>
Date:   Tue Dec 30 21:32:03 2025 -0600

    Simplify unescape_unicode

    Co-Authored-By: Jean Boussier <[email protected]>

commit d21d9362fa36bd1b34c53e28b04ba6e91115a3be
Author: Scott Myron <[email protected]>
Date:   Tue Dec 30 20:48:18 2025 -0600

    Keep track of the the number of additional backslashes to avoid an extra memchr searching the remaining characters when no more backslashes exist.

commit a5c160f37285cab4406017990a6a02e82e283055
Author: Jean Boussier <[email protected]>
Date:   Mon Dec 22 09:16:09 2025 +0100

    Add missing documentation for `allow_control_characters` parsing option

commit 4808fee9affb801bc9bc63ea2d69d1cb28deda2a
Author: 久我山菜々 <[email protected]>
Date:   Fri Dec 19 01:30:37 2025 +0900

    Update `fpconv_dtoa` definition to use `dest[32]`

commit 5793694ee6632245f345e3b923af5ebfd7db68a9
Author: Étienne Barrié <[email protected]>
Date:   Thu Dec 11 16:12:35 2025 +0100

    Revert "Skip test failing with JRuby in CI"

    This reverts commit b7e1734d9ca090e95b1923b05536f5fb6f437060.
2026-11-02 10:05:05 -08:00

102 lines
2.0 KiB
C++
Raw Permalink Blame History

#ifndef _JSON_H_
#define _JSON_H_
#include "ruby.h"
#include "ruby/encoding.h"
#include <stdint.h>
#ifndef RBIMPL_ASSERT_OR_ASSUME
# define RBIMPL_ASSERT_OR_ASSUME(x)
#endif
#if defined(RUBY_DEBUG) && RUBY_DEBUG
# define JSON_ASSERT RUBY_ASSERT
#else
# ifdef JSON_DEBUG
# include <assert.h>
# define JSON_ASSERT(x) assert(x)
# else
# define JSON_ASSERT(x)
# endif
#endif
/* shims */
#if SIZEOF_UINT64_T == SIZEOF_LONG_LONG
# define INT64T2NUM(x) LL2NUM(x)
# define UINT64T2NUM(x) ULL2NUM(x)
#elif SIZEOF_UINT64_T == SIZEOF_LONG
# define INT64T2NUM(x) LONG2NUM(x)
# define UINT64T2NUM(x) ULONG2NUM(x)
#else
# error No uint64_t conversion
#endif
/* This is the fallback definition from Ruby 3.4 */
#ifndef RBIMPL_STDBOOL_H
#if defined(__cplusplus)
# if defined(HAVE_STDBOOL_H) && (__cplusplus >= 201103L)
# include <cstdbool>
# endif
#elif defined(HAVE_STDBOOL_H)
# include <stdbool.h>
#elif !defined(HAVE__BOOL)
typedef unsigned char _Bool;
# define bool _Bool
# define true ((_Bool)+1)
# define false ((_Bool)+0)
# define __bool_true_false_are_defined
#endif
#endif
#ifndef HAVE_RB_EXT_RACTOR_SAFE
# undef RUBY_TYPED_FROZEN_SHAREABLE
# define RUBY_TYPED_FROZEN_SHAREABLE 0
#endif
#ifndef NORETURN
#define NORETURN(x) x
#endif
#ifndef NOINLINE
#if defined(__has_attribute) && __has_attribute(noinline)
#define NOINLINE(x) __attribute__((noinline)) x
#else
#define NOINLINE(x) x
#endif
#endif
#ifndef ALWAYS_INLINE
#if defined(__has_attribute) && __has_attribute(always_inline)
#define ALWAYS_INLINE(x) inline __attribute__((always_inline)) x
#else
#define ALWAYS_INLINE(x) inline x
#endif
#endif
#ifndef RB_UNLIKELY
#define RB_UNLIKELY(expr) expr
#endif
#ifndef RB_LIKELY
#define RB_LIKELY(expr) expr
#endif
#ifndef MAYBE_UNUSED
# define MAYBE_UNUSED(x) x
#endif
#ifdef RUBY_DEBUG
#ifndef JSON_DEBUG
#define JSON_DEBUG RUBY_DEBUG
#endif
#endif
#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && INTPTR_MAX == INT64_MAX
#define JSON_CPU_LITTLE_ENDIAN_64BITS 1
#else
#define JSON_CPU_LITTLE_ENDIAN_64BITS 0
#endif
#endif // _JSON_H_
Reference in New Issue View Git Blame Copy Permalink