diff options
| author | Reid Kleckner <rnk@google.com> | 2019-05-14 18:51:07 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2019-05-14 18:51:07 +0000 |
| commit | 0333dd95636da52229ca14b4e5525c1cd8ba62d2 (patch) | |
| tree | 87ae14b4d0660169ac71541697a9b7338e105185 /clang/test/ASTMerge/property/test.m | |
| parent | 094584cd522b119444a05019189f2065ad1d215c (diff) | |
| download | bcm5719-llvm-0333dd95636da52229ca14b4e5525c1cd8ba62d2.tar.gz bcm5719-llvm-0333dd95636da52229ca14b4e5525c1cd8ba62d2.zip | |
Restore test files accidentally deleted in r354839
I think there must be a bug in git-llvm causing parent directories to be
deleted when the diff deletes files in a subdirectory. Perhaps it is
Windows-only.
There has been a behavior change, so some of these tests now fail. I
have marked them XFAIL and will fix them in a follow-up to separate the
changes.
llvm-svn: 360699
Diffstat (limited to 'clang/test/ASTMerge/property/test.m')
| -rw-r--r-- | clang/test/ASTMerge/property/test.m | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/clang/test/ASTMerge/property/test.m b/clang/test/ASTMerge/property/test.m new file mode 100644 index 00000000000..e48d54ed08b --- /dev/null +++ b/clang/test/ASTMerge/property/test.m @@ -0,0 +1,15 @@ +// FIXME: Errors are now warnings. +// XFAIL: * +// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/property1.m +// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/property2.m +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s + +// CHECK: property2.m:12:26: error: property 'Prop1' declared with incompatible types in different translation units ('int' vs. 'float') +// CHECK: property1.m:10:28: note: declared here with type 'float' +// CHECK: property2.m:12:26: error: instance method 'Prop1' has incompatible result types in different translation units ('int' vs. 'float') +// CHECK: property1.m:10:28: note: instance method 'Prop1' also declared here +// CHECK: property1.m:28:21: error: property 'Prop2' is synthesized to different ivars in different translation units ('ivar3' vs. 'ivar2') +// CHECK: property2.m:29:21: note: property is synthesized to ivar 'ivar2' here +// CHECK: property1.m:29:10: error: property 'Prop3' is implemented with @dynamic in one translation but @synthesize in another translation unit +// CHECK: property2.m:31:13: note: property 'Prop3' is implemented with @synthesize here +// CHECK: 4 errors generated. |
