intrapred_neon.c: Avoid UNINITIALIZED_IS_SAFE MSVC emits a warning in this case since the macro expands out to nothing. Thankfully in these cases silencing the warning is unnecessary anyway since we can simply fully-initialise the variable instead! Bug: aomedia:3507 Change-Id: Ib86daeec02cef5d3460a40664e6632ef461c75b1
diff --git a/aom_dsp/arm/intrapred_neon.c b/aom_dsp/arm/intrapred_neon.c index d3f73fc..880f7f6 100644 --- a/aom_dsp/arm/intrapred_neon.c +++ b/aom_dsp/arm/intrapred_neon.c
@@ -3174,12 +3174,10 @@ const uint8_t bottom_left = left_column[height - 1]; const uint8_t *const weights_y = smooth_weights + height - 4; - uint8x8_t UNINITIALIZED_IS_SAFE(top_v); - load_u8_4x1(top_row, &top_v, 0); + uint8x8_t top_v = load_u8_4x1_lane0(top_row); const uint8x8_t top_right_v = vdup_n_u8(top_right); const uint8x8_t bottom_left_v = vdup_n_u8(bottom_left); - uint8x8_t UNINITIALIZED_IS_SAFE(weights_x_v); - load_u8_4x1(smooth_weights, &weights_x_v, 0); + uint8x8_t weights_x_v = load_u8_4x1_lane0(smooth_weights); const uint8x8_t scaled_weights_x = negate_s8(weights_x_v); const uint16x8_t weighted_tr = vmull_u8(scaled_weights_x, top_right_v); @@ -3409,9 +3407,9 @@ const uint8_t bottom_left = left_column[height - 1]; \ const uint8_t *const weights_y = smooth_weights + height - 4; \ \ - uint8x8_t UNINITIALIZED_IS_SAFE(top_v); \ + uint8x8_t top_v; \ if ((W) == 4) { \ - load_u8_4x1(top_row, &top_v, 0); \ + top_v = load_u8_4x1_lane0(top_row); \ } else { /* width == 8 */ \ top_v = vld1_u8(top_row); \ } \ @@ -3723,9 +3721,9 @@ int width, int height) { const uint8x8_t top_left = vdup_n_u8(top_row[-1]); const uint16x8_t top_left_x2 = vdupq_n_u16(top_row[-1] + top_row[-1]); - uint8x8_t UNINITIALIZED_IS_SAFE(top); + uint8x8_t top; if (width == 4) { - load_u8_4x1(top_row, &top, 0); + top = load_u8_4x1_lane0(top_row); } else { // width == 8 top = vld1_u8(top_row); }