[PATCH] D34261: [cfi] Enable icall tests with thinlto.

[Evgenii Stepanov via Phabricator via llvm-commits]

eugenis created this revision.
Herald added subscribers: inglorion, mehdi_amini.

this is the compiler-rt side of https://reviews.llvm.org/D34168


Repository:
  rL LLVM

https://reviews.llvm.org/D34261

Files:
  test/cfi/cross-dso/icall/lit.local.cfg
  test/cfi/cross-dso/stats.cpp
  test/cfi/icall/lit.local.cfg
  test/cfi/icall/wrong-signature-mixed-lto.c


Index: test/cfi/icall/wrong-signature-mixed-lto.c
===================================================================
--- /dev/null
+++ test/cfi/icall/wrong-signature-mixed-lto.c
@@ -0,0 +1,40 @@
+// Test that the checking is done with the actual type of f() even when the
+// calling module has an incorrect declaration. Test a mix of lto types.
+
+// RUN: %clang_cfi %s -DMODULE_A -c -o %t1_a.o
+// RUN: %clang_cfi %s -DMODULE_B -c -o %t1_b.o -flto
+// RUN: %clang_cfi %t1_a.o %t1_b.o -o %t1
+// RUN: %expect_crash %t1 2>&1 | FileCheck --check-prefix=CFI %s
+//
+// RUN: %clang_cfi %s -DMODULE_A -c -o %t2_a.o -flto
+// RUN: %clang_cfi %s -DMODULE_B -c -o %t2_b.o
+// RUN: %clang_cfi %t2_a.o %t2_b.o -o %t2
+// RUN: %expect_crash %t2 2>&1 | FileCheck --check-prefix=CFI %s
+//
+// RUN: %clang_cfi %s -DMODULE_A -c -o %t3_a.o
+// RUN: %clang_cfi %s -DMODULE_B -c -o %t3_b.o
+// RUN: %clang_cfi %t3_a.o %t3_b.o -o %t3
+// RUN: %expect_crash %t3 2>&1 | FileCheck --check-prefix=CFI %s
+//
+// REQUIRES: thinlto
+
+#include <stdio.h>
+
+#if defined(MODULE_B)
+int f() {
+  return 42;
+}
+#elif defined(MODULE_A)
+void f();
+
+int main() {
+  // CFI: 1
+  fprintf(stderr, "1\n");
+
+  void (*volatile p)() = &f;
+  p();
+
+  // CFI-NOT: 2
+  fprintf(stderr, "2\n");
+}
+#endif
Index: test/cfi/icall/lit.local.cfg
===================================================================
--- test/cfi/icall/lit.local.cfg
+++ test/cfi/icall/lit.local.cfg
@@ -1,6 +1,3 @@
 # The cfi-icall checker is only supported on x86 and x86_64 for now.
 if config.root.host_arch not in ['x86', 'x86_64']:
   config.unsupported = True
-
-if config.use_thinlto:
-  config.unsupported = True
Index: test/cfi/cross-dso/stats.cpp
===================================================================
--- test/cfi/cross-dso/stats.cpp
+++ test/cfi/cross-dso/stats.cpp
@@ -5,7 +5,6 @@
 
 // CFI-icall is not implemented in thinlto mode => ".cfi" suffixes are missing
 // in sanstats output.
-// XFAIL: thinlto
 
 struct ABase {};
 
Index: test/cfi/cross-dso/icall/lit.local.cfg
===================================================================
--- test/cfi/cross-dso/icall/lit.local.cfg
+++ test/cfi/cross-dso/icall/lit.local.cfg
@@ -1,6 +1,3 @@
 # The cfi-icall checker is only supported on x86 and x86_64 for now.
 if config.root.host_arch not in ['x86', 'x86_64']:
   config.unsupported = True
-
-if config.root.use_thinlto:
-  config.unsupported = True


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34261.102755.patch
Type: text/x-patch
Size: 2426 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170615/0ed66ee3/attachment.bin>