From bd59b4894e811bd2c638e390aeff8b39e1ee1919 Mon Sep 17 00:00:00 2001
From: Akira Hatanaka <ahatanaka@apple.com>
Date: Mon, 18 Apr 2016 18:19:45 +0000
Subject: [Parser][ObjC] Make sure c++11 in-class initialization is done when
 the constructor's definition is in an implementation block.

Without this commit, ptr doesn't get initialized to null in the
following code:

struct S {
  S();
  void *ptr = nullptr;
};

@implementation I
  S::S() {}
@end

rdar://problem/25693624

llvm-svn: 266645
---
 clang/lib/Parse/ParseObjc.cpp               |  2 ++
 clang/test/Parser/objc-default-ctor-init.mm | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 clang/test/Parser/objc-default-ctor-init.mm

diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp
index 708e2a7edc1..4b4494d27be 100644
--- a/clang/lib/Parse/ParseObjc.cpp
+++ b/clang/lib/Parse/ParseObjc.cpp
@@ -3651,6 +3651,8 @@ void Parser::ParseLexedObjCMethodDefs(LexedMethod &LM, bool parseMethod) {
   else {
     if (Tok.is(tok::colon))
       ParseConstructorInitializer(MCDecl);
+    else
+      Actions.ActOnDefaultCtorInitializers(MCDecl);
     ParseFunctionStatementBody(MCDecl, BodyScope);
   }
   
diff --git a/clang/test/Parser/objc-default-ctor-init.mm b/clang/test/Parser/objc-default-ctor-init.mm
new file mode 100644
index 00000000000..fda8befa377
--- /dev/null
+++ b/clang/test/Parser/objc-default-ctor-init.mm
@@ -0,0 +1,17 @@
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.10 -std=c++11 -ast-dump %s | FileCheck %s
+// CHECK: CXXCtorInitializer Field {{.*}} 'ptr' 'void *'
+
+@interface NSObject
+@end
+
+@interface I : NSObject
+@end
+
+struct S {
+  S();
+  void *ptr = nullptr;
+};
+
+@implementation I
+S::S() {}
+@end
-- 
cgit v1.2.3