From: David Majnemer Date: Sat, 14 Feb 2015 02:18:14 +0000 (+0000) Subject: Try to unbreak the Hexagon bot X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2719b62497396733439bf8e24af371b94ab5c70;p=clang Try to unbreak the Hexagon bot git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@229219 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGAtomic.cpp b/lib/CodeGen/CGAtomic.cpp index a0b6073f6b..2af2264634 100644 --- a/lib/CodeGen/CGAtomic.cpp +++ b/lib/CodeGen/CGAtomic.cpp @@ -976,7 +976,7 @@ RValue AtomicInfo::convertIntToValue(llvm::Value *IntVal, 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)) diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index cf23e6dc9e..a7797c512e 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -1144,7 +1144,7 @@ llvm::Value *CodeGenFunction::EmitLoadOfScalar(llvm::Value *Addr, bool Volatile, 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);