merge revision(s) 74b19e330adbdae2d8e53b58f1a2a7b725e69c8d: [Backport #16268]

	fix imemo entry description.

	* ext/objspace/objspace.c (count_imemo_objects): `imemo_type_ids`
	  should be match with `enum imemo_type` in internal.h and this
	  patch fix mismatch.


	git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
	---
	 ext/objspace/objspace.c        | 5 +++--
	 test/objspace/test_objspace.rb | 2 ++
	 2 files changed, 5 insertions(+), 2 deletions(-)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 3 deletions

diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 1ac69af844..a811441320 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -617,7 +617,7 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self)
     VALUE hash = setup_hash(argc, argv);
 
     if (imemo_type_ids[0] == 0) {
-	imemo_type_ids[0] = rb_intern("imemo_none");
+	imemo_type_ids[0] = rb_intern("imemo_env");
 	imemo_type_ids[1] = rb_intern("imemo_cref");
 	imemo_type_ids[2] = rb_intern("imemo_svar");
 	imemo_type_ids[3] = rb_intern("imemo_throw_data");
@@ -626,7 +626,8 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self)
 	imemo_type_ids[6] = rb_intern("imemo_ment");
 	imemo_type_ids[7] = rb_intern("imemo_iseq");
 	imemo_type_ids[8] = rb_intern("imemo_tmpbuf");
-	imemo_type_ids[9] = rb_intern("imemo_parser_strterm");
+        imemo_type_ids[9] = rb_intern("imemo_ast");
+	imemo_type_ids[10] = rb_intern("imemo_parser_strterm");
     }
 
     rb_objspace_each_objects(count_imemo_objects_i, (void *)hash);
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 947170203a..f139b90efe 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -98,6 +98,8 @@ class TestObjSpace < Test::Unit::TestCase
     res = ObjectSpace.count_imemo_objects
     assert_not_empty(res)
     assert_not_nil(res[:imemo_cref])
+    assert_not_empty res.inspect
+
     arg = {}
     res = ObjectSpace.count_imemo_objects(arg)
     assert_not_empty(res)
diff --git a/version.h b/version.h
index 408caf48a4..cb482e2a15 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.6.7"
 #define RUBY_RELEASE_DATE "2021-02-28"
-#define RUBY_PATCHLEVEL 154
+#define RUBY_PATCHLEVEL 155
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 2