From patchwork Mon Aug 4 11:09:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Tietz X-Patchwork-Id: 376245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9249B140095 for ; Mon, 4 Aug 2014 21:09:45 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:cc:content-type; q=dns; s=default; b=y041IeXw4txX32cmPd+brjxes9bWyxUZkfrR7LNkyua LqPbi/AFUNTpT+O2YvTUGAAJTJGXDek18Opd6gdGyk75xVReRgXPKDxPeZdwxtDM qlyPtzPn2KO5R8E76KJUWRB9bFX7ya7zhnSEns9nbu1mLLiCf2M33qSOR4llqPOA = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:cc:content-type; s=default; bh=bUSYt+7gZkZ8aeHLC1pVnSgQUD8=; b=ssYHm+vzd/mlqTEMk rs3b3WrNBg/tY8V8vTs3dEaHdHRR0fcMiELx8yXr5PLnvremsWp6G0IombEKb6Pd m84YCqFFnx9/Lu/+cUqIt5G1s+AwW9Rv8p2+S0UzjCoUR4uQxt7ahxu/2AAbflGL fYM8yhbsiWxby9mMdWL633Cg8Q= Received: (qmail 28357 invoked by alias); 4 Aug 2014 11:09:38 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 28339 invoked by uid 89); 4 Aug 2014 11:09:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ie0-f172.google.com Received: from mail-ie0-f172.google.com (HELO mail-ie0-f172.google.com) (209.85.223.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 04 Aug 2014 11:09:35 +0000 Received: by mail-ie0-f172.google.com with SMTP id lx4so9558610iec.31 for ; Mon, 04 Aug 2014 04:09:33 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.42.198.75 with SMTP id en11mr30036387icb.7.1407150573755; Mon, 04 Aug 2014 04:09:33 -0700 (PDT) Received: by 10.64.20.193 with HTTP; Mon, 4 Aug 2014 04:09:33 -0700 (PDT) Date: Mon, 4 Aug 2014 13:09:33 +0200 Message-ID: Subject: [patch cp]: Check for keep-inline-dllexport that we are operating on true inlines From: Kai Tietz To: GCC Patches Cc: Jason Merrill X-IsSubscribed: yes Hi, This patch makes sure that we check for flag keep-inline-dllexport that we operate on true inlines as we do it for keep-inline-functions. ChangeLog 2014-08-04 Kai Tietz * semantics.c (expand_or_defer_fn_1): Check for keep-inline-dllexport that we operate on a true inline. Tested for x86_64-w64-mingw32, i686-w64-mingw32, and i686-pc-cygwin. Ok for apply? Regards, Kai Index: semantics.c =================================================================== --- semantics.c (Revision 213543) +++ semantics.c (Arbeitskopie) @@ -4001,11 +4001,11 @@ expand_or_defer_fn_1 (tree fn) this function as needed so that finish_file will make sure to output it later. Similarly, all dllexport'd functions must be emitted; there may be callers in other DLLs. */ - if ((flag_keep_inline_functions - && DECL_DECLARED_INLINE_P (fn) - && !DECL_REALLY_EXTERN (fn)) - || (flag_keep_inline_dllexport - && lookup_attribute ("dllexport", DECL_ATTRIBUTES (fn)))) + if (DECL_DECLARED_INLINE_P (fn) + && !DECL_REALLY_EXTERN (fn) + && (flag_keep_inline_functions + || (flag_keep_inline_dllexport + && lookup_attribute ("dllexport", DECL_ATTRIBUTES (fn))))) { mark_needed (fn); DECL_EXTERNAL (fn) = 0;