Run cleanup code in ensure

Author: nobu

test/ruby/test_marshal.rb

@@ -653,10 +653,10 @@ def test_unloadable_data
       Marshal.load(d)
     }
 
-    # cleanup
+  ensure
     self.class.class_eval do
       remove_const name
-    end
+    end if c
   end
 
   def test_unloadable_userdef
@@ -670,10 +670,10 @@ class << c
       Marshal.load(d)
     }
 
-    # cleanup
+  ensure
     self.class.class_eval do
       remove_const name
-    end
+    end if c
   end
 
   def test_recursive_userdef