[llvm-branch-commits] [cfe-branch] r299405 - Merging r299347:

[Craig Topper via llvm-branch-commits]

Author: ctopper
Date: Mon Apr  3 19:31:22 2017
New Revision: 299405

URL: http://llvm.org/viewvc/llvm-project?rev=299405&view=rev
Log:
Merging r299347:
------------------------------------------------------------------------
r299347 | ctopper | 2017-04-02 20:51:57 -0700 (Sun, 02 Apr 2017) | 1 line

[AVX-512] Fix a couple more intrinsic macros I missed in r299346.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_40/   (props changed)
    cfe/branches/release_40/lib/Headers/avx512fintrin.h

Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  3 19:31:22 2017
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293604,293678,293787,294008,294800,294855,294954,295149-295150,295224,295313,295473-295474,295592,295610,295843,296063,296656,299346
+/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293604,293678,293787,294008,294800,294855,294954,295149-295150,295224,295313,295473-295474,295592,295610,295843,296063,296656,299346-299347
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_40/lib/Headers/avx512fintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Headers/avx512fintrin.h?rev=299405&r1=299404&r2=299405&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Headers/avx512fintrin.h (original)
+++ cfe/branches/release_40/lib/Headers/avx512fintrin.h Mon Apr  3 19:31:22 2017
@@ -7862,7 +7862,7 @@ _mm512_mask_cvtepi64_storeu_epi16 (void
 #define _mm512_mask_extracti32x4_epi32(W, U, A, imm) __extension__ ({ \
   (__m128i)__builtin_ia32_selectd_128((__mmask8)(U), \
                                 (__v4si)_mm512_extracti32x4_epi32((A), (imm)), \
-                                (__v4si)__W); })
+                                (__v4si)(W)); })
 
 #define _mm512_maskz_extracti32x4_epi32(U, A, imm) __extension__ ({ \
   (__m128i)__builtin_ia32_selectd_128((__mmask8)(U), \
@@ -7880,7 +7880,7 @@ _mm512_mask_cvtepi64_storeu_epi16 (void
 #define _mm512_mask_extracti64x4_epi64(W, U, A, imm) __extension__ ({ \
   (__m256i)__builtin_ia32_selectq_256((__mmask8)(U), \
                                 (__v4di)_mm512_extracti64x4_epi64((A), (imm)), \
-                                (__v4di)__W); })
+                                (__v4di)(W)); })
 
 #define _mm512_maskz_extracti64x4_epi64(U, A, imm) __extension__ ({ \
   (__m256i)__builtin_ia32_selectq_256((__mmask8)(U), \