From 0333dd95636da52229ca14b4e5525c1cd8ba62d2 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Tue, 14 May 2019 18:51:07 +0000
Subject: 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
---
 clang/test/ASTMerge/class/Inputs/class1.cpp | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 clang/test/ASTMerge/class/Inputs/class1.cpp

(limited to 'clang/test/ASTMerge/class/Inputs/class1.cpp')

diff --git a/clang/test/ASTMerge/class/Inputs/class1.cpp b/clang/test/ASTMerge/class/Inputs/class1.cpp
new file mode 100644
index 00000000000..2bd5503ecf3
--- /dev/null
+++ b/clang/test/ASTMerge/class/Inputs/class1.cpp
@@ -0,0 +1,48 @@
+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
+};
+
+//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;
+  friend void f();
+};
+
+struct F3 {
+public:
+  int x;
+  friend int g(int);
+  friend void f();
+};
-- 
cgit v1.2.3