diff options
author | Jordan Rupprecht <[email protected]> | 2019-05-14 21:58:59 +0000 |
---|---|---|
committer | Jordan Rupprecht <[email protected]> | 2019-05-14 21:58:59 +0000 |
commit | b35a2aa71f76a334a9c98c0a3c3995b5d902d2b9 (patch) | |
tree | cdff4a5d1a715d4ad622fd8f190128b54bebe440 /test/ASTMerge/function | |
parent | 3748d41833787fcbf59cc5624e8d2b042a8991bc (diff) | |
parent | 741e05796da92b46d4f7bcbee00702ff37df6489 (diff) |
Creating branches/google/stable and tags/google/stable/2019-05-14 from r360103upstream/google/stable
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/google/stable@360714 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge/function')
-rw-r--r-- | test/ASTMerge/function/Inputs/function1.c | 6 | ||||
-rw-r--r-- | test/ASTMerge/function/Inputs/function2.c | 7 | ||||
-rw-r--r-- | test/ASTMerge/function/test.c | 15 |
3 files changed, 0 insertions, 28 deletions
diff --git a/test/ASTMerge/function/Inputs/function1.c b/test/ASTMerge/function/Inputs/function1.c deleted file mode 100644 index 4523bd3d79..0000000000 --- a/test/ASTMerge/function/Inputs/function1.c +++ /dev/null @@ -1,6 +0,0 @@ -void f0(int); -void f1(int, float); -void f2(); -void f3(void); -void f4(int, int); -int f5(int) __attribute__((const)); diff --git a/test/ASTMerge/function/Inputs/function2.c b/test/ASTMerge/function/Inputs/function2.c deleted file mode 100644 index 6ca810a6f2..0000000000 --- a/test/ASTMerge/function/Inputs/function2.c +++ /dev/null @@ -1,7 +0,0 @@ -typedef int Int; -void f0(Int); -void f1(Int, double); -void f2(int, int); -void f3(int); -static void f4(float, float); -int f5(int) __attribute__((const)); diff --git a/test/ASTMerge/function/test.c b/test/ASTMerge/function/test.c deleted file mode 100644 index 650f719d1f..0000000000 --- a/test/ASTMerge/function/test.c +++ /dev/null @@ -1,15 +0,0 @@ -// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/function1.c -// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/function2.c -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s - -// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') -// CHECK: function1.c:2:6: note: declared here with type 'void (int, float)' -// CHECK: function2.c:5:6: error: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') -// CHECK: function1.c:4:6: note: declared here with type 'void (void)' -// CHECK: 2 errors generated - -// expected-error@Inputs/function2.c:3 {{external function 'f1' declared with incompatible types}} -// expected-note@Inputs/function1.c:2 {{declared here}} -// expected-error@Inputs/function2.c:5 {{external function 'f3' declared with incompatible types}} -// expected-note@Inputs/function1.c:4 {{declared here}} |