Jan 24, 2025 · Jul 6, 2024 · Dec 14, 2024 · Dec 14, 2024 · Dec 14, 2024 · Dec 14, 2024
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
        return NULL;
    }
    if (export_long.digits) {
        const PyLongLayout *layout = PyLong_GetNativeLayout();
        const uint8_t bpd = layout->bits_per_digit;
        const uint8_t sign = export_long.negative ? MPD_NEG :  MPD_POS;
        const Py_ssize_t len = export_long.ndigits;

        if (bpd == 30) {
            mpd_qimport_u32(MPD(dec), export_long.digits, len, sign,
                            1 << bpd, ctx, status);
        }
        else if (bpd == 15) {
            mpd_qimport_u16(MPD(dec), export_long.digits, len, sign,
                            1 << bpd, ctx, status);
        }
        else {
            PyLong_FreeExport(&export_long);
            Py_DECREF(dec);
            return NULL;
        }
 #if PYLONG_BITS_IN_DIGIT == 30
        mpd_qimport_u32(MPD(dec), export_long.digits, len, sign,
                        PyLong_BASE, ctx, status);
 #elif PYLONG_BITS_IN_DIGIT == 15
        mpd_qimport_u16(MPD(dec), export_long.digits, len, sign,
                        PyLong_BASE, ctx, status);
 #else
  #error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
 #endif
        PyLong_FreeExport(&export_long);
    }
    else {
    mpd_t *x;
    mpd_context_t workctx;
    uint32_t status = 0;
    const PyLongLayout *layout = PyLong_GetNativeLayout();

    if (mpd_isspecial(MPD(dec))) {
        if (mpd_isnan(MPD(dec))) {
        return PyLong_FromInt64(val);
    }

    const uint8_t bpd = layout->bits_per_digit;
    n = (mpd_sizeinbase(x, 2) + bpd - 1) / bpd;
    n = (mpd_sizeinbase(x, 2) + PyLong_SHIFT - 1)/PyLong_SHIFT;
    PyLongWriter *writer = PyLongWriter_Create(mpd_isnegative(x), n,
                                               (void**)&ob_digit);
    /* mpd_sizeinbase can overestimate size by 1 digit, set it to zero. */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2335,24 +2335,18 @@ dec_from_long(decimal_state state, PyTypeObject type, PyObject *v,
		return NULL;
		}
		if (export_long.digits) {
		const PyLongLayout *layout = PyLong_GetNativeLayout();
		const uint8_t bpd = layout->bits_per_digit;
		const uint8_t sign = export_long.negative ? MPD_NEG : MPD_POS;
skirpichev marked this conversation as resolved. Show resolvedHide resolved
		const Py_ssize_t len = export_long.ndigits;

		if (bpd == 30) {
		mpd_qimport_u32(MPD(dec), export_long.digits, len, sign,
		1 << bpd, ctx, status);
		}
		else if (bpd == 15) {
		mpd_qimport_u16(MPD(dec), export_long.digits, len, sign,
		1 << bpd, ctx, status);
		}
		else {
		PyLong_FreeExport(&export_long);
		Py_DECREF(dec);
		return NULL;
		}
		#if PYLONG_BITS_IN_DIGIT == 30
		mpd_qimport_u32(MPD(dec), export_long.digits, len, sign,
		PyLong_BASE, ctx, status);
		#elif PYLONG_BITS_IN_DIGIT == 15
		mpd_qimport_u16(MPD(dec), export_long.digits, len, sign,
		PyLong_BASE, ctx, status);
		#else
		#error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
		#endif
		PyLong_FreeExport(&export_long);
		}
		else {
Expand DownExpand Up		@@ -3648,7 +3642,6 @@ dec_as_long(PyObject dec, PyObject context, int round)
		mpd_t *x;
		mpd_context_t workctx;
		uint32_t status = 0;
		const PyLongLayout *layout = PyLong_GetNativeLayout();

		if (mpd_isspecial(MPD(dec))) {
		if (mpd_isnan(MPD(dec))) {
Expand DownExpand Up		@@ -3683,8 +3676,7 @@ dec_as_long(PyObject dec, PyObject context, int round)
		return PyLong_FromInt64(val);
		}

		const uint8_t bpd = layout->bits_per_digit;
		n = (mpd_sizeinbase(x, 2) + bpd - 1) / bpd;
		n = (mpd_sizeinbase(x, 2) + PyLong_SHIFT - 1)/PyLong_SHIFT;
		PyLongWriter *writer = PyLongWriter_Create(mpd_isnegative(x), n,
		(void**)&ob_digit);
		/* mpd_sizeinbase can overestimate size by 1 digit, set it to zero. */
Copy link ContributorAuthor skirpichevDec 14, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. BTW, this looks as a bug in the mpdecimal. C.f. the GNU GMP, the mpz_sizeinbase docs says: "If base is a power of 2, the result is always exact".
Expand Down