[PATCH] Modify CFG.cpp to print delegating constructors

[Enrico P]

Hi,

This patch fixes a segfault caused by CFG::print when the CFG contains
a delegating initializer.

Index: lib/Analysis/CFG.cpp
===================================================================
--- lib/Analysis/CFG.cpp	(revision 193162)
+++ lib/Analysis/CFG.cpp	(working copy)
@@ -3762,6 +3762,8 @@
     const CXXCtorInitializer *I = IE->getInitializer();
     if (I->isBaseInitializer())
       OS << I->getBaseClass()->getAsCXXRecordDecl()->getName();
+    else if (I->isDelegatingInitializer())
+      OS << I->getTypeSourceInfo()->getType()->getAsCXXRecordDecl()->getName();
     else OS << I->getAnyMember()->getName();
 
     OS << "(";
@@ -3771,6 +3773,8 @@
 
     if (I->isBaseInitializer())
       OS << " (Base initializer)\n";
+    else if (I->isDelegatingInitializer())
+      OS << " (Delegating initializer)\n";
     else OS << " (Member initializer)\n";
 
   } else if (Optional<CFGAutomaticObjDtor> DE =
Index: test/Analysis/initializers-cfg-output.cpp
===================================================================
--- test/Analysis/initializers-cfg-output.cpp	(revision 193162)
+++ test/Analysis/initializers-cfg-output.cpp	(working copy)
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -analyze -analyzer-checker=debug.DumpCFG %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -std=c++11 -analyze -analyzer-checker=debug.DumpCFG %s 2>&1 | FileCheck %s
 
 class A {
 public:
@@ -43,6 +43,13 @@
   int v;
 }
 
+class TestDelegating {
+  int x, z;
+ public:
+  TestDelegating() : TestDelegating(2, 3) {}
+  TestDelegating(int x, int z) : x(x), z(z) {}
+};
+
 // CHECK:  [B2 (ENTRY)]
 // CHECK:    Succs (1): B1
 // CHECK:  [B1]
@@ -95,3 +102,14 @@
 // CHECK:    Succs (2): B2 B3
 // CHECK:  [B0 (EXIT)]
 // CHECK:    Preds (1): B1
+// CHECK:  [B2 (ENTRY)]
+// CHECK:    Succs (1): B1
+// CHECK:  [B1]
+// CHECK:    1: 2
+// CHECK:    2: 3
+// CHECK:    3: [B1.1], [B1.2] (CXXConstructExpr, class TestDelegating)
+// CHECK:    4: TestDelegating([B1.3]) (Delegating initializer)
+// CHECK:    Preds (1): B2
+// CHECK:    Succs (1): B0
+// CHECK:  [B0 (EXIT)]
+// CHECK:    Preds (1): B1

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits