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 | 0dbefa1b83eb90f7a06b5df5df254ce32be3db4b (patch) | |
| tree | 26bc57f6c70102cdd0762192f0c57b0954ef6e4d | |
| parent | 945ae62f2bd889baa3de373429472ffdda96d84d (diff) | |
| download | clang-release_37.tar.gz | |
Merge part of r246985, which disables this assertionrelease_37
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_37@253380 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 7 | ||||
| -rw-r--r-- | test/CodeGen/libcalls-fno-builtin.c | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 3e4d7f323d..0bcf59bb5c 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/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/test/CodeGen/libcalls-fno-builtin.c b/test/CodeGen/libcalls-fno-builtin.c index e7f3ef7b41..46e34202f2 100644 --- a/test/CodeGen/libcalls-fno-builtin.c +++ b/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; |