[PATCH v3 0/1] MR171: Initialize a pointer for MSVC.

[Stefan Dösinger]

MSVC is too stupid to see that line 3058 will not run unless n_variants
has been set together with variants in the switch statement below.

--
  v3: vkd3d-shader/hlsl: Make sure variants is initialized in declare_predefined_types().
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/171

[PATCH v3 1/1] vkd3d-shader/hlsl: Make sure variants is initialized in declare_predefined_types().

[Stefan Dösinger]

From: Stefan Dösinger <stefan(a)codeweavers.com>

MSVC is too stupid to see it is unused when n_variants=0.

---

Note that there is a similar "error" in io_normaliser_add_index_range().
I have a work in progress implementation of vkd3d_unreachable and
friends for MSVC that will take care of this. Sadly, it is on my other
laptop that I left behind in Tanzania.
---
 libs/vkd3d-shader/hlsl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 5bca84ba..bddb622d 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -3119,8 +3119,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
 
     for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt)
     {
-        unsigned int n_variants = 0;
-        const char *const *variants;
+        const char* const* variants;
+        unsigned int n_variants;
 
         switch (bt)
         {
@@ -3140,6 +3140,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
                 break;
 
             default:
+                n_variants = 0;
+                variants = NULL;
                 break;
         }
 
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/171

[PATCH v3 0/1] MR171: Initialize a pointer for MSVC. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/171

[Henri Verbeet (＠hverbeet)]

> ```diff
> -        const char *const *variants;
> +        const char* const* variants;
> ```

That doesn't look like an improvement.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/171#note_34065

[Stefan Dösinger]

On Tue May 30 08:02:43 2023 +0000, Henri Verbeet wrote:
> > ```diff
> > -        const char *const *variants;
> > +        const char* const* variants;
> > ```
>
> That doesn't look like an improvement.
> Doh, stupid visual studio autocorrect

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/171#note_34122