* ext/objspace/objspace.c (total_i): fix to skip no ruby objects.

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

2 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 98f6c9855f..f0e6b890af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 13 04:42:24 2011  Koichi Sasada  <[email protected]>
+
+	* ext/objspace/objspace.c (total_i): fix to skip no ruby objects.
+
 Mon Jun 13 03:07:38 2011  NARUSE, Yui  <[email protected]>
 
 	* test/benchmark/test_benchmark.rb (capture_output):
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 8e8b29f6e9..3434a0ae07 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -185,8 +185,19 @@ total_i(void *vstart, void *vend, size_t stride, void *ptr)
 
     for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
 	if (RBASIC(v)->flags) {
-	    if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
-		data->total += memsize_of(v);
+	    switch (BUILTIN_TYPE(v)) {
+	      case T_NONE:
+	      case T_ICLASS:
+	      case T_NODE:
+	      case T_ZOMBIE:
+		continue;
+	      case T_CLASS:
+		if (FL_TEST(v, FL_SINGLETON))
+		  continue;
+	      default:
+		if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
+		    data->total += memsize_of(v);
+		}
 	    }
 	}
     }