@@ -2105,21 +2105,33 @@ RoxorCore::copy_methods(Class from_class, Class to_class) continue; } + rb_vm_method_source_t *m_src = iter2->second; + + Method m = class_getInstanceMethod(to_class, sel); + if (m != NULL) { + // The method already exists - we need to JIT it. + IMP imp = GET_CORE()->compile(m_src->func); + resolve_method(to_class, sel, m_src->func, m_src->arity, + m_src->flags, imp, m); + } + else { #if ROXOR_VM_DEBUG - printf("lazy copy %c[%s %s] to %s\n", - class_isMetaClass(from_class) ? '+' : '-', - class_getName(from_class), - sel_getName(sel), - class_getName(to_class)); + printf("lazy copy %c[%s %s] to %c%s\n", + class_isMetaClass(from_class) ? '+' : '-', + class_getName(from_class), + sel_getName(sel), + class_isMetaClass(to_class) ? '+' : '-', + class_getName(to_class)); #endif - rb_vm_method_source_t *m = (rb_vm_method_source_t *) - malloc(sizeof(rb_vm_method_source_t)); - m->func = iter2->second->func; - m->arity = iter2->second->arity; - m->flags = iter2->second->flags; - dict->insert(std::make_pair(to_class, m)); - sels_to_add.push_back(sel); + rb_vm_method_source_t *m = (rb_vm_method_source_t *) + malloc(sizeof(rb_vm_method_source_t)); + m->func = m_src->func; + m->arity = m_src->arity; + m->flags = m_src->flags; + dict->insert(std::make_pair(to_class, m)); + sels_to_add.push_back(sel); + } } for (std::vector<SEL>::iterator i = sels_to_add.begin(); vm.cpp d73d4663a6b4b8b6b323d366adb93c2ee6c39d2d lsansonetti@apple.com lsansonetti@apple.com@23306eb0-4c56-4727-a40e-e92c0eb68959 http://github.com/masterkain/macruby/commit/2cbd6f478ff9efd1f8149f37875cb3f96169d3a5 2cbd6f478ff9efd1f8149f37875cb3f96169d3a5 2009-11-07T00:06:30-08:00 2009-11-07T00:06:30-08:00 when mixing a class with a module, make sure to JIT methods that already exist in the target class git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@2978 23306eb0-4c56-4727-a40e-e92c0eb68959 e6509e226a4c533265f40e31081cad6e478f93d9 lsansonetti@apple.com lsansonetti@apple.com@23306eb0-4c56-4727-a40e-e92c0eb68959