From 39b685e4d13c4c490019f1a10ecf7f9fde7a8f89 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.

llvm-svn: 170480
---
 clang/lib/CodeGen/CGExpr.cpp            |  2 +-
 clang/test/CodeGenCXX/bool-bitfield.cpp | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 clang/test/CodeGenCXX/bool-bitfield.cpp

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index a36d4ee..8440ede 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/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/clang/test/CodeGenCXX/bool-bitfield.cpp b/clang/test/CodeGenCXX/bool-bitfield.cpp
new file mode 100644
index 0000000..06bdf2b
--- /dev/null
+++ b/clang/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
-- 
2.7.4