diff options
Diffstat (limited to 'clang/test/ASTMerge/Inputs')
38 files changed, 0 insertions, 990 deletions
diff --git a/clang/test/ASTMerge/Inputs/anonymous-fields1.cpp b/clang/test/ASTMerge/Inputs/anonymous-fields1.cpp deleted file mode 100644 index 829bc0edd30..00000000000 --- a/clang/test/ASTMerge/Inputs/anonymous-fields1.cpp +++ /dev/null @@ -1,5 +0,0 @@ -class A { -public: - struct { int foo; } f; - struct { int foo; } g; -}; diff --git a/clang/test/ASTMerge/Inputs/anonymous-fields2.cpp b/clang/test/ASTMerge/Inputs/anonymous-fields2.cpp deleted file mode 100644 index 28ea46d9871..00000000000 --- a/clang/test/ASTMerge/Inputs/anonymous-fields2.cpp +++ /dev/null @@ -1,9 +0,0 @@ -class A { -public: - struct { int foo; } f; - struct { int foo; } g; -}; - -inline int useA(A &a) { - return (a.f.foo + a.g.foo); -} diff --git a/clang/test/ASTMerge/Inputs/asm-function.cpp b/clang/test/ASTMerge/Inputs/asm-function.cpp deleted file mode 100644 index 59c4edfbcd2..00000000000 --- a/clang/test/ASTMerge/Inputs/asm-function.cpp +++ /dev/null @@ -1,11 +0,0 @@ - -unsigned char asmFunc(unsigned char a, unsigned char b) { - unsigned int la = a; - unsigned int lb = b; - unsigned int bigres; - unsigned char res; - __asm__ ("0:\n1:\n" : [bigres] "=la"(bigres) : [la] "0"(la), [lb] "c"(lb) : - "edx", "cc"); - res = bigres; - return res; -} diff --git a/clang/test/ASTMerge/Inputs/body1.c b/clang/test/ASTMerge/Inputs/body1.c deleted file mode 100644 index d4d1e4b9378..00000000000 --- a/clang/test/ASTMerge/Inputs/body1.c +++ /dev/null @@ -1,6 +0,0 @@ -int f(); - -int main() -{ - return f(); -} diff --git a/clang/test/ASTMerge/Inputs/body2.c b/clang/test/ASTMerge/Inputs/body2.c deleted file mode 100644 index 73cb1edf991..00000000000 --- a/clang/test/ASTMerge/Inputs/body2.c +++ /dev/null @@ -1,4 +0,0 @@ -__inline__ __attribute__ ((always_inline)) int f() -{ - return 2; -} diff --git a/clang/test/ASTMerge/Inputs/category1.m b/clang/test/ASTMerge/Inputs/category1.m deleted file mode 100644 index afcaab81f2b..00000000000 --- a/clang/test/ASTMerge/Inputs/category1.m +++ /dev/null @@ -1,48 +0,0 @@ -@interface I1 -@end - -// Matching category -@interface I1 (Cat1) -- (int)method0; -@end - -// Matching class extension -@interface I1 () -- (int)method1; -@end - -// Mismatched category -@interface I1 (Cat2) -- (int)method2; -@end - -@interface I2 -@end - -// Mismatched class extension -@interface I2 () -- (int)method3; -@end - -// Category with implementation -@interface I2 (Cat3) -@end - -@implementation I2 (Cat3) -@end - -// Category with implementation -@interface I2 (Cat4) -@end - -@implementation I2 (Cat4) -@end - -// Category with mismatched implementation -@interface I2 (Cat6) -@end - -@implementation I2 (Cat6) -- (float)blah { return 0; } -@end - diff --git a/clang/test/ASTMerge/Inputs/category2.m b/clang/test/ASTMerge/Inputs/category2.m deleted file mode 100644 index 49a3c270a1c..00000000000 --- a/clang/test/ASTMerge/Inputs/category2.m +++ /dev/null @@ -1,49 +0,0 @@ -typedef int Int; - -@interface I1 -@end - -// Matching category -@interface I1 (Cat1) -- (Int)method0; -@end - -// Matching class extension -@interface I1 () -- (Int)method1; -@end - -// Mismatched category -@interface I1 (Cat2) -- (float)method2; -@end - -@interface I2 -@end - -// Mismatched class extension -@interface I2 () -- (float)method3; -@end - -// Category with implementation -@interface I2 (Cat3) -@end - -@implementation I2 (Cat3) -@end - -// Category with implementation -@interface I2 (Cat5) -@end - -@implementation I2 (Cat5) -@end - -// Category with mismatched implementation -@interface I2 (Cat6) -@end - -@implementation I2 (Cat6) -- (int)blah { return 0; } -@end diff --git a/clang/test/ASTMerge/Inputs/class-template1.cpp b/clang/test/ASTMerge/Inputs/class-template1.cpp deleted file mode 100644 index 440b5abfc86..00000000000 --- a/clang/test/ASTMerge/Inputs/class-template1.cpp +++ /dev/null @@ -1,34 +0,0 @@ -template<typename T> -struct X0; - -template<int I> -struct X1; - -template<int I> -struct X2; - -template<int I> -struct X3; - -template<template<int I> class> -struct X4; - -template<template<long> class> -struct X5; - -template<typename> -struct X6; - -extern X0<int> *x0i; -extern X0<long> *x0l; -extern X0<float> *x0r; - -template<> -struct X0<char> { - int member; -}; - -template<> -struct X0<wchar_t> { - int member; -}; diff --git a/clang/test/ASTMerge/Inputs/class-template2.cpp b/clang/test/ASTMerge/Inputs/class-template2.cpp deleted file mode 100644 index 6300301a4ff..00000000000 --- a/clang/test/ASTMerge/Inputs/class-template2.cpp +++ /dev/null @@ -1,35 +0,0 @@ -template<class T> -struct X0; - -template<int I> -struct X1; - -template<long I> -struct X2; - -template<typename> -struct X3; - -template<template<int I> class> -struct X4; - -template<template<int I> class> -struct X5; - -template<template<int I> class> -struct X6; - -typedef int Integer; -extern X0<Integer> *x0i; -extern X0<float> *x0f; -extern X0<double> *x0r; - -template<> -struct X0<char> { - int member; -}; - -template<> -struct X0<wchar_t> { - float member; -}; diff --git a/clang/test/ASTMerge/Inputs/class1.cpp b/clang/test/ASTMerge/Inputs/class1.cpp deleted file mode 100644 index b0a7645cfe6..00000000000 --- a/clang/test/ASTMerge/Inputs/class1.cpp +++ /dev/null @@ -1,20 +0,0 @@ -struct A { - public: - int x; -}; - -struct B : A { - float y; - float foo(); -}; - -struct C { - C(int i = 10); - C(const C&); - C &operator=(C&); - ~C(); -}; - -enum E { - b = 1 -}; diff --git a/clang/test/ASTMerge/Inputs/class2.cpp b/clang/test/ASTMerge/Inputs/class2.cpp deleted file mode 100644 index 2bed6d775bc..00000000000 --- a/clang/test/ASTMerge/Inputs/class2.cpp +++ /dev/null @@ -1,14 +0,0 @@ -struct A { - public: - int x; -}; - -struct B : A { - int y; - int foo(); -}; - -enum E { - a = 0, - b = 1 -}; diff --git a/clang/test/ASTMerge/Inputs/class3.cpp b/clang/test/ASTMerge/Inputs/class3.cpp deleted file mode 100644 index 428acc3f031..00000000000 --- a/clang/test/ASTMerge/Inputs/class3.cpp +++ /dev/null @@ -1,26 +0,0 @@ -class C1 { -public: - C1(); - ~C1(); - C1 *method_1() { - return this; - } - C1 method_2() { - return C1(); - } - void method_3() { - const C1 &ref = C1(); - } -}; - -class C11 : public C1 { -}; - -class C2 { -private: - int x; - friend class C3; -public: - static_assert(sizeof(x) == sizeof(int), "Error"); - typedef class C2::C2 InjType; -}; diff --git a/clang/test/ASTMerge/Inputs/enum1.c b/clang/test/ASTMerge/Inputs/enum1.c deleted file mode 100644 index f2b9c5c98fd..00000000000 --- a/clang/test/ASTMerge/Inputs/enum1.c +++ /dev/null @@ -1,42 +0,0 @@ -// Matching -enum E1 { - E1Enumerator1, - E1Enumerator2 = 3, - E1Enumerator3 -} x1; - -// Value mismatch -enum E2 { - E2Enumerator1, - E2Enumerator2 = 3, - E2Enumerator3 -} x2; - -// Name mismatch -enum E3 { - E3Enumerator1, - E3Enumerator2 = 3, - E3Enumerator3 -} x3; - -// Missing enumerator -enum E4 { - E4Enumerator1, - E4Enumerator2, - E4Enumerator3 -} x4; - -// Extra enumerator -enum E5 { - E5Enumerator1, - E5Enumerator2, - E5Enumerator3 -} x5; - -// Matching, with typedef -typedef enum { - E6Enumerator1, - E6Enumerator2 -} E6; - -E6 x6; diff --git a/clang/test/ASTMerge/Inputs/enum2.c b/clang/test/ASTMerge/Inputs/enum2.c deleted file mode 100644 index 315b4dcb6ef..00000000000 --- a/clang/test/ASTMerge/Inputs/enum2.c +++ /dev/null @@ -1,42 +0,0 @@ -// Matching -enum E1 { - E1Enumerator1, - E1Enumerator2 = 3, - E1Enumerator3 -} x1; - -// Value mismatch -enum E2 { - E2Enumerator1, - E2Enumerator2 = 4, - E2Enumerator3 -} x2; - -// Name mismatch -enum E3 { - E3Enumerator1, - E3Enumerator = 3, - E3Enumerator3 -} x3; - -// Missing enumerator -enum E4 { - E4Enumerator1, - E4Enumerator2 -} x4; - -// Extra enumerator -enum E5 { - E5Enumerator1, - E5Enumerator2, - E5Enumerator3, - E5Enumerator4 -} x5; - -// Matching, with typedef -typedef enum { - E6Enumerator1, - E6Enumerator2 -} E6; - -E6 x6; diff --git a/clang/test/ASTMerge/Inputs/exprs1.c b/clang/test/ASTMerge/Inputs/exprs1.c deleted file mode 100644 index 1c268da15f3..00000000000 --- a/clang/test/ASTMerge/Inputs/exprs1.c +++ /dev/null @@ -1,10 +0,0 @@ -// Matching -enum E0 { - E0_Val0 = 'a', - E0_Val1 = (17), - E0_Val2 = (1 << 2), - E0_Val3 = E0_Val2, - E0_Val4 = sizeof(int*), - E0_Val5 = (unsigned int)-1 -}; - diff --git a/clang/test/ASTMerge/Inputs/exprs2.c b/clang/test/ASTMerge/Inputs/exprs2.c deleted file mode 100644 index 1c268da15f3..00000000000 --- a/clang/test/ASTMerge/Inputs/exprs2.c +++ /dev/null @@ -1,10 +0,0 @@ -// Matching -enum E0 { - E0_Val0 = 'a', - E0_Val1 = (17), - E0_Val2 = (1 << 2), - E0_Val3 = E0_Val2, - E0_Val4 = sizeof(int*), - E0_Val5 = (unsigned int)-1 -}; - diff --git a/clang/test/ASTMerge/Inputs/exprs3.cpp b/clang/test/ASTMerge/Inputs/exprs3.cpp deleted file mode 100644 index 7ed8e338452..00000000000 --- a/clang/test/ASTMerge/Inputs/exprs3.cpp +++ /dev/null @@ -1,120 +0,0 @@ -// Integer literals -const char Ch1 = 'a'; -const signed char Ch2 = 'b'; -const unsigned char Ch3 = 'c'; - -const wchar_t Ch4 = L'd'; -const signed wchar_t Ch5 = L'e'; -const unsigned wchar_t Ch6 = L'f'; - -const short C1 = 12; -const unsigned short C2 = 13; - -const int C3 = 12; -const unsigned int C4 = 13; - -const long C5 = 22; -const unsigned long C6 = 23; - -const long long C7 = 66; -const unsigned long long C8 = 67; - - -// String literals -const char str1[] = "ABCD"; -const char str2[] = "ABCD" "0123"; - -const wchar_t wstr1[] = L"DEF"; -const wchar_t wstr2[] = L"DEF" L"123"; - - -// Boolean literals -const bool bval1 = true; -const bool bval2 = false; - -// Floating Literals -const float F1 = 12.2F; -const double F2 = 1E4; -const long double F3 = 1.2E-3L; - - -// nullptr literal -const void *vptr = nullptr; - - -int glb_1[4] = { 10, 20, 30, 40 }; - -struct S1 { - int a; - int b[3]; -}; - -struct S2 { - int c; - S1 d; -}; - -S2 glb_2 = { 22, .d.a = 44, .d.b[0] = 55, .d.b[1] = 66 }; - -void testNewThrowDelete() { - throw; - char *p = new char[10]; - delete[] p; -} - -int testArrayElement(int *x, int n) { - return x[n]; -} - -int testTernaryOp(int c, int x, int y) { - return c ? x : y; -} - -S1 &testConstCast(const S1 &x) { - return const_cast<S1&>(x); -} - -S1 &testStaticCast(S1 &x) { - return static_cast<S1&>(x); -} - -S1 &testReinterpretCast(S1 &x) { - return reinterpret_cast<S1&>(x); -} - -S1 &testDynamicCast(S1 &x) { - return dynamic_cast<S1&>(x); -} - -int testScalarInit(int x) { - return int(x); -} - -struct S { - float f; - double d; -}; -struct T { - int i; - struct S s[10]; -}; - -void testOffsetOf() { - __builtin_offsetof(struct T, s[2].d); -} - - -int testDefaultArg(int a = 2*2) { - return a; -} - -template <typename T> // T has TemplateTypeParmType -void testTemplateTypeParmType(int i); - -void useTemplateType() { - testTemplateTypeParmType<char>(4); -} - -const bool ExpressionTrait = __is_lvalue_expr(1); -const unsigned ArrayRank = __array_rank(int[10][20]); -const unsigned ArrayExtent = __array_extent(int[10][20], 1); diff --git a/clang/test/ASTMerge/Inputs/function1.c b/clang/test/ASTMerge/Inputs/function1.c deleted file mode 100644 index 4523bd3d79b..00000000000 --- a/clang/test/ASTMerge/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/clang/test/ASTMerge/Inputs/function2.c b/clang/test/ASTMerge/Inputs/function2.c deleted file mode 100644 index 6ca810a6f20..00000000000 --- a/clang/test/ASTMerge/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/clang/test/ASTMerge/Inputs/inheritance-base.cpp b/clang/test/ASTMerge/Inputs/inheritance-base.cpp deleted file mode 100644 index 26fe42eb64d..00000000000 --- a/clang/test/ASTMerge/Inputs/inheritance-base.cpp +++ /dev/null @@ -1,7 +0,0 @@ -class A -{ -public: - int x; - A(int _x) : x(_x) { - } -}; diff --git a/clang/test/ASTMerge/Inputs/init-ctors-classes.cpp b/clang/test/ASTMerge/Inputs/init-ctors-classes.cpp deleted file mode 100644 index fd51f860634..00000000000 --- a/clang/test/ASTMerge/Inputs/init-ctors-classes.cpp +++ /dev/null @@ -1,19 +0,0 @@ -class A_base -{ -public: - int x; - A_base() : x(0) { - } - A_base(int _x) : x(static_cast<int>(_x)) { - } -}; - -class A : public A_base -{ -public: - int y; - struct { int z; }; - int array[2]; - A(int _x) : A_base(_x), y(0), z(1), array{{2},{3}} { - } -}; diff --git a/clang/test/ASTMerge/Inputs/interface1.m b/clang/test/ASTMerge/Inputs/interface1.m deleted file mode 100644 index 5865c0eff07..00000000000 --- a/clang/test/ASTMerge/Inputs/interface1.m +++ /dev/null @@ -1,103 +0,0 @@ -// Matches -@interface I1 { - int ivar1; -} -@end - -// Matches -@interface I2 : I1 { - float ivar2; -} -@end - -// Ivar mismatch -@interface I3 { - int ivar1; - int ivar2; -} -@end - -// Superclass mismatch -@interface I4 : I2 { -} -@end - -// Methods match -@interface I5 -- (int)foo; -+ (float)bar; -@end - -// Method mismatch -@interface I6 -- (int)foo; -+ (int)foo; -@end - -// Method mismatch -@interface I7 -- (int)foo; -+ (int)bar:(int)x; -@end - -// Method mismatch -@interface I8 -- (int)foo; -+ (int)bar:(float)x; -@end - -// Matching protocol -@protocol P0 -+ (int)foo; -- (int)bar:(float)x; -@end - -// Protocol with mismatching method -@protocol P1 -+ (int)foo; -- (int)bar:(float)x; -@end - -// Interface with protocol -@interface I9 <P0> -+ (int)foo; -- (int)bar:(float)x; -@end - -// Protocol with protocol -@protocol P2 <P0> -- (float)wibble:(int)a1 second:(int)a2; -@end - -// Forward-declared interfaces -@class I10, I11; -@interface I12 -@end - -// Forward-declared protocols -@protocol P3, P5; -@protocol P4 -- (double)honk:(int)a; -@end - -// Interface with implementation -@interface I13 -@end - -@implementation I13 -@end - -@interface I13a -@end - -@implementation I13a -@end - -// Implementation by itself -@implementation I14 : I12 -@end - -@implementation I15 : I12 -@end - - diff --git a/clang/test/ASTMerge/Inputs/interface2.m b/clang/test/ASTMerge/Inputs/interface2.m deleted file mode 100644 index 2133bd1381a..00000000000 --- a/clang/test/ASTMerge/Inputs/interface2.m +++ /dev/null @@ -1,100 +0,0 @@ -// Matches -@interface I1 { - int ivar1; -} -@end - -// Matches -@interface I2 : I1 { - float ivar2; -} -@end - -// Ivar mismatch -@interface I3 { - int ivar1; - float ivar2; -} -@end - -// Superclass mismatch -@interface I4 : I1 { -} -@end - -// Methods match -@interface I5 -+ (float)bar; -- (int)foo; -@end - -// Method mismatch -@interface I6 -+ (float)foo; -@end - -// Method mismatch -@interface I7 -- (int)foo; -+ (int)bar:(float)x; -@end - -// Method mismatch -@interface I8 -- (int)foo; -+ (int)bar:(float)x, ...; -@end - -// Matching protocol -@protocol P0 -+ (int)foo; -- (int)bar:(float)x; -@end - -// Protocol with mismatching method -@protocol P1 -+ (int)foo; -- (int)bar:(double)x; -@end - -// Interface with protocol -@interface I9 <P0> -+ (int)foo; -- (int)bar:(float)x; -@end - -// Protocol with protocol -@protocol P2 <P0> -- (float)wibble:(int)a1 second:(int)a2; -@end - -// Forward-declared interface -@class I10; @interface I12 @end -@interface I11 -@end - -// Forward-declared protocols -@protocol P3, P4; -@protocol P5 -- (double)honk:(int)a; -@end - -// Interface with implementation -@interface I13 -@end - -@implementation I13 -@end - -@interface I13b -@end - -@implementation I13b -@end - -// Implementation by itself -@implementation I14 : I12 -@end - -@implementation I15 : I11 -@end diff --git a/clang/test/ASTMerge/Inputs/macro.modulemap b/clang/test/ASTMerge/Inputs/macro.modulemap deleted file mode 100644 index dba1f2207f1..00000000000 --- a/clang/test/ASTMerge/Inputs/macro.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module macro1 [extern_c] { - header "macro1.h" - export * -} diff --git a/clang/test/ASTMerge/Inputs/macro1.h b/clang/test/ASTMerge/Inputs/macro1.h deleted file mode 100644 index 96133949678..00000000000 --- a/clang/test/ASTMerge/Inputs/macro1.h +++ /dev/null @@ -1,5 +0,0 @@ -typedef void *VoidRef; - -void maybeNull( - int i, - _Nullable VoidRef *_Nullable); diff --git a/clang/test/ASTMerge/Inputs/macro1.m b/clang/test/ASTMerge/Inputs/macro1.m deleted file mode 100644 index 2612613bd0b..00000000000 --- a/clang/test/ASTMerge/Inputs/macro1.m +++ /dev/null @@ -1,5 +0,0 @@ -@import macro1; - -void foo() { - maybeNull(0, 0); -} diff --git a/clang/test/ASTMerge/Inputs/macro2.m b/clang/test/ASTMerge/Inputs/macro2.m deleted file mode 100644 index b5b155a95b5..00000000000 --- a/clang/test/ASTMerge/Inputs/macro2.m +++ /dev/null @@ -1,5 +0,0 @@ -void foo(); - -void bar() { - foo(); -} diff --git a/clang/test/ASTMerge/Inputs/namespace1.cpp b/clang/test/ASTMerge/Inputs/namespace1.cpp deleted file mode 100644 index 1ff84f3111c..00000000000 --- a/clang/test/ASTMerge/Inputs/namespace1.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Merge success -namespace N1 { - int x; -} - -// Merge multiple namespaces -namespace N2 { - extern int x; -} -namespace N2 { - extern float y; -} - -// Merge namespace with conflict -namespace N3 { - extern float z; -} diff --git a/clang/test/ASTMerge/Inputs/namespace2.cpp b/clang/test/ASTMerge/Inputs/namespace2.cpp deleted file mode 100644 index 80429f700b1..00000000000 --- a/clang/test/ASTMerge/Inputs/namespace2.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Merge success -namespace N1 { - extern int x0; -} - -// Merge multiple namespaces -namespace N2 { - extern int x; -} -namespace N2 { - extern float y; -} - -// Merge namespace with conflict -namespace N3 { - extern double z; -} diff --git a/clang/test/ASTMerge/Inputs/property1.m b/clang/test/ASTMerge/Inputs/property1.m deleted file mode 100644 index 22fe0a02220..00000000000 --- a/clang/test/ASTMerge/Inputs/property1.m +++ /dev/null @@ -1,31 +0,0 @@ -// Matching properties -@interface I1 { -} -- (int)getProp2; -- (void)setProp2:(int)value; -@end - -// Mismatched property -@interface I2 -@property (readonly) float Prop1; -@end - -// Properties with implementations -@interface I3 { - int ivar1; - int ivar2; - int ivar3; - int Prop4; -} -@property int Prop1; -@property int Prop2; -@property int Prop3; -@property int Prop4; -@end - -@implementation I3 -@synthesize Prop1 = ivar1; -@synthesize Prop2 = ivar3; -@dynamic Prop3; -@synthesize Prop4; -@end diff --git a/clang/test/ASTMerge/Inputs/property2.m b/clang/test/ASTMerge/Inputs/property2.m deleted file mode 100644 index 64a03fb04ec..00000000000 --- a/clang/test/ASTMerge/Inputs/property2.m +++ /dev/null @@ -1,33 +0,0 @@ -// Matching properties -@interface I1 { -} -- (int)getProp2; -- (void)setProp2:(int)value; -@property (readonly) int Prop1; -@property (getter = getProp2, setter = setProp2:) int Prop2; -@end - -// Mismatched property -@interface I2 -@property (readonly) int Prop1; -@end - -// Properties with implementations -@interface I3 { - int ivar1; - int ivar2; - int ivar3; - int Prop4; -} -@property int Prop1; -@property int Prop2; -@property int Prop3; -@property int Prop4; -@end - -@implementation I3 -@synthesize Prop2 = ivar2; -@synthesize Prop1 = ivar1; -@synthesize Prop3 = ivar3; -@synthesize Prop4 = Prop4; -@end diff --git a/clang/test/ASTMerge/Inputs/struct1.c b/clang/test/ASTMerge/Inputs/struct1.c deleted file mode 100644 index af2af8abc42..00000000000 --- a/clang/test/ASTMerge/Inputs/struct1.c +++ /dev/null @@ -1,63 +0,0 @@ -typedef int Int; -typedef float Float; - -// Matches -struct S0 { - Int field1; - Float field2; -}; - -struct S0 x0; - -// Mismatch in field type -struct S1 { - Int field1; - int field2; -}; - -struct S1 x1; - -// Mismatch in tag kind. -struct S2 { int i; float f; } x2; - -// Missing fields -struct S3 { int i; float f; double d; } x3; - -// Extra fields -struct S4 { int i; } x4; - -// Bit-field matches -struct S5 { int i : 8; unsigned j : 8; } x5; - -// Bit-field mismatch -struct S6 { int i : 8; unsigned j : 8; } x6; - -// Bit-field mismatch -struct S7 { int i : 8; unsigned j : 8; } x7; - -// Incomplete type -struct S8 *x8; - -// Incomplete type -struct S9 { int i; float f; } *x9; - -// Incomplete type -struct S10 *x10; - -// Matches -struct ListNode { - int value; - struct ListNode *Next; -} xList; - -// Mismatch due to struct used internally -struct DeepError { - int value; - struct DeeperError { int i; int f; } *Deeper; -} xDeep; - -// Matches -struct { - Int i; - float f; -} x11; diff --git a/clang/test/ASTMerge/Inputs/struct2.c b/clang/test/ASTMerge/Inputs/struct2.c deleted file mode 100644 index 4b43df71d8d..00000000000 --- a/clang/test/ASTMerge/Inputs/struct2.c +++ /dev/null @@ -1,60 +0,0 @@ -// Matches -struct S0 { - int field1; - float field2; -}; - -struct S0 x0; - -// Mismatch in field type -struct S1 { - int field1; - float field2; -}; - -struct S1 x1; - -// Mismatch in tag kind. -union S2 { int i; float f; } x2; - -// Missing fields -struct S3 { int i; float f; } x3; - -// Extra fields -struct S4 { int i; float f; } x4; - -// Bit-field matches -struct S5 { int i : 8; unsigned j : 8; } x5; - -// Bit-field mismatch -struct S6 { int i : 8; unsigned j; } x6; - -// Bit-field mismatch -struct S7 { int i : 8; unsigned j : 16; } x7; - -// Incomplete type -struct S8 { int i; float f; } *x8; - -// Incomplete type -struct S9 *x9; - -// Incomplete type -struct S10 *x10; - -// Matches -struct ListNode { - int value; - struct ListNode *Next; -} xList; - -// Mismatch due to struct used internally -struct DeepError { - int value; - struct DeeperError { int i; float f; } *Deeper; -} xDeep; - -// Matches -struct { - int i; - float f; -} x11; diff --git a/clang/test/ASTMerge/Inputs/typedef1.c b/clang/test/ASTMerge/Inputs/typedef1.c deleted file mode 100644 index 56576756856..00000000000 --- a/clang/test/ASTMerge/Inputs/typedef1.c +++ /dev/null @@ -1,4 +0,0 @@ -typedef int Typedef1; -typedef int Typedef2; -Typedef1 x1; -Typedef2 x2; diff --git a/clang/test/ASTMerge/Inputs/typedef2.c b/clang/test/ASTMerge/Inputs/typedef2.c deleted file mode 100644 index 129d7101e91..00000000000 --- a/clang/test/ASTMerge/Inputs/typedef2.c +++ /dev/null @@ -1,4 +0,0 @@ -typedef int Typedef1; -typedef double Typedef2; -Typedef1 x1; -Typedef2 x2; diff --git a/clang/test/ASTMerge/Inputs/var1.c b/clang/test/ASTMerge/Inputs/var1.c deleted file mode 100644 index 4f5cbe16ab6..00000000000 --- a/clang/test/ASTMerge/Inputs/var1.c +++ /dev/null @@ -1,7 +0,0 @@ -int *x0; -float **x1; -#include "var1.h" -int xarray0[17]; -int xarray1[]; -int xarray2[18]; -int xarray3[18]; diff --git a/clang/test/ASTMerge/Inputs/var1.h b/clang/test/ASTMerge/Inputs/var1.h deleted file mode 100644 index 1518e17ef0c..00000000000 --- a/clang/test/ASTMerge/Inputs/var1.h +++ /dev/null @@ -1 +0,0 @@ -double x2; diff --git a/clang/test/ASTMerge/Inputs/var2.c b/clang/test/ASTMerge/Inputs/var2.c deleted file mode 100644 index 01986e4208c..00000000000 --- a/clang/test/ASTMerge/Inputs/var2.c +++ /dev/null @@ -1,7 +0,0 @@ -int *x0; -double *x1; -int x2; -int xarray0[17]; -int xarray1[17]; -int xarray2[]; -int xarray3[17]; |
