[all-commits] [llvm/llvm-project] ca6b34: [libcxx] [Windows] Store the lconv struct returned...

Martin Storsjö via All-commits all-commits at lists.llvm.org
Tue Feb 4 02:44:19 PST 2020

  Branch: refs/heads/release/10.x
  Home:   https://github.com/llvm/llvm-project
  Commit: ca6b341bd5d7159d9e398eef1a787b649c5bc888
  Author: Martin Storsjö <martin at martin.st>
  Date:   2020-02-04 (Tue, 04 Feb 2020)

  Changed paths:
    M libcxx/include/support/win32/locale_win32.h
    M libcxx/src/support/win32/locale_win32.cpp

  Log Message:
  [libcxx] [Windows] Store the lconv struct returned from localeconv in locale_t

This fixes using non-default locales, which currently can crash when
e.g. formatting numbers.

Within the localeconv_l function, the per-thread locale is temporarily
changed with __libcpp_locale_guard, then localeconv() is called,
returning an lconv * struct pointer.

When localeconv_l returns, the __libcpp_locale_guard dtor restores
the per-thread locale back to the original. This invalidates the
contents of the earlier returned lconv struct, and all C strings
that are pointed to within it are also invalidated.

Thus, to have an actually working localeconv_l function, the
function needs to allocate some sort of storage for the returned
contents, that stays valid for as long as the caller needs to use
the returned struct.

Extend the libcxx/win32 specific locale_t class with storage for
a deep copy of a lconv struct, and change localeconv_l to take
a reference to the locale_t, to allow it to store the returned
lconv struct there.

This works fine for libcxx itself, but wouldn't necessarily be right
for a caller that uses libcxx's localeconv_l function.

This fixes around 11 of libcxx's currently failing tests on windows.

Differential Revision: https://reviews.llvm.org/D69505

(cherry picked from commit 7db4f2c6945a24a7d81dad3362700353e2ec369e)

More information about the All-commits mailing list