From 9bf9de3d9d2f67bc401151fb94abf75b5eff5913 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Tue, 17 Dec 2019 14:52:15 +0900
Subject: Made the warning for deprecated constants follow the category flag

---
 error.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'error.c')

diff --git a/error.c b/error.c
index 9da36ae2e3..4cb17df292 100644
--- a/error.c
+++ b/error.c
@@ -129,32 +129,38 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column,
 }
 
 static unsigned int warning_disabled_categories;
-#define RB_WARN_CATEGORY_DEPRECATED 1
 
 static unsigned int
 rb_warning_category_mask(VALUE category)
 {
-    unsigned int mask = 0;
+    return 1U << rb_warning_category_from_name(category);
+}
+
+rb_warning_category_t
+rb_warning_category_from_name(VALUE category)
+{
+    rb_warning_category_t cat = RB_WARN_CATEGORY_NONE;
     Check_Type(category, T_SYMBOL);
     if (category == ID2SYM(rb_intern("deprecated"))) {
-        mask = RB_WARN_CATEGORY_DEPRECATED;
+        cat = RB_WARN_CATEGORY_DEPRECATED;
     }
     else {
         rb_raise(rb_eArgError, "unknown category: %"PRIsVALUE, category);
     }
-    return mask;
+    return cat;
 }
 
-static int
-rb_warning_category_enabled_p(VALUE category)
+MJIT_FUNC_EXPORTED bool
+rb_warning_category_enabled_p(rb_warning_category_t category)
 {
-    return !(warning_disabled_categories & rb_warning_category_mask(category));
+    return !(warning_disabled_categories & (1U << category));
 }
 
 static VALUE
 rb_warning_s_aref(VALUE mod, VALUE category)
 {
-    if (rb_warning_category_enabled_p(category))
+    rb_warning_category_t cat = rb_warning_category_from_name(category);
+    if (rb_warning_category_enabled_p(cat))
         return Qtrue;
     return Qfalse;
 }
-- 
cgit v1.2.3