diff options
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenCXX/bool-bitfield.cpp | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index a36d4ee9f8..8440eded83 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 0000000000..06bdf2bd0d --- /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 |