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

1 files changed, 40 insertions, 0 deletions

diff --git a/clang/test/ASTMerge/class/Inputs/class2.cpp b/clang/test/ASTMerge/class/Inputs/class2.cpp
new file mode 100644
index 00000000000..6fe38b92066
--- /dev/null
+++ b/clang/test/ASTMerge/class/Inputs/class2.cpp
@@ -0,0 +1,40 @@
+struct A {
+  public:
+    int x;
+};
+
+struct B : A {
+  int y;
+  int foo();
+};
+
+enum E {
+  a = 0,
+  b = 1
+};
+
+//Friend import tests
+void f();
+int g(int a);
+struct X;
+struct Y;
+
+struct F1 {
+public:
+  int x;
+  friend struct X;
+  friend int g(int);
+  friend void f();
+};
+
+struct F2 {
+public:
+  int x;
+  friend struct X;
+};
+
+struct F3 {
+public:
+  int x;
+  friend void f();
+};