1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 667445c6ce..094e38d314 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 22 11:23:35 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_setup_method): should not enable tail call
+	  optimization for frames with VM_FRAME_FLAG_FINISH.
+	  [ruby-dev:46065] [Bug #6901]
+
 Wed Aug 22 11:20:47 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/rubygems/test_case.rb: run test with psych if exist.