[cfe-commits] r128605 - /cfe/trunk/lib/CodeGen/CGBuiltin.cpp

[Matt Beaumont-Gay]

Author: matthewbg
Date: Wed Mar 30 20:43:22 2011
New Revision: 128605

URL: http://llvm.org/viewvc/llvm-project?rev=128605&view=rev
Log:
Silence GCC warning about differing types on the branches of a conditional expression

Modified:
    cfe/trunk/lib/CodeGen/CGBuiltin.cpp

Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=128605&r1=128604&r2=128605&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Wed Mar 30 20:43:22 2011
@@ -1465,7 +1465,7 @@
                         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: {