microsoft
/
cppwinrt
зеркало из https://github.com/microsoft/cppwinrt.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Address variable name collisions in generated consume methods (#1455) 

Why is this change being made?
Someone discovered a subtle compatibility issue with the cast result checking changes and certain projected methods. The variables in the consume_ method, such as the generically-named code variable, can shadow the parameters to the function. This led to a build break where a function took an int16_t named code and that was shadowed by the int32_t named code with the HRESULT in it. Fortunately the compiler had our back and flagged the size truncation as a build break so it was noticed.

Briefly summarize what changed
The variable names in these generated functions are now much uglier (and therefore less likely to collide by coincidence). They have an underscore prefix and then lowercase which should put them into an unofficial namespace that shouldn't collide with anything else. The code variable is now named _winrt_cast_result_code for example. While I was renaming everything I realized that my previous names mismatched the cppwinrt naming convention of snake_case so I fixed them up.
This commit is contained in:
David Machaj 2024-11-19 16:25:25 -08:00 коммит произвёл GitHub
Родитель 2aed347fb7
Коммит fa079fb34b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
1 изменённых файлов: 18 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
cppwinrt/code_writers.h
Просмотреть файл

@ -1137,15 +1137,15 @@ namespace cppwinrt
{%
if constexpr (!std::is_same_v<D, %>)
{
auto const [castedResult, code] = impl::try_as_with_reason<%, D const*>(static_cast<D const*>(this));
check_hresult(code);
auto const abiType = *(abi_t<%>**)&castedResult;
abiType->%(%);
auto const [_winrt_casted_result, _winrt_cast_result_code] = impl::try_as_with_reason<%, D const*>(static_cast<D const*>(this));
check_hresult(_winrt_cast_result_code);
auto const _winrt_abi_type = *(abi_t<%>**)&_winrt_casted_result;
_winrt_abi_type->%(%);
}
else
{
auto const abiType = *(abi_t<%>**)this;
abiType->%(%);
auto const _winrt_abi_type = *(abi_t<%>**)this;
_winrt_abi_type->%(%);
}%
}
)";
@ -1156,15 +1156,15 @@ namespace cppwinrt
{%
if constexpr (!std::is_same_v<D, %>)
{
auto const [castedResult, code] = impl::try_as_with_reason<%, D const*>(static_cast<D const*>(this));
check_hresult(code);
auto const abiType = *(abi_t<%>**)&castedResult;
WINRT_VERIFY_(0, abiType->%(%));
auto const [_winrt_casted_result, _winrt_cast_result_code] = impl::try_as_with_reason<%, D const*>(static_cast<D const*>(this));
check_hresult(_winrt_cast_result_code);
auto const _winrt_abi_type = *(abi_t<%>**)&_winrt_casted_result;
WINRT_VERIFY_(0, _winrt_abi_type->%(%));
}
else
{
auto const abiType = *(abi_t<%>**)this;
WINRT_VERIFY_(0, abiType->%(%));
auto const _winrt_abi_type = *(abi_t<%>**)this;
WINRT_VERIFY_(0, _winrt_abi_type->%(%));
}%
}
)";
@ -1176,15 +1176,15 @@ namespace cppwinrt
{%
if constexpr (!std::is_same_v<D, %>)
{
auto const [castedResult, code] = impl::try_as_with_reason<%, D const*>(static_cast<D const*>(this));
check_hresult(code);
auto const abiType = *(abi_t<%>**)&castedResult;
check_hresult(abiType->%(%));
auto const [_winrt_casted_result, _winrt_cast_result_code] = impl::try_as_with_reason<%, D const*>(static_cast<D const*>(this));
check_hresult(_winrt_cast_result_code);
auto const _winrt_abi_type = *(abi_t<%>**)&_winrt_casted_result;
check_hresult(_winrt_abi_type->%(%));
}
else
{
auto const abiType = *(abi_t<%>**)this;
check_hresult(abiType->%(%));
auto const _winrt_abi_type = *(abi_t<%>**)this;
check_hresult(_winrt_abi_type->%(%));
}%
}
)";