r229219 - Try to unbreak the Hexagon bot

[David Majnemer]

Author: majnemer
Date: Fri Feb 13 20:18:14 2015
New Revision: 229219

URL: http://llvm.org/viewvc/llvm-project?rev=229219&view=rev
Log:
Try to unbreak the Hexagon bot

Modified:
    cfe/trunk/lib/CodeGen/CGAtomic.cpp
    cfe/trunk/lib/CodeGen/CGExpr.cpp

Modified: cfe/trunk/lib/CodeGen/CGAtomic.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGAtomic.cpp?rev=229219&r1=229218&r2=229219&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGAtomic.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGAtomic.cpp Fri Feb 13 20:18:14 2015
@@ -976,7 +976,7 @@ RValue AtomicInfo::convertIntToValue(llv
     auto *ValTy = CGF.ConvertTypeForMem(ValueTy);
     if (ValTy->isIntegerTy()) {
       assert(IntVal->getType() == ValTy && "Different integer types.");
-      return RValue::get(IntVal);
+      return RValue::get(CGF.EmitFromMemory(IntVal, ValueTy));
     } else if (ValTy->isPointerTy())
       return RValue::get(CGF.Builder.CreateIntToPtr(IntVal, ValTy));
     else if (llvm::CastInst::isBitCastable(IntVal->getType(), ValTy))

Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=229219&r1=229218&r2=229219&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Fri Feb 13 20:18:14 2015
@@ -1144,7 +1144,7 @@ llvm::Value *CodeGenFunction::EmitLoadOf
     LValue lvalue = LValue::MakeAddr(Addr, Ty,
                                      CharUnits::fromQuantity(Alignment),
                                      getContext(), TBAAInfo);
-    return EmitFromMemory(EmitAtomicLoad(lvalue, Loc).getScalarVal(), Ty);
+    return EmitAtomicLoad(lvalue, Loc).getScalarVal();
   }
 
   llvm::LoadInst *Load = Builder.CreateLoad(Addr);