From e538d48957b10bfaac46bc6138b78cfcc28ee89e Mon Sep 17 00:00:00 2001
From: Eli Friedman <eli.friedman@gmail.com>
Date: Wed, 19 Dec 2012 00:26:58 +0000
Subject: [PATCH] Make sure CodeGen uses a value of the correct type as the
result of of assignment to a bool bitfield. PR14638.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170480 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/CGExpr.cpp | 2 +-
test/CodeGenCXX/bool-bitfield.cpp | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 test/CodeGenCXX/bool-bitfield.cpp
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index a36d4ee9f8d..8440eded839 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1401,7 +1401,7 @@ void CodeGenFunction::EmitStoreThroughBitfieldLValue(RValue Src, LValue Dst,
ResultVal = Builder.CreateIntCast(ResultVal, ResLTy, Info.IsSigned,
"bf.result.cast");
- *Result = ResultVal;
+ *Result = EmitFromMemory(ResultVal, Dst.getType());
}
}
diff --git a/test/CodeGenCXX/bool-bitfield.cpp b/test/CodeGenCXX/bool-bitfield.cpp
new file mode 100644
index 00000000000..06bdf2bd0df
--- /dev/null
+++ b/test/CodeGenCXX/bool-bitfield.cpp
@@ -0,0 +1,14 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -verify -emit-llvm -o - %s \
+// RUN: | FileCheck %s
+
+// PR14638; make sure this doesn't crash.
+struct A {
+ bool m_sorted : 1;
+};
+void func1(bool b, A& a1)
+{
+ if ((a1.m_sorted = b)) {}
+}
+// CHECK: define void @_Z5func1bR1A
+// CHECK: br i1
+// CHECK: ret void
--
GitLab