From 00bf1bb789bfdb6f78c29297d5586bfa34c11235 Mon Sep 17 00:00:00 2001
From: Wei Mi <wmi@google.com>
Date: Fri, 8 Sep 2017 18:10:13 +0000
Subject: [PATCH] Revert rL312801 since it generated some calls from libatomic
and broke some tests.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@312805 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/CGAtomic.cpp | 16 ++++++++--------
test/CodeGenCXX/atomic-align.cpp | 30 ------------------------------
2 files changed, 8 insertions(+), 38 deletions(-)
diff --git a/lib/CodeGen/CGAtomic.cpp b/lib/CodeGen/CGAtomic.cpp
index a35d46aa127..d42740c0662 100644
--- a/lib/CodeGen/CGAtomic.cpp
+++ b/lib/CodeGen/CGAtomic.cpp
@@ -745,20 +745,20 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) {
QualType MemTy = AtomicTy;
if (const AtomicType *AT = AtomicTy->getAs<AtomicType>())
MemTy = AT->getValueType();
- llvm::Value *IsWeak = nullptr, *OrderFail = nullptr;
-
- Address Val1 = Address::invalid();
- Address Val2 = Address::invalid();
- Address Dest = Address::invalid();
- Address Ptr = EmitPointerWithAlignment(E->getPtr());
-
CharUnits sizeChars, alignChars;
std::tie(sizeChars, alignChars) = getContext().getTypeInfoInChars(AtomicTy);
uint64_t Size = sizeChars.getQuantity();
unsigned MaxInlineWidthInBits = getTarget().getMaxAtomicInlineWidth();
- bool UseLibcall = (sizeChars != Ptr.getAlignment() ||
+ bool UseLibcall = (sizeChars != alignChars ||
getContext().toBits(sizeChars) > MaxInlineWidthInBits);
+ llvm::Value *IsWeak = nullptr, *OrderFail = nullptr;
+
+ Address Val1 = Address::invalid();
+ Address Val2 = Address::invalid();
+ Address Dest = Address::invalid();
+ Address Ptr(EmitScalarExpr(E->getPtr()), alignChars);
+
if (E->getOp() == AtomicExpr::AO__c11_atomic_init ||
E->getOp() == AtomicExpr::AO__opencl_atomic_init) {
LValue lvalue = MakeAddrLValue(Ptr, AtomicTy);
diff --git a/test/CodeGenCXX/atomic-align.cpp b/test/CodeGenCXX/atomic-align.cpp
index 9852ac38a6c..e69de29bb2d 100644
--- a/test/CodeGenCXX/atomic-align.cpp
+++ b/test/CodeGenCXX/atomic-align.cpp
@@ -1,30 +0,0 @@
-// RUN: %clang_cc1 %s -std=c++11 -emit-llvm -o - -triple=x86_64-linux-gnu | FileCheck %s
-
-struct AM {
- int f1, f2;
-};
-alignas(8) AM m;
-AM load1() {
- AM am;
- // m is declared to align to 8bytes, so generate load atomic instead
- // of libcall.
- // CHECK-LABEL: @_Z5load1v
- // CHECK: load atomic {{.*}} monotonic
- __atomic_load(&m, &am, 0);
- return am;
-}
-
-struct BM {
- int f1;
- alignas(8) AM f2;
-};
-BM bm;
-AM load2() {
- AM am;
- // BM::f2 is declared to align to 8bytes, so generate load atomic instead
- // of libcall.
- // CHECK-LABEL: @_Z5load2v
- // CHECK: load atomic {{.*}} monotonic
- __atomic_load(&bm.f2, &am, 0);
- return am;
-}
--
GitLab