From patchwork Wed Aug 16 15:34:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9904009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3283060231 for ; Wed, 16 Aug 2017 15:35:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2110C286AC for ; Wed, 16 Aug 2017 15:35:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15F93288DA; Wed, 16 Aug 2017 15:35:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5019286AC for ; Wed, 16 Aug 2017 15:35:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751517AbdHPPfx (ORCPT ); Wed, 16 Aug 2017 11:35:53 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34199 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751635AbdHPPfw (ORCPT ); Wed, 16 Aug 2017 11:35:52 -0400 Received: by mail-wr0-f195.google.com with SMTP id x43so3699116wrb.1 for ; Wed, 16 Aug 2017 08:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AI6eoxyfr2f3I1kRkmRTM449TxiU7W5dbY1CAPLPcCY=; b=Ob71gDRem/X3C/n4CQzzVzePwoG6N6HSQn0/Kt55m3svUvD4kgsz57d7w+Xgru9+L3 5KIzBECnmyy3N2QLL28/WgYhfBg7FdVebWoMsbU7biuI8jnOcpuC+LFpDL8ldlEfO9Wm icKD6Ezh8vYLA+IetqHHAJVvqzrKbdoJa5tS6RVX0lpjqSBgMBC7FTCHwYWhGDNuXjMV KfoVLWGiuDy93EOYVDzYStw+DVKjdxv1baThHslBro1jX9iyFBOTiQhw5neRgCFVF8+J 8gD4OSm0hw9tT3rJx7rk7l6N6sE5Q87dUwLg15OgM+Ns2psj1E/93mV8hI6sEoCsrRKi P+tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AI6eoxyfr2f3I1kRkmRTM449TxiU7W5dbY1CAPLPcCY=; b=cBa05Moc2Q0OcAnLHo/9A4e47Dc7vKrFxVhb8DnlYr5MPrX9CThgYKBYw0J39JLjvN Whrad3AN1UhqjWwgj0jrHyihM2ToFhDCheobiMR9nk+vYdX/LdGr9nnWfdLSnOUDdL5+ 5oK0NzEJJe3N30p/0o822bFMUyips1lk9iJTXQ9tKIb1bRow6zmlbwrUiFjqowKvzlbv N924QT2Nq396KV4SmbZ0471NCViJLqdBqURiccuMTLh9LXF513XZid5twf4OWp2nseVC gS6lApiCI5mrNpcv8fNnBQ5erk6vZGR43pXehY0X47dm1S/8aK/Tk5pk7NnN5szttTVt nzXA== X-Gm-Message-State: AHYfb5gGn4v2w3cju9d1DO+kEjNDqVTR1gbWzkIVTgq/Tsc3ZCc4CeQ7 5fANcM42lUeZ9JzcSak= X-Received: by 10.80.163.200 with SMTP id t8mr2261541edb.158.1502897751623; Wed, 16 Aug 2017 08:35:51 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4076:600:895a:bb88:13f:9772]) by smtp.gmail.com with ESMTPSA id y19sm690635edi.6.2017.08.16.08.35.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 08:35:51 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Linus Torvalds , Christopher Li , Luc Van Oostenryck Subject: [PATCH 25/29] sssa: reorg load_var() Date: Wed, 16 Aug 2017 17:34:51 +0200 Message-Id: <20170816153455.97693-26-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170816153455.97693-1-luc.vanoostenryck@gmail.com> References: <20170816153455.97693-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No functional changes here. Only shuffling some code arround to make the next patch more readable. Signed-off-by: Luc Van Oostenryck --- ssa.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/ssa.c b/ssa.c index 10279a602..7950ffeaf 100644 --- a/ssa.c +++ b/ssa.c @@ -13,6 +13,9 @@ #include +static pseudo_t load_var_(struct basic_block*, struct symbol*); + + // FIXME: -> common file static void append_instruction(struct basic_block *bb, struct instruction *insn) { @@ -28,7 +31,7 @@ static pseudo_t add_phi_operand(struct symbol *var, pseudo_t phi) struct basic_block *parent; FOR_EACH_PTR(node->bb->parents, parent) { - pseudo_t val = load_var(parent, var); + pseudo_t val = load_var_(parent, var); struct instruction *phisrc = alloc_phisrc(val, var); pseudo_t src = phisrc->target; append_instruction(parent, phisrc); @@ -38,9 +41,15 @@ static pseudo_t add_phi_operand(struct symbol *var, pseudo_t phi) return phi; } -static pseudo_t load_var_parents(struct basic_block *bb, struct symbol *var) +static pseudo_t load_var_(struct basic_block *bb, struct symbol *var) { - pseudo_t val; + pseudo_t val = phi_map_lookup(var->phi_map, bb); + + if (val) { + while (val->type == PSEUDO_INDIR) + val = val->target; + return val; + } if (!bb->sealed) { // incomplete CFG val = insert_phi_node(bb, var); @@ -54,7 +63,7 @@ static pseudo_t load_var_parents(struct basic_block *bb, struct symbol *var) val = undef_pseudo(); break; case 1: // no phi needed - val = load_var(first_basic_block(bb->parents), var); + val = load_var_(first_basic_block(bb->parents), var); break; default: val = insert_phi_node(bb, var); @@ -64,18 +73,14 @@ static pseudo_t load_var_parents(struct basic_block *bb, struct symbol *var) } out: + assert(val->type != PSEUDO_INDIR); store_var(bb, var, val); return val; } pseudo_t load_var(struct basic_block *bb, struct symbol *var) { - pseudo_t val = phi_map_lookup(var->phi_map, bb); - if (!val) - val = load_var_parents(bb, var); - while (val->type == PSEUDO_INDIR) - val = val->target; - return val; + return load_var_(bb, var); } void store_var(struct basic_block *bb, struct symbol *var, pseudo_t val)