From 08dcf60295b79ac6a79ac94933778001eab2d389 Mon Sep 17 00:00:00 2001
From: Vince Harron <vince@nethacker.com>
Date: Sun, 22 Mar 2015 08:47:07 +0000
Subject: Reverting 232853 and 232870 because they depend on 232793, which was
 reverted because it was causing LLDB test failures

llvm-svn: 232907
---
 clang/test/Modules/Inputs/update-exception-spec/a.h              | 2 --
 clang/test/Modules/Inputs/update-exception-spec/b.h              | 3 ---
 clang/test/Modules/Inputs/update-exception-spec/c.h              | 3 ---
 clang/test/Modules/Inputs/update-exception-spec/module.modulemap | 3 ---
 clang/test/Modules/linkage-merge.cpp                             | 5 +++--
 clang/test/Modules/update-exception-spec.cpp                     | 6 ------
 6 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'clang/test')

diff --git a/clang/test/Modules/Inputs/update-exception-spec/a.h b/clang/test/Modules/Inputs/update-exception-spec/a.h
index 078ebf9aecf..e69de29bb2d 100644
--- a/clang/test/Modules/Inputs/update-exception-spec/a.h
+++ b/clang/test/Modules/Inputs/update-exception-spec/a.h
@@ -1,2 +0,0 @@
-struct A { ~A() throw(int); };
-struct B { A a; };
diff --git a/clang/test/Modules/Inputs/update-exception-spec/b.h b/clang/test/Modules/Inputs/update-exception-spec/b.h
index f75b559bee4..e69de29bb2d 100644
--- a/clang/test/Modules/Inputs/update-exception-spec/b.h
+++ b/clang/test/Modules/Inputs/update-exception-spec/b.h
@@ -1,3 +0,0 @@
-struct A { ~A() throw(int); };
-struct B { A a; };
-inline void f(B *p) { p->~B(); }
diff --git a/clang/test/Modules/Inputs/update-exception-spec/c.h b/clang/test/Modules/Inputs/update-exception-spec/c.h
index 067dbb65055..e69de29bb2d 100644
--- a/clang/test/Modules/Inputs/update-exception-spec/c.h
+++ b/clang/test/Modules/Inputs/update-exception-spec/c.h
@@ -1,3 +0,0 @@
-#include "a.h"
-#include "b.h"
-inline void g(B *p) { p->~B(); }
diff --git a/clang/test/Modules/Inputs/update-exception-spec/module.modulemap b/clang/test/Modules/Inputs/update-exception-spec/module.modulemap
index 880ae38b97a..e69de29bb2d 100644
--- a/clang/test/Modules/Inputs/update-exception-spec/module.modulemap
+++ b/clang/test/Modules/Inputs/update-exception-spec/module.modulemap
@@ -1,3 +0,0 @@
-module a { header "a.h" }
-module b { header "b.h" }
-module c { header "c.h" }
diff --git a/clang/test/Modules/linkage-merge.cpp b/clang/test/Modules/linkage-merge.cpp
index 3ac8053761b..99917897fcc 100644
--- a/clang/test/Modules/linkage-merge.cpp
+++ b/clang/test/Modules/linkage-merge.cpp
@@ -11,5 +11,6 @@ static void g(int);
 // happen to find lookup results for 'g'; LookupResult::resolveKind needs to
 // be taught to prefer a visible result over a non-visible one.
 //
-// expected-error@9 {{functions that differ only in their return type cannot be overloaded}}
-// expected-note@Inputs/linkage-merge-foo.h:2 {{previous declaration is here}}
+// FIXME-error@-1 {{functions that differ only in their return type cannot be overloaded}}
+// FIXME-note@Inputs/linkage-merge-foo.h:2 {{previous declaration is here}}
+// expected-no-diagnostics
diff --git a/clang/test/Modules/update-exception-spec.cpp b/clang/test/Modules/update-exception-spec.cpp
index bccdddc9c09..e69de29bb2d 100644
--- a/clang/test/Modules/update-exception-spec.cpp
+++ b/clang/test/Modules/update-exception-spec.cpp
@@ -1,6 +0,0 @@
-// RUN: rm -rf %t
-// RUN: %clang_cc1 -fexceptions -fcxx-exceptions -fmodules -fmodules-cache-path=%t -I%S/Inputs/update-exception-spec -emit-llvm-only %s
-#include "a.h"
-void use(B *p);
-#include "c.h"
-void use(B *p) { g(p); }
-- 
cgit v1.2.3