Merged master:a2dc4ac86b8e into amd-gfx:b05be4847398

Local branch amd-gfx b05be48 Merged master:41083267a9d7 into amd-gfx:9e25124ce9ee Remote branch master a2dc4ac [VE][NFC] Update missing bulk update tests to use typed sret
jaebaek · Nov 21, 2020 · d91b2d4 · d91b2d4
2 parents b05be48 + a2dc4ac
commit d91b2d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/clang/test/Driver/darwin-sdk-version.c b/clang/test/Driver/darwin-sdk-version.c
@@ -30,8 +30,8 @@
 // RUN:   | FileCheck --check-prefixes=NO_VERSION,ERROR %s
 
 // CHECK: -target-sdk-version=10.14
-// INFER_SDK_VERSION: "-triple" "x86_64-apple-macosx10.10.0"
+// INFER_SDK_VERSION: "-triple" "{{arm64|x86_64}}-apple-macosx10.10.0"
 // INFER_SDK_VERSION-SAME: -target-sdk-version=10.10
-// INFER_DEPLOYMENT_TARGET_VERSION: "-triple" "x86_64-apple-macosx10.8.0"
+// INFER_DEPLOYMENT_TARGET_VERSION: "-triple" "{{arm64|x86_64}}-apple-macosx10.8.0"
 // NO_VERSION-NOT: target-sdk-version
 // ERROR: warning: SDK settings were ignored as 'SDKSettings.json' could not be parsed
diff --git a/clang/test/Sema/wchar.c b/clang/test/Sema/wchar.c
@@ -6,15 +6,22 @@ typedef __WCHAR_TYPE__ wchar_t;
 #if defined(_WIN32) || defined(_M_IX86) || defined(__CYGWIN__) \
  || defined(_M_X64) || defined(__ORBIS__) || defined(SHORT_WCHAR)
   #define WCHAR_T_TYPE unsigned short
-#elif defined(__arm) || defined(__aarch64__) || defined(__MVS__)
+#elif defined(__aarch64__)
+  // See AArch64TargetInfo constructor -- unsigned on non-darwin non-OpenBSD non-NetBSD.
+  #if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+    #define WCHAR_T_TYPE int
+  #else
+    #define WCHAR_T_TYPE unsigned int
+  #endif
+#elif defined(__arm) || defined(__MVS__)
   #define WCHAR_T_TYPE unsigned int
 #elif defined(__sun)
   #if defined(__LP64__)
     #define WCHAR_T_TYPE int
   #else
     #define WCHAR_T_TYPE long
   #endif
-#else /* Solaris. */
+#else /* Solaris, Linux, non-arm64 macOS, ... */
   #define WCHAR_T_TYPE int
 #endif
 

diff --git a/llvm/test/CodeGen/VE/Scalar/callstruct.ll b/llvm/test/CodeGen/VE/Scalar/callstruct.ll
@@ -43,4 +43,4 @@ define void @caller() {
   ret void
 }
 
-declare void @callee(%struct.a* sret, i32, i32)
+declare void @callee(%struct.a* sret(%struct.a), i32, i32)