transpile: Remove override_ty param from convert_const_macro_expansion

Author: Rua

c2rust-transpile/src/translator/enums.rs

@@ -97,7 +97,7 @@ impl<'c> Translation<'c> {
                     if self.is_variant_of_enum(enum_id, enum_constant_id) =>
                 {
                     // `enum`s shouldn't need portable `override_ty`s.
-                    let expr_is_macro = self.expr_is_expanded_macro(ctx, expr, None);
+                    let expr_is_macro = self.expr_is_expanded_macro(ctx, expr);
 
                     // If this DeclRef expanded to a const macro, we actually need to insert a cast,
                     // because the translation of a const macro skips implicit casts in its context.

c2rust-transpile/src/translator/macros.rs

@@ -148,7 +148,6 @@ impl<'c> Translation<'c> {
         &self,
         ctx: ExprContext,
         expr_id: CExprId,
-        override_ty: Option<CQualTypeId>,
     ) -> TranslationResult<Option<WithStmts<Box<Expr>>>> {
         let macros = match self.ast_context.macro_invocations.get(&expr_id) {
             Some(macros) => macros.as_slice(),
@@ -201,6 +200,7 @@ impl<'c> Translation<'c> {
         // determined by the surrounding context.
         // Since the expansion sites are expecting a particular type, we need to cast it here
         // if it differs from the `const` type.
+        let override_ty = self.expr_override_types.get(&expr_id).copied();
         let expr_ty = override_ty.or_else(|| self.ast_context[expr_id].kind.get_qual_type());
         if let Some(expr_ty) = expr_ty {
             self.convert_cast(
@@ -249,14 +249,9 @@ impl<'c> Translation<'c> {
         ))))
     }
 
-    pub fn expr_is_expanded_macro(
-        &self,
-        ctx: ExprContext,
-        expr_id: CExprId,
-        override_ty: Option<CQualTypeId>,
-    ) -> bool {
+    pub fn expr_is_expanded_macro(&self, ctx: ExprContext, expr_id: CExprId) -> bool {
         matches!(
-            self.convert_const_macro_expansion(ctx, expr_id, override_ty),
+            self.convert_const_macro_expansion(ctx, expr_id),
             Ok(Some(_))
         )
     }

c2rust-transpile/src/translator/mod.rs

@@ -2339,7 +2339,7 @@ impl<'c> Translation<'c> {
             }
 
             CExprKind::Literal(_, ref literal @ CLiteral::Integer(0 | 1, _))
-                if !self.expr_is_expanded_macro(ctx, cond_id, None) =>
+                if !self.expr_is_expanded_macro(ctx, cond_id) =>
             {
                 // If there is a literal `0` or `1` here, translate them directly rather than
                 // with a comparison. But not if they're inside a macro; we want to keep that.
@@ -3000,7 +3000,7 @@ impl<'c> Translation<'c> {
 
         let override_ty = self.expr_override_types.get(&expr_id).copied();
 
-        if let Some(converted) = self.convert_const_macro_expansion(ctx, expr_id, override_ty)? {
+        if let Some(converted) = self.convert_const_macro_expansion(ctx, expr_id)? {
             return Ok(converted);
         }
 

c2rust-transpile/src/translator/operators.rs

@@ -913,7 +913,7 @@ impl<'c> Translation<'c> {
         if let (&CExprKind::Literal(_, CLiteral::Integer(val, base)), false, false) = (
             &self.ast_context[arg_id].kind,
             is_unsigned_integral_type,
-            self.expr_is_expanded_macro(ctx, arg_id, Some(expr_type_id)),
+            self.expr_is_expanded_macro(ctx, arg_id),
         ) {
             // If we are negating a literal, generate a negated literal directly.
             // This will create an expression like `-1 as ty` without parentheses,

c2rust-transpile/src/translator/pointers.rs

@@ -104,7 +104,7 @@ impl<'c> Translation<'c> {
             .ast_context
             .get_pointee_qual_type(pointer_cty.ctype)
             .ok_or_else(|| TranslationError::generic("Address-of should return a pointer"))?;
-        let arg_is_macro = arg.map_or(false, |arg| self.expr_is_expanded_macro(ctx, arg, None));
+        let arg_is_macro = arg.map_or(false, |arg| self.expr_is_expanded_macro(ctx, arg));
 
         let mut needs_cast = false;
         let mut ref_cast_pointee_ty = None;