diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-04-12 20:42:30 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-04-12 20:42:30 +0000 |
| commit | 47bfcca2d6972d98a1b25239cd1aa658b60680e2 (patch) | |
| tree | 8732be18cb85fff8187b0b9538150fe2db78320b /lib/CodeGen/CodeGenTypes.cpp | |
| parent | 83748e2f41ea0ac7c954946feb5da9ccc6ab8bec (diff) | |
Fix some i1/i8 confusion within _Atomic(bool) in IR generation, both
in general (such an atomic has boolean representation) and
specifically for IR generation of __c11_atomic_init. The latter also
means actually using initialization semantics for this initialization,
rather than just creating a store.
On a related note, make sure we actually put in non-atomic-to-atomic
conversions when performing an implicit conversion sequence. IR
generation is far too kind here, but we still want the ASTs to make
sense.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154612 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenTypes.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenTypes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp index b47da73c1d..41fd536b5c 100644 --- a/lib/CodeGen/CodeGenTypes.cpp +++ b/lib/CodeGen/CodeGenTypes.cpp @@ -556,7 +556,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) { } case Type::Atomic: { - ResultType = ConvertTypeForMem(cast<AtomicType>(Ty)->getValueType()); + ResultType = ConvertType(cast<AtomicType>(Ty)->getValueType()); break; } } |