aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 3 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fee4554ae..3e6f0aa445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,7 @@
-Thu Jul 16 14:18:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (m_core_hash_merge_ptr): copy the arguments to the machine
- stack before rewinding the control frame pointer and leaving the
- arguments outside valid region of the value stack.
- [ruby-core:69969] [Bug #11352]
+Thu Jul 16 14:34:24 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm.c (REWIND_CFP): keep the arguments region inside the valid
+ value stack. [ruby-core:69969] [Bug #11352]
Thu Jul 16 11:38:21 2015 Eric Wong <e@80x24.org>