3 files changed, 99 insertions, 0 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/Makefile
new file mode 100644
index 00000000000..314f1cb2f07
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py
new file mode 100644
index 00000000000..1438747c1a1
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py
@@ -0,0 +1,25 @@
+"""
+Test the output of `frame diagnose` for calling virtual methods
+"""
+
+from __future__ import print_function
+
+import os
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class TestDiagnoseInheritance(TestBase):
+    mydir = TestBase.compute_mydir(__file__)
+
+    @skipUnlessDarwin
+    def test_diagnose_inheritance(self):
+        TestBase.setUp(self)
+        self.build()
+        exe = os.path.join(os.getcwd(), "a.out")
+        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
+        self.runCmd("run", RUN_SUCCEEDED)
+        self.expect("thread list", "Thread should be stopped",
+            substrs = ['stopped'])
+        self.expect("frame diagnose", "Crash diagnosis was accurate", "d") 
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/main.cpp
new file mode 100644
index 00000000000..78cac2c8965
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/main.cpp
@@ -0,0 +1,69 @@
+#include <stdio.h>
+#include <stdint.h>
+
+class A
+{
+public:
+    A(int a) : 
+        m_a(a)
+    {
+    }
+    virtual ~A(){}
+    virtual int get2() const { return m_a; }
+    virtual int get() const { return m_a; }
+protected:
+    int m_a;    
+};
+
+class B : public A
+{
+public:
+    B(int a, int b) : 
+        A(a),
+        m_b(b)
+    {
+    }
+
+    ~B() override
+    {
+    }
+
+    int get2() const override
+    {
+        return m_b;
+    }
+    int get() const override
+    {
+        return m_b;
+    }   
+            
+protected:
+    int m_b;
+};
+
+struct C
+{
+    C(int c) : m_c(c){}
+    virtual ~C(){}
+    int m_c;
+};
+
+class D : public C, public B
+{
+public:
+    D(int a, int b, int c, int d) : 
+        C(c),
+        B(a, b),
+        m_d(d)
+    {
+    }
+protected:
+    int m_d;
+};
+int main (int argc, char const *argv[], char const *envp[])
+{
+    D *good_d = new D(1, 2, 3, 4);
+    D *d = nullptr;
+    return d->get();
+}
+