1 files changed, 8 insertions, 2 deletions

diff --git a/string.c b/string.c
index 696a24b7fc..2d5e20984b 100644
--- a/string.c
+++ b/string.c
@@ -46,6 +46,7 @@
 #include "ruby/util.h"
 #include "ruby_assert.h"
 #include "vm_sync.h"
+#include "ruby/internal/attr/nonstring.h"

 #if defined HAVE_CRYPT_R
 # if defined HAVE_CRYPT_H
@@ -2346,9 +2347,14 @@ rb_str_with_debug_created_info(VALUE str, VALUE path, int line)
 }

 /*
+ * The documentation block below uses an include (instead of inline text)
+ * because the included text has non-ASCII characters (which are not allowed in a C file).
+ */
+
+/*
 *
 * call-seq:
- * String.new(string = '', **opts) -> new_string
+ * String.new(string = ''.encode(Encoding::ASCII_8BIT) , **options) -> new_string
 *
 * :include: doc/string/new.rdoc
 *
@@ -11971,7 +11977,7 @@ enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl, int cr)
 encidx = rb_enc_to_index(enc);

 #define DEFAULT_REPLACE_CHAR(str) do { \
- static const char replace[sizeof(str)-1] = str; \
+ RBIMPL_ATTR_NONSTRING() static const char replace[sizeof(str)-1] = str; \
 rep = replace; replen = (int)sizeof(replace); \
 } while (0)