From patchwork Wed Sep 30 13:05:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Drepper X-Patchwork-Id: 524406 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 2D46C140D24 for ; Wed, 30 Sep 2015 23:06:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=ZSWgkzLf; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=qtHWtkQCPPT388IQs872oH5DkpCu5th/1Z2i8f5cZI7oedHp+vdlA e3Se8gAGx4wLAK/+Q9b1BegHJPt0uHxhnU6+bS47qeM1B74qtzvOIW1+12ukwvoz 2aSj8w11GEdk0P/va/lufUDlyp6IqGpyJjRgz5gNZDkts85N8XTkEk= 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:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=9K8mVM4vCGXhCY3AeFBAYVlIbPU=; b=ZSWgkzLfzx3341lJarjW fujX8Y0ssC7pA3JACXcS/qeIMck2rQ3Pat44ymNjcT+y/fRV17coxCGKXvnBCIiJ dpk0MDgJXbXaJDpyME66fCSyiC4Pf9bNzvbo6yq1+8I69fZX0nbayWvJcC4tkR/e qdoqhdKSKjJGiZOvoYKH7C4= Received: (qmail 55253 invoked by alias); 30 Sep 2015 13:05:57 -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 55241 invoked by uid 89); 30 Sep 2015 13:05:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.1 required=5.0 tests=BAYES_50, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qg0-f50.google.com Received: from mail-qg0-f50.google.com (HELO mail-qg0-f50.google.com) (209.85.192.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 30 Sep 2015 13:05:49 +0000 Received: by qgx61 with SMTP id 61so33842254qgx.3 for ; Wed, 30 Sep 2015 06:05:47 -0700 (PDT) X-Received: by 10.140.151.13 with SMTP id 13mr4281414qhx.41.1443618346989; Wed, 30 Sep 2015 06:05:46 -0700 (PDT) Received: from myware.local (pool-173-52-197-100.nycmny.fios.verizon.net. [173.52.197.100]) by smtp.gmail.com with ESMTPSA id 4sm182818qhr.33.2015.09.30.06.05.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Sep 2015 06:05:46 -0700 (PDT) Received: from myware.local (localhost.localdomain [127.0.0.1]) by myware.local (8.15.2/8.14.9) with ESMTP id t8UD5jn0008718 for ; Wed, 30 Sep 2015 09:05:46 -0400 Received: (from drepper@localhost) by myware.local (8.15.2/8.15.2/Submit) id t8UD5jC1008717; Wed, 30 Sep 2015 09:05:45 -0400 From: Ulrich Drepper To: gcc-patches@gcc.gnu.org Subject: JIT breakage after last builtin-types change Date: Wed, 30 Sep 2015 09:05:45 -0400 Message-ID: <871tdgf45y.fsf@gmail.com> MIME-Version: 1.0 After some recent additions to builtin-types.def the jit user of the definitions hasn't been updated. OK to apply? 2015-09-30 Ulrich Drepper * jit-builtins.c: Provide definition of DEF_FUNCTION_TYPE_VAR_6. * jit-builtins.h: Likewise. jit-builtins.c | 5 +++++ jit-builtins.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gcc/jit/jit-builtins.c b/gcc/jit/jit-builtins.c index a29f446..8a89915 100644 --- a/gcc/jit/jit-builtins.c +++ b/gcc/jit/jit-builtins.c @@ -320,6 +320,10 @@ builtins_manager::make_type (enum jit_builtin_type type_id) #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ case ENUM: return make_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, \ ARG4, ARG5); +#define DEF_FUNCTION_TYPE_VAR_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6) \ + case ENUM: return make_fn_type (ENUM, RETURN, 1, 6, ARG1, ARG2, ARG3, \ + ARG4, ARG5, ARG6); #define DEF_FUNCTION_TYPE_VAR_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7) \ case ENUM: return make_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, \ @@ -350,6 +354,7 @@ builtins_manager::make_type (enum jit_builtin_type type_id) #undef DEF_FUNCTION_TYPE_VAR_3 #undef DEF_FUNCTION_TYPE_VAR_4 #undef DEF_FUNCTION_TYPE_VAR_5 +#undef DEF_FUNCTION_TYPE_VAR_6 #undef DEF_FUNCTION_TYPE_VAR_7 #undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE diff --git a/gcc/jit/jit-builtins.h b/gcc/jit/jit-builtins.h index fdf1323..8854326 100644 --- a/gcc/jit/jit-builtins.h +++ b/gcc/jit/jit-builtins.h @@ -50,6 +50,8 @@ enum jit_builtin_type #define DEF_FUNCTION_TYPE_VAR_4(NAME, RETURN, ARG1, ARG2, ARG3, ARG4) NAME, #define DEF_FUNCTION_TYPE_VAR_5(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ NAME, +#define DEF_FUNCTION_TYPE_VAR_6(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6) NAME, #define DEF_FUNCTION_TYPE_VAR_7(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7) NAME, #define DEF_FUNCTION_TYPE_VAR_11(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ @@ -72,6 +74,7 @@ enum jit_builtin_type #undef DEF_FUNCTION_TYPE_VAR_3 #undef DEF_FUNCTION_TYPE_VAR_4 #undef DEF_FUNCTION_TYPE_VAR_5 +#undef DEF_FUNCTION_TYPE_VAR_6 #undef DEF_FUNCTION_TYPE_VAR_7 #undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE