From 1f9a9b00e057b0ebda9763caa9a46a8cb24c8bfe Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Tue, 17 Aug 2021 10:16:22 +0200 Subject: [PATCH 1/2] Revert "TypeInfo_Class: Make 2 superfluously virtual functions final" This reverts commit 099b41490256b921874fcecfb635c432f7201bbc. --- src/object.d | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/object.d b/src/object.d index 2023c443d4..acd8911cd8 100644 --- a/src/object.d +++ b/src/object.d @@ -1401,14 +1401,14 @@ private extern (C) int _d_isbaseof(scope TypeInfo_Class child, */ class TypeInfo_Class : TypeInfo { - override string toString() const pure { return name; } + override string toString() const pure { return info.name; } override bool opEquals(Object o) { if (this is o) return true; auto c = cast(const TypeInfo_Class)o; - return c && this.name == c.name; + return c && this.info.name == c.info.name; } override size_t getHash(scope const void* p) @trusted const @@ -1464,8 +1464,8 @@ class TypeInfo_Class : TypeInfo return m_offTi; } - final @property auto info() @safe @nogc nothrow pure const return { return this; } - final @property auto typeinfo() @safe @nogc nothrow pure const return { return this; } + @property auto info() @safe nothrow pure const return { return this; } + @property auto typeinfo() @safe nothrow pure const return { return this; } byte[] m_init; /** class static initializer * (init.length gives size in bytes of class) From 201c6654ed9bbe67cd53c0c1bdb0b6a0dd20d9f7 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Tue, 17 Aug 2021 10:21:29 +0200 Subject: [PATCH 2/2] Cirrus CI: Add FreeBSD 11 pipeline --- .cirrus.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 97ec613c25..eb86246eff 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,3 +81,17 @@ task: CI_DFLAGS: -version=TARGET_FREEBSD12 install_bash_and_git_script: pkg install -y bash git << : *COMMON_STEPS_TEMPLATE + +task: + name: FreeBSD 11.4 x64 + freebsd_instance: + image_family: freebsd-11-4 + cpu: 4 + memory: 8G + timeout_in: 60m + environment: + OS_NAME: freebsd + HOST_DMD: dmd-2.079.0 + CI_DFLAGS: -version=TARGET_FREEBSD11 + install_bash_and_git_script: pkg install -y bash git + << : *COMMON_STEPS_TEMPLATE