commit eeaec26534e2ea0c8d5470142ccb0ea1cd34cc4b
author David Majnemer <david.majnemer@gmail.com> Sat Feb 14 02:18:14 2015 +0000
committer David Majnemer <david.majnemer@gmail.com> Sat Feb 14 02:18:14 2015 +0000
tree c2084ed59c86579ab6bb84b0699feba660ec4d3e
parent 003bb7d96ea1fe1f7e4c4cc105818b5cb6b04db4

Try to unbreak the Hexagon bot

llvm-svn: 229219

clang/lib/CodeGen/CGExpr.cpp

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index cf23e6d..a7797c5 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1144,7 +1144,7 @@
     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);