From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id A657E3858018 for ; Wed, 7 Feb 2024 12:44:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A657E3858018 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A657E3858018 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::12a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309859; cv=none; b=fm6b/T9fJvZkBCFTjmbflYOxDyHzKXLcLlWOfwIqU2631NFsyWP5whpiPhwQA5Aosty3zgaMFDU4SVFC1vp/H6xVnu72svp9Am7AL9s9JrrKK2nlfB6l5cMX6mj0cy/XNHG6jEWB++toXNz5kfdjj1PTKKDBvuExy6UF/XPZ7g4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309859; c=relaxed/simple; bh=IjkmwbATDhzOZYjeopKGdi6xRRxiNzAT4t4OddsU7MQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AM6cbp79GBKTgLa/Um1if7vVEPCtzLIG9lEnZ4wRvIWDT4kXrGwrV9h3zcV+Ri7kM/Vn1N4+M2PguyvzY7CP/SoQdPlNp+qZTVgWb2DEaO2tLpTFkUkxg1ODB4mQE1NZeuBw23PlEr70mT8isn9RoLJvGyy9t9FXrYMIdWraIZg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-5114cd44f6aso765142e87.1 for ; Wed, 07 Feb 2024 04:44:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1707309848; x=1707914648; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=ItWy1jd9IB0h/7EFl8Y/9+12Ai4pPLPuEY+pHZCzzbQ=; b=KG+nONC0g4aHftQBz4pVruYc3jmHFuAFpGrIAluVOCME+/wtoD9RqqN5bmRWrzz38M 9zBM1eYq3+SVVP7IRuZG5yCpxi78Tw4K6E+kSawAptKR5dwa6JzqhK+COegTPooqIv8v j/+lgg5oS/vxkOuojdonSfJoTihlUYOCbOjc+2K9sM9FmG/bXHRN1vXIfbscjeu/eD2t 7XiY4HTcCCJx6PlPdcLPxpH6JJ6g0F2Y9lYRYo5N5zfXRBUi3ZgdYSXNLc7zzSjGJkgw w26FfjOj+Rr+lCJ3f2tWT7SboRDqq+1S8QSxqGfJ19PaBKCRBJAixvXiHdLBl/BTyPqi afIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707309848; x=1707914648; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ItWy1jd9IB0h/7EFl8Y/9+12Ai4pPLPuEY+pHZCzzbQ=; b=wcZDpdN89boUbRYMLS+jIrTI1eC4eggTb/eoycqbYc+wBMtC6Ng+ossJGRGZCYi7AN 8kt27tl29+EeAwjxP+FcKuwRmTsXhvBecEVELwXoKzq5cnuO+fJ7OClba32YE7m/zGBY ROACRBUW8WLZhkKyxpKQhe/GNXtNyrbW08NZAtvtNZUqXey4RXD5Y9nc2eZWMBeDvG/j xmiLpHpus3ggkI7AzeHiMt92GsWdHEDQcK731+DHW7eytKvcWKrpmipBH3S49gCji3OR AXmWXipywkL10S3GUZ7Pzb1TKGkg1513PDq/7+6GpgRdnPFsrjgcqt7EVntIhZPxq87B Yc0A== X-Gm-Message-State: AOJu0YxauzioNvAiNuQuSpNJHA0s0YXxo2qSvJA0Le8NsmIaTCJDmML9 rfmBjNdQZvP4wj/nH28nEDZFAPZm5yAs3v1ob1wBWMENyYupBX4KIZ9C0dBarw== X-Google-Smtp-Source: AGHT+IGf2K2qdiIq50bpgw0KoA5N1QdLUL7XFajK5GnWwnv0bxgCJCBYtrqTX45BQpALlyc0qHzV1Q== X-Received: by 2002:a05:6512:33cc:b0:511:522f:12b with SMTP id d12-20020a05651233cc00b00511522f012bmr4893511lfg.14.1707309848180; Wed, 07 Feb 2024 04:44:08 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVcyqj7GNx9njgZETYgESLwA3jI595XGcFBWITGkQCUTM2svTM/QnNBk1+bzIP2p60kkpsqi0jVyHR+bogvmLMCrqIT Received: from platypus.sou.embecosm-corp.com ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id x19-20020a05600c2a5300b0040fbdd6f69bsm5044188wme.33.2024.02.07.04.44.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:44:07 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Nobel Singh Subject: [COMMITTED 09/25] gccrs: Set the default ABI to C for extern blocks and extern functions Date: Wed, 7 Feb 2024 12:43:55 +0100 Message-ID: <20240207114419.1100894-10-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240207114419.1100894-2-arthur.cohen@embecosm.com> References: <20240207114419.1100894-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Nobel Singh Previously, the default ABI was set to Rust, which is not correct for extern blocks and extern functions. This patch changes the default ABI to C for these cases. gcc/rust/ChangeLog: * hir/rust-ast-lower-base.cc (ASTLoweringBase::lower_qualifiers): Change default ABI to C for extern functions (ASTLoweringBase::lower_extern_block): Likewise Signed-off-by: Nobel Singh --- gcc/rust/hir/rust-ast-lower-base.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/rust/hir/rust-ast-lower-base.cc b/gcc/rust/hir/rust-ast-lower-base.cc index 748cec74829..19f20885209 100644 --- a/gcc/rust/hir/rust-ast-lower-base.cc +++ b/gcc/rust/hir/rust-ast-lower-base.cc @@ -718,8 +718,8 @@ ASTLoweringBase::lower_qualifiers (const AST::FunctionQualifiers &qualifiers) Unsafety unsafety = qualifiers.is_unsafe () ? Unsafety::Unsafe : Unsafety::Normal; bool has_extern = qualifiers.is_extern (); + ABI abi = has_extern ? ABI::C : ABI::RUST; - ABI abi = ABI::RUST; if (qualifiers.has_abi ()) { const std::string &extern_abi = qualifiers.get_extern_abi (); @@ -965,7 +965,7 @@ ASTLoweringBase::lower_extern_block (AST::ExternBlock &extern_block) extern_items.push_back (std::unique_ptr (lowered)); } - ABI abi = ABI::RUST; + ABI abi = ABI::C; if (extern_block.has_abi ()) { const std::string &extern_abi = extern_block.get_abi (); -- 2.42.1