From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id E3485385660C; Fri, 9 Jun 2023 08:08:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E3485385660C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686298104; bh=7W+iYPSuPUKv463XUDksjGv3O48qe1wiNBuTsonTUtQ=; h=From:To:Subject:Date:From; b=xHDrK7XFjCaUZgHjiAoKmioH12V3ab8hclLTnKK+Wv6Kzh+9+0MtkZUj6y35zMqsE 7paG8z8DelPmL5iFC+JiHKjXc2TgXphh7923YX63zJEfFRXLQnz8RnqAONZU+VesEv w7F2jEQYR7D39vYrluGXYXiauWSEg/1uChGTDOsU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] fix frange_nextafter odr violation X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 85e51993e5844b993728548138d0706481b45dab X-Git-Newrev: 37d63f69507b9c6384ca74b465f17410b6c85fd0 Message-Id: <20230609080824.E3485385660C@sourceware.org> Date: Fri, 9 Jun 2023 08:08:24 +0000 (GMT) List-Id: https://gcc.gnu.org/g:37d63f69507b9c6384ca74b465f17410b6c85fd0 commit 37d63f69507b9c6384ca74b465f17410b6c85fd0 Author: Alexandre Oliva Date: Fri Jun 9 02:42:21 2023 -0300 fix frange_nextafter odr violation C++ requires inline functions to be declared inline and defined in every translation unit that uses them. frange_nextafter is used in gimple-range-op.cc but it's only defined as inline in range-op-float.cc. Drop the extraneous inline specifier. Other non-static inline functions in range-op-float.cc are not referenced elsewhere, so I'm making them static. for gcc/ChangeLog * range-op-float.cc (frange_nextafter): Drop inline. (frelop_early_resolve): Add static. (frange_float): Likewise. Diff: --- gcc/range-op-float.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc index e0e91bad44d..22cf74b9d4a 100644 --- a/gcc/range-op-float.cc +++ b/gcc/range-op-float.cc @@ -255,7 +255,7 @@ maybe_isnan (const frange &op1, const frange &op2) // Floating version of relop_early_resolve that takes into account NAN // and -ffinite-math-only. -inline bool +static inline bool frelop_early_resolve (irange &r, tree type, const frange &op1, const frange &op2, relation_trio rel, relation_kind my_rel) @@ -272,7 +272,7 @@ frelop_early_resolve (irange &r, tree type, // Set VALUE to its next real value, or INF if the operation overflows. -inline void +void frange_nextafter (enum machine_mode mode, REAL_VALUE_TYPE &value, const REAL_VALUE_TYPE &inf) @@ -2878,7 +2878,7 @@ namespace selftest // Build an frange from string endpoints. -inline frange +static inline frange frange_float (const char *lb, const char *ub, tree type = float_type_node) { REAL_VALUE_TYPE min, max;