diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2019-10-03 02:38:43 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2019-10-03 02:38:43 +0000 |
| commit | c10a6a0580e007991d1e3c7e6cb120c6289d1f7c (patch) | |
| tree | 9b1e2697324d6d333a5ee8f62a0437da33be28a0 /test/InterfaceStubs/conflict-type.ifs | |
| parent | 5a376e2cb9be9cdb0146b7d5e4598554455bfb53 (diff) | |
| download | clang-c10a6a0580e007991d1e3c7e6cb120c6289d1f7c.tar.gz | |
Revert 373538 and follow-ups 373549 and 373552.
They break tests on (at least) macOS.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@373556 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/InterfaceStubs/conflict-type.ifs')
| -rw-r--r-- | test/InterfaceStubs/conflict-type.ifs | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/test/InterfaceStubs/conflict-type.ifs b/test/InterfaceStubs/conflict-type.ifs deleted file mode 100644 index aaa04775e3..0000000000 --- a/test/InterfaceStubs/conflict-type.ifs +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: not %clang -emit-merged-ifs -emit-interface-stubs -o - %s %S/func.ifs 2>&1 | \ -# RUN: FileCheck %s --check-prefixes=CHECK-IFS - -# Here we are testing to see if two symbols with identical names will fail to -# merge in conflict due to mismatched types. -# CHECK-IFS: error: Interface Stub: Type Mismatch for a. -# CHECK-IFS-NEXT: Filename: -# CHECK-IFS-NEXT: Type Values: Object Func - ---- !experimental-ifs-v1 -IfsVersion: 1.0 -Triple: x86_64-linux-gnu -ObjectFileFormat: ELF -Symbols: - a: { Type: Object, Size: 1 } -... |