Revert r101841 and follow-up.

llvm-svn: 101859

5 files changed, 3 insertions, 31 deletions

diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 605f280c4fd..9440772fc6e 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -886,13 +886,6 @@ bool Sema::FindAllocationFunctions(SourceLocation StartLoc, SourceRange Range,
       return true;
   }
 
-  // We don't need an operator delete if we're running under
-  // -fno-exceptions.
-  if (!getLangOptions().Exceptions) {
-    OperatorDelete = 0;
-    return false;
-  }
-
   // FindAllocationOverload can change the passed in arguments, so we need to
   // copy them back.
   if (NumPlaceArgs > 0)
diff --git a/clang/test/CXX/expr/expr.unary/expr.new/p19.cpp b/clang/test/CXX/expr/expr.unary/expr.new/p19.cpp
index bb69fd55fd8..6134779f1fd 100644
--- a/clang/test/CXX/expr/expr.unary/expr.new/p19.cpp
+++ b/clang/test/CXX/expr/expr.unary/expr.new/p19.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -fexceptions %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 typedef __SIZE_TYPE__ size_t;
 
 // Operator delete template for placement new with global lookup
diff --git a/clang/test/CXX/expr/expr.unary/expr.new/p20-0x.cpp b/clang/test/CXX/expr/expr.unary/expr.new/p20-0x.cpp
index 4c924b137cc..c188e1e25e0 100644
--- a/clang/test/CXX/expr/expr.unary/expr.new/p20-0x.cpp
+++ b/clang/test/CXX/expr/expr.unary/expr.new/p20-0x.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x -fexceptions %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x %s
 typedef __SIZE_TYPE__ size_t;
 
 struct S {
diff --git a/clang/test/CXX/expr/expr.unary/expr.new/p20.cpp b/clang/test/CXX/expr/expr.unary/expr.new/p20.cpp
index 8cbe2b9be3b..71e584e775c 100644
--- a/clang/test/CXX/expr/expr.unary/expr.new/p20.cpp
+++ b/clang/test/CXX/expr/expr.unary/expr.new/p20.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -fexceptions %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 typedef __SIZE_TYPE__ size_t;
 
 // Overloaded operator delete with two arguments
diff --git a/clang/test/SemaCXX/no-exceptions.cpp b/clang/test/SemaCXX/no-exceptions.cpp
deleted file mode 100644
index 019e25c9784..00000000000
--- a/clang/test/SemaCXX/no-exceptions.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
-
-// Various tests for -fno-exceptions
-
-typedef __SIZE_TYPE__ size_t;
-
-namespace test0 {
-  // rdar://problem/7878149
-  class Foo {
-  public:
-    void* operator new(size_t x);
-  private:
-    void operator delete(void *x);
-  };
-
-  void test() {
-    // Under -fexceptions, this does access control for the associated
-    // 'operator delete'.
-    (void) new Foo();
-  }
-}