--- a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template	Thu Sep 01 10:16:57 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template	Thu Sep 01 10:17:01 2016 -0700
@@ -231,12 +231,6 @@
                                        value);
         }
 
-        @ForceInline
-        static $type$ addAndGet(FieldInstanceReadWrite handle, Object holder, $type$ value) {
-            return {#if[ShorterThanInt]?($type$)}(UNSAFE.getAndAdd$Type$(Objects.requireNonNull(handle.receiverType.cast(holder)),
-                                       handle.fieldOffset,
-                                       value) + value);
-        }
 #end[AtomicAdd]
 #if[Bitwise]
 
@@ -504,13 +498,6 @@
                                        handle.fieldOffset,
                                        value);
         }
-
-        @ForceInline
-        static $type$ addAndGet(FieldStaticReadWrite handle, $type$ value) {
-            return {#if[ShorterThanInt]?($type$)}(UNSAFE.getAndAdd$Type$(handle.base,
-                                       handle.fieldOffset,
-                                       value) + value);
-        }
 #end[AtomicAdd]
 #if[Bitwise]
 
@@ -860,14 +847,6 @@
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     value);
         }
-
-        @ForceInline
-        static $type$ addAndGet(Array handle, Object oarray, int index, $type$ value) {
-            $type$[] array = ($type$[]) oarray;
-            return {#if[ShorterThanInt]?($type$)}(UNSAFE.getAndAdd$Type$(array,
-                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
-                    value) + value);
-        }
 #end[AtomicAdd]
 #if[Bitwise]