diff options
| author | Alexander Kornienko <alexfh@google.com> | 2015-01-20 10:55:33 +0000 |
|---|---|---|
| committer | Alexander Kornienko <alexfh@google.com> | 2015-01-20 10:55:33 +0000 |
| commit | 22c9d67e34eaac4c5232aa1fe8e8d30a508c8934 (patch) | |
| tree | 82c821f66f50c5169c92d16434b0c46279e3449d /clang/lib/AST/ASTContext.cpp | |
| parent | a8c4d48478a5fdf4a83210f0db1003cab951e641 (diff) | |
| download | bcm5719-llvm-22c9d67e34eaac4c5232aa1fe8e8d30a508c8934.tar.gz bcm5719-llvm-22c9d67e34eaac4c5232aa1fe8e8d30a508c8934.zip | |
Reverting r226548 as one of the tests fails in some configurations.
Here's the fail log from our internal setup:
===
.../tools/clang/clang -cc1 -internal-isystem .../tools/clang/staging/include -nostdsysteminc .../tools/clang/test/CodeGenOpenCL/spir-calling-conv.cl -triple spir-unknown-unknown -emit-llvm -o -
FileCheck .../tools/clang/test/CodeGenOpenCL/spir-calling-conv.cl
.../tools/clang/test/CodeGenOpenCL/spir-calling-conv.cl:11:12: error: expected string not found in input
// CHECK: %call = tail call spir_func i32 @get_dummy_id(i32 0)
^
<stdin>:6:52: note: scanning from here
define spir_kernel void @foo(i32 addrspace(1)* %A) #0 {
^
<stdin>:7:2: note: possible intended match here
%1 = tail call spir_func i32 @get_dummy_id(i32 0) #2
^
===
Here's a failure on a public CI server:
http://lab.llvm.org:8080/green/job/clang-stage2-configure-Rlto_check/1183/
llvm-svn: 226558
Diffstat (limited to 'clang/lib/AST/ASTContext.cpp')
| -rw-r--r-- | clang/lib/AST/ASTContext.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index c1bbc5f085f..7f17fe8b8cc 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -8043,9 +8043,7 @@ CallingConv ASTContext::getDefaultCallingConvention(bool IsVariadic, if (IsCXXMethod) return ABI->getDefaultMethodCallConv(IsVariadic); - if (LangOpts.MRTD && !IsVariadic) return CC_X86StdCall; - - return Target->getDefaultCallingConv(TargetInfo::CCMT_Unknown); + return (LangOpts.MRTD && !IsVariadic) ? CC_X86StdCall : CC_C; } bool ASTContext::isNearlyEmpty(const CXXRecordDecl *RD) const { |
