diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-02-14 02:18:14 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-02-14 02:18:14 +0000 |
| commit | eeaec26534e2ea0c8d5470142ccb0ea1cd34cc4b (patch) | |
| tree | c2084ed59c86579ab6bb84b0699feba660ec4d3e /clang/lib/CodeGen/CGAtomic.cpp | |
| parent | 003bb7d96ea1fe1f7e4c4cc105818b5cb6b04db4 (diff) | |
| download | bcm5719-llvm-eeaec26534e2ea0c8d5470142ccb0ea1cd34cc4b.tar.gz bcm5719-llvm-eeaec26534e2ea0c8d5470142ccb0ea1cd34cc4b.zip | |
Try to unbreak the Hexagon bot
llvm-svn: 229219
Diffstat (limited to 'clang/lib/CodeGen/CGAtomic.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGAtomic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index a0b6073f6bf..2af2264634e 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/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)) |
