1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby_scan_oct, ruby_scan_hex: are not pure

Browse Source 
Silly bug, they write back consumed bytes through passed pointers.  Must
never be pure functions.

ruby_scan_oct does not refer any static variables so it can still be
__declspec(noalias), while ruby_scan_hex is not because it reads from
ruby_digit36_to_number_table.
This commit is contained in:
卜部昌平 2021-09-09 12:20:40 +09:00
parent de2afff1b9
commit fd12bc1896
Notes: git 2021-09-10 20:01:03 +09:00 
Merged: https://github.com/ruby/ruby/pull/4815
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ruby/util.h
View File

@ -23,12 +23,11 @@
# include <sys/types.h> /* ssize_t */ # include <sys/types.h> /* ssize_t */
#endif #endif
#include "ruby/internal/attr/noalias.h"
#include "ruby/internal/attr/nodiscard.h" #include "ruby/internal/attr/nodiscard.h"
#include "ruby/internal/attr/nonnull.h" #include "ruby/internal/attr/nonnull.h"
#include "ruby/internal/attr/pure.h"
#include "ruby/internal/attr/restrict.h" #include "ruby/internal/attr/restrict.h"
#include "ruby/internal/attr/returns_nonnull.h" #include "ruby/internal/attr/returns_nonnull.h"
#include "ruby/internal/config.h"
#include "ruby/internal/dllexport.h" #include "ruby/internal/dllexport.h"
#include "ruby/defines.h" #include "ruby/defines.h"
@ -74,7 +73,7 @@ unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *r
/** @old{ruby_scan_oct} */ /** @old{ruby_scan_oct} */
#define scan_oct(s,l,e) ((int)ruby_scan_oct((s),(l),(e))) #define scan_oct(s,l,e) ((int)ruby_scan_oct((s),(l),(e)))
RBIMPL_ATTR_PURE() RBIMPL_ATTR_NOALIAS()
RBIMPL_ATTR_NONNULL(()) RBIMPL_ATTR_NONNULL(())
/** /**
* Interprets the passed string as an octal unsigned integer. Stops when * Interprets the passed string as an octal unsigned integer. Stops when
@ -97,7 +96,6 @@ unsigned long ruby_scan_oct(const char *str, size_t len, size_t *consumed);
/** @old{ruby_scan_hex} */ /** @old{ruby_scan_hex} */
#define scan_hex(s,l,e) ((int)ruby_scan_hex((s),(l),(e))) #define scan_hex(s,l,e) ((int)ruby_scan_hex((s),(l),(e)))
RBIMPL_ATTR_PURE()
RBIMPL_ATTR_NONNULL(()) RBIMPL_ATTR_NONNULL(())
/** /**
* Interprets the passed string a hexadecimal unsigned integer. Stops when * Interprets the passed string a hexadecimal unsigned integer. Stops when