Last-minute fixes

Author: atrosinenko

clang/lib/Basic/Targets/AArch64.cpp

@@ -13,7 +13,6 @@
 #include "AArch64.h"
 #include "clang/Basic/DiagnosticDriver.h"
 #include "clang/Basic/LangOptions.h"
-#include "clang/Basic/PointerAuthOptions.h"
 #include "clang/Basic/TargetBuiltins.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/ADT/APSInt.h"

clang/test/CodeGen/ptrauth-cpu-feature.c

@@ -12,16 +12,17 @@
 // Test that the following options are still gated on -fptrauth-calls.
 // If they are not, in assertion builds they would fail at asm printing time:
 //
-// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-init-fini
-// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-function-pointer-type-discrimination
-// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-vtable-pointer-address-discrimination
-// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-vtable-pointer-type-discrimination
-// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-block-descriptor-pointers
+// RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-init-fini
+// RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-function-pointer-type-discrimination
+// RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-vtable-pointer-address-discrimination
+// RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-vtable-pointer-type-discrimination
+// RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-block-descriptor-pointers -fblocks -DBLOCKS
 
 // Test that v8.2-compatible code is generated, if possible:
 //
 // RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -msign-return-address=all 2>&1 | FileCheck %s --check-prefix=COMPAT
 // RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -mbranch-protection=pac-ret 2>&1 | FileCheck %s --check-prefix=COMPAT
+// RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -mbranch-protection=pac-ret+b-key 2>&1 | FileCheck %s --check-prefix=COMPAT
 
 // arm64e has ptrauth enabled and assumes modern enough CPU by default:
 //
@@ -35,15 +36,21 @@ int f(void) {
   return 0;
 }
 
+#ifdef BLOCKS
+int g(int (^bptr)(int)) {
+  return bptr(42);
+}
+#endif
+
 // FIXME At now, the error message is printed twice.
 // Ideally, this should be fixed, but it seems rather harmless.
 //
-// FAIL-2: error: A feature is requested that needs CPU with Pointer Authentication support
+// FAIL-COUNT-2: error: A feature is requested that needs CPU with Pointer Authentication support
 
 // COMPAT: f:
-// COMPAT:   hint #25
+// COMPAT:   hint {{#25|#27}}
 //
-// COMPAT:   hint #29
+// COMPAT:   hint {{#29|#31}}
 // COMPAT:   ret
 
 // PAUTH: f: