diff options
| author | Reid Kleckner <rnk@google.com> | 2015-11-17 21:37:58 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2015-11-17 21:37:58 +0000 |
| commit | 3dee21055708cb3ce36d9c01e4b9889f4e31f0b5 (patch) | |
| tree | 2d851642e43f8d09a0a5afd850ad01fbea79390c | |
| parent | 77b5fd04db0db8dd02b7bfec3ccd224a50f4bbac (diff) | |
| download | llvm-3dee21055708cb3ce36d9c01e4b9889f4e31f0b5.tar.gz | |
Merge part of r246985, which disables this assertion
llvm-svn: 253380
| -rw-r--r-- | clang/lib/CodeGen/CGCall.cpp | 7 | ||||
| -rw-r--r-- | clang/test/CodeGen/libcalls-fno-builtin.c | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index 3e4d7f323d46..0bcf59bb5c3f 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -1279,12 +1279,7 @@ CodeGenTypes::GetFunctionType(const CGFunctionInfo &FI) { } break; - case ABIArgInfo::Indirect: { - assert(!retAI.getIndirectAlign() && "Align unused on indirect return."); - resultType = llvm::Type::getVoidTy(getLLVMContext()); - break; - } - + case ABIArgInfo::Indirect: case ABIArgInfo::Ignore: resultType = llvm::Type::getVoidTy(getLLVMContext()); break; diff --git a/clang/test/CodeGen/libcalls-fno-builtin.c b/clang/test/CodeGen/libcalls-fno-builtin.c index e7f3ef7b41d3..46e34202f28e 100644 --- a/clang/test/CodeGen/libcalls-fno-builtin.c +++ b/clang/test/CodeGen/libcalls-fno-builtin.c @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -S -O3 -fno-builtin -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-w64-mingw32 -S -O3 -fno-builtin -o - %s | FileCheck %s // rdar://10551066 typedef __SIZE_TYPE__ size_t; |