Merge branch 'master' into codegen-optHEADmaster

Conflicts:
	src/codegen.ml

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/typing/bad/diamond.cpp b/tests/typing/bad/diamond.cpp
new file mode 100644
index 0000000..fe59ceb
--- /dev/null
+++ b/tests/typing/bad/diamond.cpp
@@ -0,0 +1,33 @@
+#include <iostream>
+
+
+class A { public :
+  int a;
+};
+
+class B : public A { public :
+  int b;
+};
+
+class C : public A { public :
+  int c;
+};
+
+class D : public B, public C { public :
+  int d;
+};
+
+
+
+void f(A* ap) {std::cout << ap->a << "\n";}
+
+int main () {
+
+  D* dp = new D();
+  dp->a = 42;
+  std::cout << dp-> a << "\n";
+
+  f(dp);
+
+  return 0;
+}
\ No newline at end of file