From patchwork Sun Apr 19 14:28:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1272936 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=cDFzTcnL; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 494sd65V24z9sP7 for ; Mon, 20 Apr 2020 00:28:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 881EF385DC36; Sun, 19 Apr 2020 14:28:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 881EF385DC36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1587306501; bh=tXxihQm0/wRWHNOKjtBjjEHAOMKrbY38E2SlJ0BIJ/o=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=cDFzTcnLo5qHT8kcvVkNfP5OSi1/oZRSv/j/gbU9a9ytXh8CZKnURQWGiZ+1VNklU s9gZLZlItOvfrL/aWk1MEyj5puaUlkSUFwcRE6j4wTfYsOyqPoDwCXjJLC9ax3jztJ WwlKNG9PLKnftSbeQ/+CT0PC0f+0RLq1FwDUBCAM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by sourceware.org (Postfix) with ESMTPS id 25E053858D31 for ; Sun, 19 Apr 2020 14:28:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 25E053858D31 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 494scx6MJPzKmg9; Sun, 19 Apr 2020 16:28:17 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id fyjnPoiu_1Z8; Sun, 19 Apr 2020 16:28:14 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [committed] libphobos: Merge upstream phobos 99003a75a Date: Sun, 19 Apr 2020 16:28:05 +0200 Message-Id: <20200419142805.16488-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: E92BC17EF X-Rspamd-Score: 1.30 / 15.00 / 15.00 X-Spam-Status: No, score=-27.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, This patch merges libphobos with upstream phobos 99003a75a. Fixes hasLength unittest to pass on X32. Bootstrapped and regression tested on x86_64-linux-gnu with target_board configurations {-m64,-m32,-mx32}. Committed to mainline. Regards Iain. --- libphobos/src/MERGE | 2 +- libphobos/src/std/range/primitives.d | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE index 7570cd9b9fd..31a053ca2bb 100644 --- a/libphobos/src/MERGE +++ b/libphobos/src/MERGE @@ -1,4 +1,4 @@ -fb4f6a713f5b78742f93e072cff6a6c4ecf9323d +99003a75a883d4ae28b276763f4d1f2a360cf1dd The first line of this file holds the git revision number of the last merge done from the dlang/phobos repository. diff --git a/libphobos/src/std/range/primitives.d b/libphobos/src/std/range/primitives.d index 1a4e6fb2b91..193ee952cf3 100644 --- a/libphobos/src/std/range/primitives.d +++ b/libphobos/src/std/range/primitives.d @@ -1416,12 +1416,12 @@ unittest struct A { ulong length; } struct B { @property uint length() { return 0; } } - version (X86) + static if (is(size_t == uint)) { static assert(!hasLength!(A)); static assert(hasLength!(B)); } - else version(X86_64) + else static if (is(size_t == ulong)) { static assert(hasLength!(A)); static assert(!hasLength!(B));