const folding: rename try_get_const_int_value -> try_get_const_value

Author: Firestar99

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -45,7 +45,7 @@ enum ConstValue {
 }
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
-    fn try_get_const_int_value(&self, val: SpirvValue) -> Option<ConstValue> {
+    fn try_get_const_value(&self, val: SpirvValue) -> Option<ConstValue> {
         if let Some(const_val) = self.builder.lookup_const(val) {
             let x = match const_val {
                 SpirvConst::Scalar(x) => x,
@@ -88,8 +88,8 @@ macro_rules! simple_op {
             assert_ty_eq!(self, lhs.ty, rhs.ty);
             let result_type = lhs.ty;
 
-            $(if let Some(const_lhs) = self.try_get_const_int_value(lhs) {
-                if let Some(const_rhs) = self.try_get_const_int_value(rhs) {
+            $(if let Some(const_lhs) = self.try_get_const_value(lhs) {
+                if let Some(const_rhs) = self.try_get_const_value(rhs) {
                     #[allow(unreachable_patterns)]
                     match (const_lhs, const_rhs) {
                         $(
@@ -152,8 +152,8 @@ macro_rules! simple_shift_op {
         fn $func_name(&mut self, lhs: Self::Value, rhs: Self::Value) -> Self::Value {
             let result_type = lhs.ty;
 
-            $(if let Some(const_lhs) = self.try_get_const_int_value(lhs) {
-                if let Some(const_rhs) = self.try_get_const_int_value(rhs) {
+            $(if let Some(const_lhs) = self.try_get_const_value(lhs) {
+                if let Some(const_rhs) = self.try_get_const_value(rhs) {
                     #[allow(unreachable_patterns)]
                     match (const_lhs, const_rhs) {
                         $(
@@ -219,7 +219,7 @@ macro_rules! simple_uni_op {
 
             $(
                 #[allow(unreachable_patterns, clippy::collapsible_match)]
-                if let Some(const_val) = self.try_get_const_int_value(val) {
+                if let Some(const_val) = self.try_get_const_value(val) {
                     match const_val {
                         $(
                             ConstValue::Unsigned($int_val) => return self.const_uint_big(result_type, $fold_int),
@@ -2612,8 +2612,8 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         assert_ty_eq!(self, lhs.ty, rhs.ty);
         let b = SpirvType::Bool.def(self.span(), self);
 
-        if let Some(const_lhs) = self.try_get_const_int_value(lhs) {
-            if let Some(const_rhs) = self.try_get_const_int_value(rhs) {
+        if let Some(const_lhs) = self.try_get_const_value(lhs) {
+            if let Some(const_rhs) = self.try_get_const_value(rhs) {
                 let const_result = match self.lookup_type(lhs.ty) {
                     SpirvType::Integer(_, _) => match (const_lhs, const_rhs, op) {
                         (ConstValue::Unsigned(lhs), ConstValue::Unsigned(rhs), IntEQ) => {
@@ -3072,7 +3072,7 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         assert_ty_eq!(self, then_val.ty, else_val.ty);
         let result_type = then_val.ty;
 
-        if let Some(const_cond) = self.try_get_const_int_value(cond) {
+        if let Some(const_cond) = self.try_get_const_value(cond) {
             if let ConstValue::Bool(b) = const_cond {
                 // as we directly return the values, it'll preserve their constness as well
                 return if b { then_val } else { else_val };