[llvm-branch-commits] [cfe-branch] r253380 - Merge part of r246985, which disables this assertion

[Reid Kleckner via llvm-branch-commits]

Author: rnk
Date: Tue Nov 17 15:37:58 2015
New Revision: 253380

URL: http://llvm.org/viewvc/llvm-project?rev=253380&view=rev
Log:
Merge part of r246985, which disables this assertion

Modified:
    cfe/branches/release_37/lib/CodeGen/CGCall.cpp
    cfe/branches/release_37/test/CodeGen/libcalls-fno-builtin.c

Modified: cfe/branches/release_37/lib/CodeGen/CGCall.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/lib/CodeGen/CGCall.cpp?rev=253380&r1=253379&r2=253380&view=diff
==============================================================================
--- cfe/branches/release_37/lib/CodeGen/CGCall.cpp (original)
+++ cfe/branches/release_37/lib/CodeGen/CGCall.cpp Tue Nov 17 15:37:58 2015
@@ -1279,12 +1279,7 @@ CodeGenTypes::GetFunctionType(const CGFu
     }
     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;

Modified: cfe/branches/release_37/test/CodeGen/libcalls-fno-builtin.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/test/CodeGen/libcalls-fno-builtin.c?rev=253380&r1=253379&r2=253380&view=diff
==============================================================================
--- cfe/branches/release_37/test/CodeGen/libcalls-fno-builtin.c (original)
+++ cfe/branches/release_37/test/CodeGen/libcalls-fno-builtin.c Tue Nov 17 
15:37:58 2015
@@ -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;


_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits