summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-15 09:06:51 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-15 09:06:51 +0000
commitb3b786c580995b31dcc0259890cefdb1385998c6 (patch)
treeb82de67ce779080872763553249b2e0f048f50c5
parent3dd206734981b74f14dc1fe61363c5e7313b92d9 (diff)
merge revision(s) 66767: [Backport #15399]
insns.def (duparray, duphash): add dtrace hooks They are considered Array and Hash creation events, so allow dtrace (and systemtap) to track those creations. Co-Authored-By: Eric Wong <e@80x24.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--insns.def2
-rw-r--r--version.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/insns.def b/insns.def
index 983a20fa3f..6c62f99770 100644
--- a/insns.def
+++ b/insns.def
@@ -451,6 +451,7 @@ duparray
()
(VALUE val)
{
+ RUBY_DTRACE_CREATE_HOOK(ARRAY, RARRAY_LEN(ary));
val = rb_ary_resurrect(ary);
}
@@ -461,6 +462,7 @@ duphash
()
(VALUE val)
{
+ RUBY_DTRACE_CREATE_HOOK(HASH, RHASH_SIZE(hash) << 1);
val = rb_hash_resurrect(hash);
}
diff --git a/version.h b/version.h
index 66b99392a5..7ee71d5721 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.0"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 13
+#define RUBY_PATCHLEVEL 14
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1