Merge pull request #2707 from aschwaighofer/cherry-pick-varuns-win64-fix

shahmishal · web-flow · commit 3f79a31b107e · 2021-03-17T14:15:36.000-07:00
Cherry-pick to swift/main: Merge pull request #2692 from varungandhi-apple/vg-apple/stable
diff --git a/clang/lib/Basic/Targets/X86.h b/clang/lib/Basic/Targets/X86.h
@@ -788,10 +788,11 @@ class LLVM_LIBRARY_VISIBILITY WindowsX86_64TargetInfo
     case CC_PreserveAll:
     case CC_X86_64SysV:
     case CC_Swift:
-    case CC_SwiftAsync:
     case CC_X86RegCall:
     case CC_OpenCLKernel:
       return CCCR_OK;
+    case CC_SwiftAsync:
+      return CCCR_Error;
     default:
       return CCCR_Warning;
     }
diff --git a/clang/test/CodeGen/swift-call-conv.c b/clang/test/CodeGen/swift-call-conv.c
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -triple aarch64-unknown-windows-msvc -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -emit-llvm %s -o - | FileCheck %s
 
 // REQUIRES: aarch64-registered-target,arm-registered-target,x86-registered-target
 
diff --git a/clang/test/Sema/attr-swiftcall.c b/clang/test/Sema/attr-swiftcall.c
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -verify %s
-// RUN: %clang_cc1 -triple x86_64-unknown-windows -fsyntax-only -verify %s
 
 #define SWIFTCALL __attribute__((swiftcall))
 #define SWIFTASYNCCALL __attribute__((swiftasynccall))

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %clang_cc1 -triple aarch64-unknown-windows-msvc -emit-llvm %s -o - \| FileCheck %s`
`2`		`-// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -emit-llvm %s -o - \| FileCheck %s`
`3`	`2`
`4`	`3`	`// REQUIRES: aarch64-registered-target,arm-registered-target,x86-registered-target`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -verify %s`
`2`		`-// RUN: %clang_cc1 -triple x86_64-unknown-windows -fsyntax-only -verify %s`
`3`	`2`
`4`	`3`	`#define SWIFTCALL __attribute__((swiftcall))`
`5`	`4`	`#define SWIFTASYNCCALL __attribute__((swiftasynccall))`