From patchwork Fri Oct 22 03:14:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhang X-Patchwork-Id: 68795 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]) by ozlabs.org (Postfix) with SMTP id 6E573B6F07 for ; Fri, 22 Oct 2010 14:14:21 +1100 (EST) Received: (qmail 31585 invoked by alias); 22 Oct 2010 03:14:18 -0000 Received: (qmail 31574 invoked by uid 22791); 22 Oct 2010 03:14:17 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, TW_QV, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 22 Oct 2010 03:14:11 +0000 Received: (qmail 10173 invoked from network); 22 Oct 2010 03:14:07 -0000 Received: from unknown (HELO ?192.168.1.106?) (jie@127.0.0.2) by mail.codesourcery.com with ESMTPA; 22 Oct 2010 03:14:07 -0000 Message-ID: <4CC1017C.1060302@codesourcery.com> Date: Fri, 22 Oct 2010 11:14:04 +0800 From: Jie Zhang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100918 Icedove/3.1.4 MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org Subject: Don't combine instructions if they can't be copied X-IsSubscribed: yes 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 Compiling the test case in the attached patch using arm-linux-gnueabi target g++ with the options "-O2 -fweb -fPIC -fvisibility=hidden" will give an error: Assembler messages: Error: symbol `.LPIC0' is already defined That's because an instruction, which can't be copied, is combined into another instruction while that non-copyable instruction is still kept since its result is needed later. GCC will generate the same label ".LPIC0" for that non-copyable instruction and the combined instruction since the label number is also copied and same for both instructions. With this patch, GCC will not combine instructions if they can't be copied. Tested on arm-linux-gnueabi with c,c++,lto. No regressions are found. Is it OK? Regards, * combine.c (try_combine): Don't combine if can't copy instructions. testsuite/ g++.dg/opt/combine.c: New test. Index: testsuite/g++.dg/opt/combine.C =================================================================== --- testsuite/g++.dg/opt/combine.C (revision 0) +++ testsuite/g++.dg/opt/combine.C (revision 0) @@ -0,0 +1,72 @@ +// { dg-do assemble { target fpic } } +// { dg-options "-O2 -fweb -fPIC -fvisibility=hidden" } + +class QBasicAtomicInt +{ +public: + volatile int _q_value; + inline operator int () const {return _q_value;} +}; +class QVariant; +class QScriptContext; +class QScriptEngine; +class QScriptValue +{ +public: + QVariant toVariant () const; +}; +class QScriptDebuggerBackendPrivate +{ + static QScriptValue trace (QScriptContext *context); +}; +template struct QMetaTypeId { }; +template struct QMetaTypeId2 +{ + static inline int qt_metatype_id () + { + return QMetaTypeId::qt_metatype_id () ; + } +}; +template inline int qMetaTypeId (T * = 0) +{ + return QMetaTypeId2::qt_metatype_id () ; +} +class QVariant { }; +template inline T qvariant_cast (const QVariant &v) +{ + const int vid = qMetaTypeId ((0)) ; +}; +class QScriptContext +{ +public: + QScriptValue callee () const; +}; +class QScriptEngine +{ +public: + static bool convertV2 (const QScriptValue &value , int type , void *ptr) ; +}; +inline bool qscriptvalue_cast_helper (const QScriptValue &value , int type , void *ptr) +{ + return QScriptEngine::convertV2 (value, type, ptr) ; +} +template T qscriptvalue_cast (const QScriptValue &value) +{ + T t; + const int id = qMetaTypeId () ; + if ( qscriptvalue_cast_helper (value, id, &t)) + return qvariant_cast (value.toVariant ()) ; +} +template <> struct QMetaTypeId< QScriptDebuggerBackendPrivate* > +{ + static int qt_metatype_id () + { + static QBasicAtomicInt metatype_id = { (0) }; + return metatype_id; + } +}; +QScriptValue QScriptDebuggerBackendPrivate::trace (QScriptContext *context) +{ + QScriptValue data = context->callee () ; + QScriptDebuggerBackendPrivate *self = qscriptvalue_cast (data) ; +} Index: combine.c =================================================================== --- combine.c (revision 165798) +++ combine.c (working copy) @@ -2917,6 +2917,15 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx else added_sets_0 = 0; + if (targetm.cannot_copy_insn_p + && ((added_sets_2 && targetm.cannot_copy_insn_p (i2)) + || (i1 && added_sets_1 && targetm.cannot_copy_insn_p (i1)) + || (i0 && added_sets_0 && targetm.cannot_copy_insn_p (i0)))) + { + undo_all (); + return 0; + } + /* If the set in I2 needs to be kept around, we must make a copy of PATTERN (I2), so that when we substitute I1SRC for I1DEST in PATTERN (I2), we are only substituting for the original I1DEST, not into