aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGBuiltin.cpp
diff options
context:
space:
mode:
authorMatt Beaumont-Gay <matthewbg@google.com>2011-03-31 01:43:22 +0000
committerMatt Beaumont-Gay <matthewbg@google.com>2011-03-31 01:43:22 +0000
commitc362e741cb5664905af8c95ecefd098fb86fb048 (patch)
treeb63049a72452e47ffc784982fa9348687ffbcca2 /lib/CodeGen/CGBuiltin.cpp
parent3ed994bbdbb236842bab98da0c91e537b2b3b100 (diff)
Silence GCC warning about differing types on the branches of a conditional expression
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128605 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGBuiltin.cpp')
-rw-r--r--lib/CodeGen/CGBuiltin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index 8b72573ebc..040a117040 100644
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -1465,7 +1465,7 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID,
Ops, "vmul");
case ARM::BI__builtin_neon_vmull_v:
Int = usgn ? Intrinsic::arm_neon_vmullu : Intrinsic::arm_neon_vmulls;
- Int = poly ? Intrinsic::arm_neon_vmullp : Int;
+ Int = poly ? unsigned(Intrinsic::arm_neon_vmullp) : Int;
return EmitNeonCall(CGM.getIntrinsic(Int, &Ty, 1), Ops, "vmull");
case ARM::BI__builtin_neon_vpadal_v:
case ARM::BI__builtin_neon_vpadalq_v: {