class MyClass
{
public:
  int memberResult()
  {
    return 1;
  }
  static int staticResult()
  {
    return 1;
  }
  int externResult();
};

// --

int MyClass::externResult()
{
  return 1;
}

// --

MyClass m;

// --

enum MyEnum {
  myEnumOne = 1,
  myEnumTwo,
  myEnumThree
};

// --

class AnotherClass
{
public:
    __attribute__ ((always_inline)) int complicatedFunction() 
    {
        struct {
            int i;
        } s = { 15 };
    
        int as[4] = { 2, 3, 4, 5 };
    
        for (signed char a : as)
        {
            s.i -= a;
        }
    
        return s.i;
    }
};

// --

class DiamondA
{
private:
  struct {
    int m_i;
  };
public:
  DiamondA(int i) : m_i(i) { }
  int accessor() { return m_i; }
};

// --

class DiamondB : public virtual DiamondA
{
public:
  DiamondB(int i) : DiamondA(i) { }
};

// --

class DiamondC : public virtual DiamondA
{
public:
  DiamondC(int i) : DiamondA(i) { }
};

// --

class DiamondD : public DiamondB, public DiamondC
{
public:
  DiamondD(int i) : DiamondA(i), DiamondB(i), DiamondC(i) { }
};

// --

int doTest()
{
    int a = m.memberResult();
    a += MyClass::staticResult();
    a += m.externResult();
    a += MyEnum::myEnumThree;
    a += myEnumOne;
    a += AnotherClass().complicatedFunction();
    a += DiamondD(3).accessor();
    return a;
}

// --

class MyClass
{
public:
  int memberResult()
  {
    return 1;
  }
  static int staticResult()
  {
    return 1;
  }
  int externResult();
};

// --

int MyClass::externResult()
{
  return 1;
}

// --

MyClass m;

// --

enum MyEnum {
  myEnumOne = 1,
  myEnumTwo,
  myEnumThree
};

// --

class AnotherClass
{
public:
    __attribute__ ((always_inline)) int complicatedFunction() 
    {
        struct {
            int i;
        } s = { 15 };
    
        int as[4] = { 2, 3, 4, 5 };
    
        for (signed char a : as)
        {
            s.i -= a;
        }
    
        return s.i;
    }
};

// --

int doTest()
{
    return m.memberResult() + MyClass::staticResult() + m.externResult() + MyEnum::myEnumThree + myEnumOne + AnotherClass().complicatedFunction();
}

// --

--- 
+++ 
@@ -55,9 +55,53 @@
 
 // --
 
+class DiamondA
+{
+private:
+  struct {
+    int m_i;
+  };
+public:
+  DiamondA(int i) : m_i(i) { }
+  int accessor() { return m_i; }
+};
+
+// --
+
+class DiamondB : public virtual DiamondA
+{
+public:
+  DiamondB(int i) : DiamondA(i) { }
+};
+
+// --
+
+class DiamondC : public virtual DiamondA
+{
+public:
+  DiamondC(int i) : DiamondA(i) { }
+};
+
+// --
+
+class DiamondD : public DiamondB, public DiamondC
+{
+public:
+  DiamondD(int i) : DiamondA(i), DiamondB(i), DiamondC(i) { }
+};
+
+// --
+
 int doTest()
 {
-    return m.memberResult() + MyClass::staticResult() + m.externResult() + MyEnum::myEnumThree + myEnumOne + AnotherClass().complicatedFunction();
+    int a = m.memberResult();
+    a += MyClass::staticResult();
+    a += m.externResult();
+    a += MyEnum::myEnumThree;
+    a += myEnumOne;
+    a += AnotherClass().complicatedFunction();
+    a += DiamondD(3).accessor();
+    return a;
 }
 
 // --
Test diamond virtual inheritance in top-level expressions.


git-svn-id: 4c4cc70b1ef44ba2b7963015e681894188cea27e@269698 91177308-0d34-0410-b5e6-96231b3b80d8
