codegen: Handle different type-symbols in visit_base_access()

It is required to distinguish between classes, compact classes, structs
and simple-type structs.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/901

3 files changed, 89 insertions, 0 deletions

diff --git a/tests/chainup/class-compact-base.vala b/tests/chainup/class-compact-base.vala
new file mode 100644
index 000000000..1359c3be7
--- /dev/null
+++ b/tests/chainup/class-compact-base.vala
@@ -0,0 +1,37 @@
+[Compact]
+public class Foo {
+	public int a;
+	public int b;
+
+	public Foo () {
+		a = 23;
+	}
+
+	public int sum () {
+		return this.a + this.b;
+	}
+}
+
+public class Bar : Foo {
+	public Bar () {
+		base ();
+		this.b = 42;
+	}
+
+	public int mul () {
+		return this.a * this.b;
+	}
+
+	public int mul2 () {
+		return base.a * base.b;
+	}
+}
+
+void main () {
+	var bar = new Bar ();
+	assert (bar.a == 23);
+	assert (bar.b == 42);
+	assert (bar.sum () == 65);
+	assert (bar.mul () == 966);
+	assert (bar.mul2 () == 966);
+}
diff --git a/tests/chainup/struct-no-gtype-base.vala b/tests/chainup/struct-no-gtype-base.vala
new file mode 100644
index 000000000..c0e39b894
--- /dev/null
+++ b/tests/chainup/struct-no-gtype-base.vala
@@ -0,0 +1,27 @@
+[CCode (has_type_id = false)]
+struct Foo {
+	public int a;
+	public int b;
+
+	public int sum () {
+		return this.a + this.b;
+	}
+}
+
+[CCode (has_type_id = false)]
+struct Bar : Foo {
+	public int mul () {
+		return this.a * this.b;
+	}
+
+	public int mul2 () {
+		return base.a * base.b;
+	}
+}
+
+void main () {
+	Bar bar = { 23, 42 };
+	assert (bar.sum () == 65);
+	assert (bar.mul () == 966);
+	assert (bar.mul2 () == 966);
+}
diff --git a/tests/chainup/struct-simple-no-gtype-base.vala b/tests/chainup/struct-simple-no-gtype-base.vala
new file mode 100644
index 000000000..ee19bc223
--- /dev/null
+++ b/tests/chainup/struct-simple-no-gtype-base.vala
@@ -0,0 +1,25 @@
+[IntegerType (rank = 6, signed = true, width = 32)]
+[SimpleType]
+[CCode (has_type_id = false)]
+struct foo_t {
+	public int sum (foo_t b) {
+		return this + b;
+	}
+}
+
+[CCode (has_type_id = false)]
+struct bar_t : foo_t {
+	public int mul (bar_t b) {
+		return this * b;
+	}
+	public int mul2 (bar_t b) {
+		return base * b;
+	}
+}
+
+void main () {
+	bar_t bar = 23;
+	assert (bar.sum (42) == 65);
+	assert (bar.mul (42) == 966);
+	assert (bar.mul2 (42) == 966);
+}