rpms/llvm
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-11-24 09:32:42 +00:00
Code Issues 5 Projects Releases Packages Wiki Activity Actions

Fix a crash bug when lowering unordered loads to cmpxchg (rhbz1797127)

Browse source
This commit is contained in:
Josh Stone 2020-02-01 13:28:02 -08:00
parent f2dd90f8af
commit a86ada8631
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
0001-AtomicExpand-Fix-a-crash-bug-when-lowering-unordered.patch Normal file
View file

@ -0,0 +1,28 @@
From 2153c4b8281c1e5f25887ef9183947198c50a9d2 Mon Sep 17 00:00:00 2001
From: Philip Reames <listmail@philipreames.com>
Date: Tue, 19 Mar 2019 17:20:49 +0000
Subject: [PATCH] [AtomicExpand] Fix a crash bug when lowering unordered loads
to cmpxchg
Add tests for wider atomic loads and stores. In the process, fix a crasher where we appearently handled unorder stores, but not loads, when lowering to cmpxchg idioms.
llvm-svn: 356482
---
lib/CodeGen/AtomicExpandPass.cpp | 3 +
test/CodeGen/X86/atomic-unordered.ll | 234 +++++++++++++++++++---
2 files changed, 213 insertions(+), 24 deletions(-)
diff --git a/lib/CodeGen/AtomicExpandPass.cpp b/lib/CodeGen/AtomicExpandPass.cpp
index 10dd21d1ef9d..7a8013abccfb 100644
--- a/lib/CodeGen/AtomicExpandPass.cpp
+++ b/lib/CodeGen/AtomicExpandPass.cpp
@@ -430,6 +430,9 @@ bool AtomicExpand::expandAtomicLoadToLL(LoadInst *LI) {
bool AtomicExpand::expandAtomicLoadToCmpXchg(LoadInst *LI) {
IRBuilder<> Builder(LI);
AtomicOrdering Order = LI->getOrdering();
+ if (Order == AtomicOrdering::Unordered)
+ Order = AtomicOrdering::Monotonic;
+
Value *Addr = LI->getPointerOperand();
Type *Ty = cast<PointerType>(Addr->getType())->getElementType();
Constant *DummyVal = Constant::getNullValue(Ty);

6
llvm.spec
View file

@ -40,7 +40,7 @@
Name: %{pkg_name} Name: %{pkg_name}
Version: %{maj_ver}.%{min_ver}.%{patch_ver} Version: %{maj_ver}.%{min_ver}.%{patch_ver}
Release: 6%{?rc_ver:.rc%{rc_ver}}%{?dist} Release: 7%{?rc_ver:.rc%{rc_ver}}%{?dist}
Summary: The Low Level Virtual Machine Summary: The Low Level Virtual Machine
License: NCSA License: NCSA
@ -52,6 +52,7 @@ Source2: lit.fedora.cfg.py
Patch5: 0001-PATCH-llvm-config.patch Patch5: 0001-PATCH-llvm-config.patch
Patch7: 0001-PATCH-Filter-out-cxxflags-not-supported-by-clang.patch Patch7: 0001-PATCH-Filter-out-cxxflags-not-supported-by-clang.patch
Patch8: 0001-Fix-the-buildbot-issue-introduced-by-r351421.patch Patch8: 0001-Fix-the-buildbot-issue-introduced-by-r351421.patch
Patch9: 0001-AtomicExpand-Fix-a-crash-bug-when-lowering-unordered.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -462,6 +463,9 @@ fi
%endif %endif
%changelog %changelog
* Sat Feb 01 2020 Josh Stone <jistone@redhat.com> - 8.0.0-7
- Fix a crash bug when lowering unordered loads to cmpxchg (rhbz1797127)
* Wed Apr 24 2019 Tom Stellard <tstellar@redhat.com> - 8.0.0-6 * Wed Apr 24 2019 Tom Stellard <tstellar@redhat.com> - 8.0.0-6
- Make sure we aren't passing -g on s390x - Make sure we aren't passing -g on s390x