diff --git a/clang/CodeGen/CGExpr.cpp b/clang/CodeGen/CGExpr.cpp
index 5908b7877696..23f465d7d990 100644
--- a/clang/CodeGen/CGExpr.cpp
+++ b/clang/CodeGen/CGExpr.cpp
@@ -246,9 +246,10 @@ ExprResult CodeGenFunction::EmitUnaryLNot(const UnaryOperator *E) {
 void CodeGenFunction::EmitUsualArithmeticConversions(const BinaryOperator *E,
                                                      ExprResult &LHS, 
                                                      ExprResult &RHS) {
-  // FIXME: implement right.
-  LHS = EmitExpr(E->getLHS());
-  RHS = EmitExpr(E->getRHS());
+  QualType LHSType, RHSType;
+  LHS = EmitExprWithUsualUnaryConversions(E->getLHS(), LHSType);
+  RHS = EmitExprWithUsualUnaryConversions(E->getRHS(), RHSType);
+
 }