0
@@ -1,7 +1,5 @@
0
 *SVN*
0
 
0
-* Improve associations performance by avoiding named block arguments.  #11109 [adymo]
0
-
0
 * Ensure that modifying has_and_belongs_to_many actions clear the query cache.  Closes #10840 [john.andrews]
0
 
0
 * Fix issue where Table#references doesn't pass a :null option to a *_type attribute for polymorphic associations.  Closes #10753 [railsjitsu]

0
@@ -43,8 +43,8 @@ module ActiveRecord
0
       end
0
 
0
       # Calculate sum using SQL, not Enumerable
0
-      def sum(*args)
0
-        calculate(:sum, *args) { |*block_args| yield(*block_args) if block_given? }
0
+      def sum(*args, &block)
0
+        calculate(:sum, *args, &block)
0
       end
0
 
0
       # Remove +records+ from this association.  Does not destroy +records+.
0
@@ -121,9 +121,9 @@ module ActiveRecord
0
         size.zero?
0
       end
0
 
0
-      def any?
0
+      def any?(&block)
0
         if block_given?
0
-          method_missing(:any?) { |*block_args| yield(*block_args) if block_given? }
0
+          method_missing(:any?, &block)
0
         else
0
           !empty?
0
         end
0
@@ -157,13 +157,11 @@ module ActiveRecord
0
 
0
 
0
       protected
0
-        def method_missing(method, *args)
0
+        def method_missing(method, *args, &block)
0
           if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
0
-            super { |*block_args| yield(*block_args) if block_given? }
0
+            super
0
           else
0
-            @reflection.klass.send(:with_scope, construct_scope) {
0
-                @reflection.klass.send(method, *args) { |*block_args| yield(*block_args) if block_given? }
0
-            }
0
+            @reflection.klass.send(:with_scope, construct_scope) { @reflection.klass.send(method, *args, &block) }
0
           end
0
         end
0
 
0
@@ -189,15 +187,15 @@ module ActiveRecord
0
 
0
       private
0
 
0
-        def create_record(attrs)
0
+        def create_record(attrs, &block)
0
           ensure_owner_is_not_new
0
           record = @reflection.klass.send(:with_scope, :create => construct_scope[:create]) { @reflection.klass.new(attrs) }
0
-          add_record_to_target_with_callbacks(record) { |*block_args| yield(*block_args) if block_given? }
0
+          add_record_to_target_with_callbacks(record, &block)
0
         end
0
 
0
-        def build_record(attrs)
0
+        def build_record(attrs, &block)
0
           record = @reflection.klass.new(attrs)
0
-          add_record_to_target_with_callbacks(record) { |*block_args| yield(*block_args) if block_given? }
0
+          add_record_to_target_with_callbacks(record, &block)
0
         end
0
 
0
         def add_record_to_target_with_callbacks(record)

0
@@ -78,12 +78,6 @@ module ActiveRecord
0
         @target.inspect
0
       end
0
 
0
-      def to_xml(options={}, &block)
0
-        if load_target
0
-          @target.to_xml(options, &block)
0
-        end
0
-      end
0
-
0
       protected
0
         def dependent?
0
           @reflection.options[:dependent]
0
@@ -126,9 +120,9 @@ module ActiveRecord
0
         end
0
 
0
       private
0
-        def method_missing(method, *args)
0
+        def method_missing(method, *args, &block)
0
           if load_target
0
-            @target.send(method, *args)  { |*block_args| yield(*block_args) if block_given? }
0
+            @target.send(method, *args, &block)
0
           end
0
         end
0
 

0
@@ -113,8 +113,8 @@ module ActiveRecord
0
       end
0
 
0
       # Calculate sum using SQL, not Enumerable
0
-      def sum(*args)
0
-        calculate(:sum, *args) { |*block_args| yield(*block_args) if block_given? }
0
+      def sum(*args, &block)
0
+        calculate(:sum, *args, &block)
0
       end
0
       
0
       def count(*args)
0
@@ -128,13 +128,11 @@ module ActiveRecord
0
       end
0
 
0
       protected
0
-        def method_missing(method, *args)
0
+        def method_missing(method, *args, &block)
0
           if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
0
-            super { |*block_args| yield(*block_args) if block_given? }
0
+            super
0
           else
0
-            @reflection.klass.send(:with_scope, construct_scope) {
0
-                @reflection.klass.send(method, *args) { |*block_args| yield(*block_args) if block_given? }
0
-            }
0
+            @reflection.klass.send(:with_scope, construct_scope) { @reflection.klass.send(method, *args, &block) }
0
           end
0
         end
0