Skip to content

C
core
Dal (branch)/etiket değiştir
  1. 18 Mar, 2019 1 kayıt (commit)
    • Stephan Bergmann's avatar
      Remove broken MergeDataHashMap optimization · dc2329fb
      Stephan Bergmann yazdı 
      ...which apparently didn't take into account that inserting into a
std::unordered_map may invalidate iterators, which now started to cause build
failures like

> [PRP] dictionaries/hu_HU/dialog/hu_HU_de
> warn:sal.osl:25175:25175:sal/osl/unx/thread.cxx:1026: RTL_TEXTENCODING_DONTKNOW -> _ASCII_US
> .../gcc/trunk/inst/include/c++/9.0.1/debug/safe_iterator.h:307:
> In function:
>     __gnu_debug::_Safe_iterator<_Iterator, _Sequence, _Category>::pointer
>     __gnu_debug::_Safe_iterator<_Iterator, _Sequence,
>     _Category>::operator->() const [with _Iterator =
>     std::__detail::_Node_iterator<std::pair<const rtl::OString,
>     std::unique_ptr<MergeData> >, false, true>; _Sequence =
>     std::__debug::unordered_map<rtl::OString, std::unique_ptr<MergeData> >;
>     _Category = std::forward_iterator_tag;
>     __gnu_debug::_Safe_iterator<_Iterator, _Sequence, _Category>::pointer =
>     std::pair<const rtl::OString, std::unique_ptr<MergeData> >*]
>
> Error: attempt to dereference a singular iterator.
>
> Objects involved in the operation:
>     iterator "this" @ 0x0x5a8228 {
>       type = std::__detail::_Node_iterator<std::pair<rtl::OString const, std::unique_ptr<MergeData, std::default_delete<MergeData> > >, false, true> (mutable iterator);
>       state = singular;
>       references sequence with type 'std::__debug::unordered_map<rtl::OString, std::unique_ptr<MergeData, std::default_delete<MergeData> >, std::hash<rtl::OString>, std::equal_to<rtl::OString>, std::allocator<std::pair<rtl::OString const, std::unique_ptr<MergeData, std::default_delete<MergeData> > > > >' @ 0x0x5a81c8
>     }
> /bin/sh: line 1: 25175 Aborted                 (core dumped) LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program" $W/LinkTarget/Executable/propex -i $S/dictionaries/hu_HU/dialog/hu_HU_en_US.properties -l de -m ${MERGEINPUT} -o $W/PropertiesTranslateTarget/dictionaries/hu_HU/dialog/hu_HU_de.properties
> make[1]: *** [.../solenv/gbuild/Dictionary.mk:88: .../workdir/PropertiesTranslateTarget/dictionaries/hu_HU/dialog/hu_HU_de.properties] Error 134

with trunk libstdc++ in debug mode.

Both classes MergeData and MergeDataHashMap became redundant.

Change-Id: I771548a6155e14037d84acfd74cd13566a26a8d7
Reviewed-on: https://gerrit.libreoffice.org/69395
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
      dc2329fb
  3. 28 Şub, 2019 1 kayıt (commit)
  5. 27 Şub, 2019 1 kayıt (commit)
  7. 23 Şub, 2019 1 kayıt (commit)
  9. 23 Kas, 2018 1 kayıt (commit)
  11. 17 Kas, 2018 1 kayıt (commit)
  13. 31 Eki, 2018 1 kayıt (commit)
  15. 08 Eki, 2018 1 kayıt (commit)
  17. 30 Eyl, 2018 1 kayıt (commit)
  19. 27 Tem, 2018 1 kayıt (commit)
  21. 26 Tem, 2018 1 kayıt (commit)
  23. 23 Tem, 2018 1 kayıt (commit)
  25. 29 Mar, 2018 1 kayıt (commit)
  27. 27 Mar, 2018 1 kayıt (commit)
  29. 09 Şub, 2018 1 kayıt (commit)
  31. 22 Ock, 2018 1 kayıt (commit)
  33. 11 Ock, 2018 1 kayıt (commit)
  35. 19 Ara, 2017 1 kayıt (commit)
  37. 01 Kas, 2017 1 kayıt (commit)
  39. 25 Eki, 2017 1 kayıt (commit)
  41. 23 Eki, 2017 2 kayıt (commit)
  43. 31 Agu, 2017 1 kayıt (commit)
  45. 08 Agu, 2017 1 kayıt (commit)
  47. 25 Tem, 2017 1 kayıt (commit)
  49. 24 Tem, 2017 1 kayıt (commit)
  51. 04 Tem, 2017 1 kayıt (commit)
  53. 02 Tem, 2017 1 kayıt (commit)
  55. 23 Haz, 2017 2 kayıt (commit)
  57. 25 Nis, 2017 1 kayıt (commit)
  59. 24 Nis, 2017 1 kayıt (commit)
  61. 25 Mar, 2017 1 kayıt (commit)
  63. 24 Ock, 2017 1 kayıt (commit)
  65. 17 Ock, 2017 1 kayıt (commit)
  67. 25 Kas, 2016 1 kayıt (commit)
  69. 17 Kas, 2016 1 kayıt (commit)
  71. 11 Kas, 2016 1 kayıt (commit)
  73. 08 Kas, 2016 1 kayıt (commit)
  75. 19 Eki, 2016 1 kayıt (commit)