From 57011501d5c907b89d2854ebfb889d652024b4fc Mon Sep 17 00:00:00 2001
From: Antoni Boucher <bouanto@zoho.com>
Date: Mon, 12 May 2025 11:13:34 -0400
Subject: [PATCH] Fix for libgccjit 12

---
 src/attributes.rs    | 1 +
 src/intrinsic/mod.rs | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/attributes.rs b/src/attributes.rs
index f933119d0ba0..e63091c6082a 100644
--- a/src/attributes.rs
+++ b/src/attributes.rs
@@ -6,6 +6,7 @@ use rustc_attr_parsing::InlineAttr;
 use rustc_attr_parsing::InstructionSetAttr;
 #[cfg(feature = "master")]
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+#[cfg(feature = "master")]
 use rustc_middle::mir::TerminatorKind;
 use rustc_middle::ty;
 
diff --git a/src/intrinsic/mod.rs b/src/intrinsic/mod.rs
index 9caceca92957..f292c467418f 100644
--- a/src/intrinsic/mod.rs
+++ b/src/intrinsic/mod.rs
@@ -4,9 +4,7 @@ mod simd;
 #[cfg(feature = "master")]
 use std::iter;
 
-#[cfg(feature = "master")]
-use gccjit::FunctionType;
-use gccjit::{ComparisonOp, Function, RValue, ToRValue, Type, UnaryOp};
+use gccjit::{ComparisonOp, Function, FunctionType, RValue, ToRValue, Type, UnaryOp};
 #[cfg(feature = "master")]
 use rustc_abi::ExternAbi;
 use rustc_abi::{BackendRepr, HasDataLayout};