1 files changed, 19 insertions, 10 deletions
diff --git a/test/SemaCXX/virtuals.cpp b/test/SemaCXX/virtuals.cpp
index 792467e5f86b..d8c26efcfb42 100644
--- a/test/SemaCXX/virtuals.cpp
+++ b/test/SemaCXX/virtuals.cpp
@@ -1,8 +1,8 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fcxx-exceptions -verify -std=c++0x %s
 
 class A {
   virtual void f();
-  virtual void g() = 0;
+  virtual void g() = 0; // expected-note{{unimplemented pure virtual method 'g' in 'A'}}
 
   void h() = 0; // expected-error {{'h' is not virtual and cannot be declared pure}}
   void i() = 1; // expected-error {{initializer on function does not look like a pure-specifier}}
@@ -19,20 +19,29 @@ virtual void A::k() { } // expected-error{{'virtual' can only be specified insid
 
 class B : public A {
   // Needs to recognize that overridden function is virtual.
-  //void g() = 0;
+  void g() = 0;
 
   // Needs to recognize that function does not override.
-  //void g(int) = 0;
+  void g(int) = 0; // expected-error{{'g' is not virtual and cannot be declared pure}}
 };
 
 // Needs to recognize invalid uses of abstract classes.
-/*
-A fn(A)
+A fn(A) // expected-error{{parameter type 'A' is an abstract class}} \
+        // expected-error{{return type 'A' is an abstract class}}
 {
-  A a;
-  static_cast<A>(0);
+  A a; // expected-error{{variable type 'A' is an abstract class}}
+  (void)static_cast<A>(0);
   try {
-  } catch(A) {
+  } catch(A) { // expected-error{{variable type 'A' is an abstract class}}
   }
 }
-*/
+
+namespace rdar9670557 {
+  typedef int func(int);
+  func *a();
+  struct X {
+    virtual func f = 0;
+    virtual func (g) = 0;
+    func *h = 0;
+  };
+}