Skip to content

Commit

Permalink
Remove taint and untrusted flags (#7958)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
nobu committed Jun 19, 2023
1 parent b8cd79c commit 512cac3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
11 changes: 2 additions & 9 deletions include/ruby/internal/fl_type.h
Expand Up @@ -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 */
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions yjit/src/cruby_bindings.inc.rs
Expand Up @@ -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;
Expand Down

0 comments on commit 512cac3

Please sign in to comment.