diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-06-20 00:29:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 11:29:24 -0400 |
| commit | 512cac32400ce1f3acf77226a435d3e8cf7347c5 (patch) | |
| tree | 594156e10931a464ac0728d8f2d264ad2ce0667b | |
| parent | b8cd79c82fc0816a880e2a2cf77a6e6826a763a6 (diff) | |
Remove taint and untrusted flags (#7958)
* Make TAINT and UNTRUSTED flags zero
These flags do nothing already, and should break nothing.
* Remove TAINT and UNTRUSTED macros same as functions
These macros had been defined to use with `#ifdef`, but should not be
used anymore.
Notes
Notes:
Merged-By: maximecb <maximecb@ruby-lang.org>
| -rw-r--r-- | include/ruby/internal/fl_type.h | 11 | ||||
| -rw-r--r-- | yjit/src/cruby_bindings.inc.rs | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/include/ruby/internal/fl_type.h b/include/ruby/internal/fl_type.h index 555f23a5a5..d59c258a3f 100644 --- a/include/ruby/internal/fl_type.h +++ b/include/ruby/internal/fl_type.h @@ -111,13 +111,6 @@ #define RB_OBJ_FREEZE_RAW RB_OBJ_FREEZE_RAW #define RB_OBJ_FROZEN RB_OBJ_FROZEN #define RB_OBJ_FROZEN_RAW RB_OBJ_FROZEN_RAW -#define RB_OBJ_INFECT RB_OBJ_INFECT -#define RB_OBJ_INFECT_RAW RB_OBJ_INFECT_RAW -#define RB_OBJ_TAINT RB_OBJ_TAINT -#define RB_OBJ_TAINTABLE RB_OBJ_TAINTABLE -#define RB_OBJ_TAINTED RB_OBJ_TAINTED -#define RB_OBJ_TAINTED_RAW RB_OBJ_TAINTED_RAW -#define RB_OBJ_TAINT_RAW RB_OBJ_TAINT_RAW #define RB_OBJ_UNTRUST RB_OBJ_TAINT #define RB_OBJ_UNTRUSTED RB_OBJ_TAINTED /** @endcond */ @@ -283,7 +276,7 @@ ruby_fl_type { # pragma deprecated(RUBY_FL_TAINT) #endif - = (1<<8), + = 0, /** * This flag has something to do with Ractor. Multiple Ractors run without @@ -310,7 +303,7 @@ ruby_fl_type { # pragma deprecated(RUBY_FL_UNTRUSTED) #endif - = (1<<8), + = 0, /** * This flag has something to do with object IDs. Unlike in the old days, diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs index 586a8f0156..553f9cdbea 100644 --- a/yjit/src/cruby_bindings.inc.rs +++ b/yjit/src/cruby_bindings.inc.rs @@ -196,9 +196,9 @@ pub const RUBY_FL_PROMOTED0: ruby_fl_type = 32; pub const RUBY_FL_PROMOTED1: ruby_fl_type = 64; pub const RUBY_FL_PROMOTED: ruby_fl_type = 96; pub const RUBY_FL_FINALIZE: ruby_fl_type = 128; -pub const RUBY_FL_TAINT: ruby_fl_type = 256; +pub const RUBY_FL_TAINT: ruby_fl_type = 0; pub const RUBY_FL_SHAREABLE: ruby_fl_type = 256; -pub const RUBY_FL_UNTRUSTED: ruby_fl_type = 256; +pub const RUBY_FL_UNTRUSTED: ruby_fl_type = 0; pub const RUBY_FL_SEEN_OBJ_ID: ruby_fl_type = 512; pub const RUBY_FL_EXIVAR: ruby_fl_type = 1024; pub const RUBY_FL_FREEZE: ruby_fl_type = 2048; |