Revert non-proc allocator fix because it breaks tb. Work with them fo…

…r different soln for 1.7.0
dekellum · Sep 10, 2012 · 34b46fe · 34b46fe
1 parent 8b966d6
commit 34b46fe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/spec/regression/JRUBY-6810_proc_should_not_have_allocator_spec.rb b/spec/regression/JRUBY-6810_proc_should_not_have_allocator_spec.rb
diff --git a/src/org/jruby/RubyProc.java b/src/org/jruby/RubyProc.java
@@ -75,9 +75,19 @@ protected RubyProc(Ruby runtime, RubyClass rubyClass, Block.Type type, ISourcePo
         this(runtime, rubyClass, type);
         this.sourcePosition = sourcePosition;
     }
+
+    private static ObjectAllocator PROC_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            RubyProc instance = new RubyProc(runtime, runtime.getProc(), Block.Type.PROC);
+
+            instance.setMetaClass(klass);
+
+            return instance;
+        }
+    };
 
     public static RubyClass createProcClass(Ruby runtime) {
-        RubyClass procClass = runtime.defineClass("Proc", runtime.getObject(), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR);
+        RubyClass procClass = runtime.defineClass("Proc", runtime.getObject(), PROC_ALLOCATOR);
         runtime.setProc(procClass);
 
         procClass.index = ClassIndex.PROC;
@@ -126,7 +136,7 @@ public static IRubyObject newInstance(ThreadContext context, IRubyObject recv, I
             return block.getProcObject();
         }
 
-        RubyProc obj = new RubyProc(context.runtime, (RubyClass)recv, Block.Type.PROC);
+        RubyProc obj = (RubyProc)((RubyClass) recv).allocate();
         obj.setup(block);
 
         obj.callMethod(context, "initialize", args, block);