Skip to content

Commit

Permalink
Rollup merge of rust-lang#46928 - varkor:contrib-10, r=alexcrichton
Browse files Browse the repository at this point in the history
Correct the return type for `x86_mm256_sad_epu8`

Fixes rust-lang#43439.
  • Loading branch information
kennytm committed Dec 23, 2017
2 parents 271e291 + 20eece1 commit 7276221
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/etc/platform-intrinsics/x86/avx2.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"intrinsic": "256_sad_epu8",
"width": [256],
"llvm": "psad.bw",
"ret": "u8",
"ret": "u64",
"args": ["0", "0"]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_platform_intrinsics/x86.rs
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ pub fn find(name: &str) -> Option<Intrinsic> {
},
"_mm256_sad_epu8" => Intrinsic {
inputs: { static INPUTS: [&'static Type; 2] = [&::U8x32, &::U8x32]; &INPUTS },
output: &::U8x32,
output: &::U64x4,
definition: Named("llvm.x86.avx2.psad.bw")
},
"_mm256_shuffle_epi8" => Intrinsic {
Expand Down

0 comments on commit 7276221

Please sign in to comment.