1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QString latin1 conversion and comparison for -optimize-size build

Browse Source 
Change-Id: I5f0ae946151e9733cbe21cb24387636ba68bc177
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Kirill Burtsev 2018-10-12 17:40:09 +02:00
parent 96218681f2
commit 57b09b903e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/tools/qstring.cpp
View File

@ -711,9 +711,15 @@ static void qt_to_latin1_internal(uchar *dst, const ushort *src, qsizetype lengt
} }
length = length % 4; length = length % 4;
# else
length = length % 16;
# endif // optimize size
// advance dst, src for tail processing
dst += offset; dst += offset;
src += offset; src += offset;
# if !defined(__OPTIMIZE_SIZE__)
return UnrollTailLoop<3>::exec(length, [=](int i) { return UnrollTailLoop<3>::exec(length, [=](int i) {
if (Checked) if (Checked)
dst[i] = (src[i]>0xff) ? '?' : (uchar) src[i]; dst[i] = (src[i]>0xff) ? '?' : (uchar) src[i];
@ -1072,11 +1078,13 @@ static int ucstrncmp(const QChar *a, const uchar *c, size_t l)
// still matched // still matched
offset += 4; offset += 4;
} }
# endif // optimize size
// reset uc and c // reset uc and c
uc += offset; uc += offset;
c += offset; c += offset;
# if !defined(__OPTIMIZE_SIZE__)
const auto lambda = [=](size_t i) { return uc[i] - ushort(c[i]); }; const auto lambda = [=](size_t i) { return uc[i] - ushort(c[i]); };
return UnrollTailLoop<MaxTailLength>::exec(e - uc, 0, lambda, lambda); return UnrollTailLoop<MaxTailLength>::exec(e - uc, 0, lambda, lambda);
# endif # endif