cleanup patch generation to preseve comments and remove @patch

test/dart_codegen/expect/typed_data/typed_data

Index: test/dart_codegen/expect/typed_data/typed_data
diff --git a/test/dart_codegen/expect/typed_data/typed_data b/test/dart_codegen/expect/typed_data/typed_data
index 2862f48fd81f0c39102131c65dd2e48cfa359003..09793bde1998fa61eaf192a76eda8cd6be8f39be 100644
--- a/test/dart_codegen/expect/typed_data/typed_data
+++ b/test/dart_codegen/expect/typed_data/typed_data
@@ -41,7 +41,7 @@ class Endianness {
   final bool _littleEndian;
 }
 abstract class ByteData implements TypedData {
-  @patch factory ByteData(int length) = NativeByteData;
+  factory ByteData(int length) = NativeByteData;
   factory ByteData.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
     return buffer.asByteData(offsetInBytes, length);
@@ -78,9 +78,8 @@ abstract class ByteData implements TypedData {
       [Endianness endian = Endianness.BIG_ENDIAN]);
 }
 abstract class Int8List implements List<int>, TypedData {
-  @patch factory Int8List(int length) = NativeInt8List;
-  @patch factory Int8List.fromList(
-      List<int> elements) = NativeInt8List.fromList;
+  factory Int8List(int length) = NativeInt8List;
+  factory Int8List.fromList(List<int> elements) = NativeInt8List.fromList;
   factory Int8List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
     return buffer.asInt8List(offsetInBytes, length);
@@ -88,9 +87,8 @@ abstract class Int8List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 1;
 }
 abstract class Uint8List implements List<int>, TypedData {
-  @patch factory Uint8List(int length) = NativeUint8List;
-  @patch factory Uint8List.fromList(
-      List<int> elements) = NativeUint8List.fromList;
+  factory Uint8List(int length) = NativeUint8List;
+  factory Uint8List.fromList(List<int> elements) = NativeUint8List.fromList;
   factory Uint8List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
     return buffer.asUint8List(offsetInBytes, length);
@@ -98,8 +96,8 @@ abstract class Uint8List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 1;
 }
 abstract class Uint8ClampedList implements List<int>, TypedData {
-  @patch factory Uint8ClampedList(int length) = NativeUint8ClampedList;
-  @patch factory Uint8ClampedList.fromList(
+  factory Uint8ClampedList(int length) = NativeUint8ClampedList;
+  factory Uint8ClampedList.fromList(
       List<int> elements) = NativeUint8ClampedList.fromList;
   factory Uint8ClampedList.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
@@ -108,9 +106,8 @@ abstract class Uint8ClampedList implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 1;
 }
 abstract class Int16List implements List<int>, TypedData {
-  @patch factory Int16List(int length) = NativeInt16List;
-  @patch factory Int16List.fromList(
-      List<int> elements) = NativeInt16List.fromList;
+  factory Int16List(int length) = NativeInt16List;
+  factory Int16List.fromList(List<int> elements) = NativeInt16List.fromList;
   factory Int16List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
     return buffer.asInt16List(offsetInBytes, length);
@@ -118,9 +115,8 @@ abstract class Int16List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 2;
 }
 abstract class Uint16List implements List<int>, TypedData {
-  @patch factory Uint16List(int length) = NativeUint16List;
-  @patch factory Uint16List.fromList(
-      List<int> elements) = NativeUint16List.fromList;
+  factory Uint16List(int length) = NativeUint16List;
+  factory Uint16List.fromList(List<int> elements) = NativeUint16List.fromList;
   factory Uint16List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
     return buffer.asUint16List(offsetInBytes, length);
@@ -128,9 +124,8 @@ abstract class Uint16List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 2;
 }
 abstract class Int32List implements List<int>, TypedData {
-  @patch factory Int32List(int length) = NativeInt32List;
-  @patch factory Int32List.fromList(
-      List<int> elements) = NativeInt32List.fromList;
+  factory Int32List(int length) = NativeInt32List;
+  factory Int32List.fromList(List<int> elements) = NativeInt32List.fromList;
   factory Int32List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
     return buffer.asInt32List(offsetInBytes, length);
@@ -138,9 +133,8 @@ abstract class Int32List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 4;
 }
 abstract class Uint32List implements List<int>, TypedData {
-  @patch factory Uint32List(int length) = NativeUint32List;
-  @patch factory Uint32List.fromList(
-      List<int> elements) = NativeUint32List.fromList;
+  factory Uint32List(int length) = NativeUint32List;
+  factory Uint32List.fromList(List<int> elements) = NativeUint32List.fromList;
   factory Uint32List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
     return buffer.asUint32List(offsetInBytes, length);
@@ -148,10 +142,10 @@ abstract class Uint32List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 4;
 }
 abstract class Int64List implements List<int>, TypedData {
-  @patch factory Int64List(int length) {
+  factory Int64List(int length) {
     throw new UnsupportedError("Int64List not supported by dart2js.");
   }
-  @patch factory Int64List.fromList(List<int> elements) {
+  factory Int64List.fromList(List<int> elements) {
     throw new UnsupportedError("Int64List not supported by dart2js.");
   }
   factory Int64List.view(ByteBuffer buffer,
@@ -161,10 +155,10 @@ abstract class Int64List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 8;
 }
 abstract class Uint64List implements List<int>, TypedData {
-  @patch factory Uint64List(int length) {
+  factory Uint64List(int length) {
     throw new UnsupportedError("Uint64List not supported by dart2js.");
   }
-  @patch factory Uint64List.fromList(List<int> elements) {
+  factory Uint64List.fromList(List<int> elements) {
     throw new UnsupportedError("Uint64List not supported by dart2js.");
   }
   factory Uint64List.view(ByteBuffer buffer,
@@ -174,8 +168,8 @@ abstract class Uint64List implements List<int>, TypedData {
   static const int BYTES_PER_ELEMENT = 8;
 }
 abstract class Float32List implements List<double>, TypedData {
-  @patch factory Float32List(int length) = NativeFloat32List;
-  @patch factory Float32List.fromList(
+  factory Float32List(int length) = NativeFloat32List;
+  factory Float32List.fromList(
       List<double> elements) = NativeFloat32List.fromList;
   factory Float32List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
@@ -184,8 +178,8 @@ abstract class Float32List implements List<double>, TypedData {
   static const int BYTES_PER_ELEMENT = 4;
 }
 abstract class Float64List implements List<double>, TypedData {
-  @patch factory Float64List(int length) = NativeFloat64List;
-  @patch factory Float64List.fromList(
+  factory Float64List(int length) = NativeFloat64List;
+  factory Float64List.fromList(
       List<double> elements) = NativeFloat64List.fromList;
   factory Float64List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
@@ -194,8 +188,8 @@ abstract class Float64List implements List<double>, TypedData {
   static const int BYTES_PER_ELEMENT = 8;
 }
 abstract class Float32x4List implements List<Float32x4>, TypedData {
-  @patch factory Float32x4List(int length) = NativeFloat32x4List;
-  @patch factory Float32x4List.fromList(
+  factory Float32x4List(int length) = NativeFloat32x4List;
+  factory Float32x4List.fromList(
       List<Float32x4> elements) = NativeFloat32x4List.fromList;
   factory Float32x4List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
@@ -204,8 +198,8 @@ abstract class Float32x4List implements List<Float32x4>, TypedData {
   static const int BYTES_PER_ELEMENT = 16;
 }
 abstract class Int32x4List implements List<Int32x4>, TypedData {
-  @patch factory Int32x4List(int length) = NativeInt32x4List;
-  @patch factory Int32x4List.fromList(
+  factory Int32x4List(int length) = NativeInt32x4List;
+  factory Int32x4List.fromList(
       List<Int32x4> elements) = NativeInt32x4List.fromList;
   factory Int32x4List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
@@ -214,8 +208,8 @@ abstract class Int32x4List implements List<Int32x4>, TypedData {
   static const int BYTES_PER_ELEMENT = 16;
 }
 abstract class Float64x2List implements List<Float64x2>, TypedData {
-  @patch factory Float64x2List(int length) = NativeFloat64x2List;
-  @patch factory Float64x2List.fromList(
+  factory Float64x2List(int length) = NativeFloat64x2List;
+  factory Float64x2List.fromList(
       List<Float64x2> elements) = NativeFloat64x2List.fromList;
   factory Float64x2List.view(ByteBuffer buffer,
       [int offsetInBytes = 0, int length]) {
@@ -224,14 +218,12 @@ abstract class Float64x2List implements List<Float64x2>, TypedData {
   static const int BYTES_PER_ELEMENT = 16;
 }
 abstract class Float32x4 {
-  @patch factory Float32x4(
-      double x, double y, double z, double w) = NativeFloat32x4;
-  @patch factory Float32x4.splat(double v) = NativeFloat32x4.splat;
-  @patch factory Float32x4.zero() = NativeFloat32x4.zero;
-  @patch factory Float32x4.fromInt32x4Bits(
+  factory Float32x4(double x, double y, double z, double w) = NativeFloat32x4;
+  factory Float32x4.splat(double v) = NativeFloat32x4.splat;
+  factory Float32x4.zero() = NativeFloat32x4.zero;
+  factory Float32x4.fromInt32x4Bits(
       Int32x4 x) = NativeFloat32x4.fromInt32x4Bits;
-  @patch factory Float32x4.fromFloat64x2(
-      Float64x2 v) = NativeFloat32x4.fromFloat64x2;
+  factory Float32x4.fromFloat64x2(Float64x2 v) = NativeFloat32x4.fromFloat64x2;
   Float32x4 operator +(Float32x4 other);
   Float32x4 operator -();
   Float32x4 operator -(Float32x4 other);
@@ -520,10 +512,9 @@ abstract class Float32x4 {
   Float32x4 reciprocalSqrt();
 }
 abstract class Int32x4 {
-  @patch factory Int32x4(int x, int y, int z, int w) = NativeInt32x4;
-  @patch factory Int32x4.bool(
-      bool x, bool y, bool z, bool w) = NativeInt32x4.bool;
-  @patch factory Int32x4.fromFloat32x4Bits(
+  factory Int32x4(int x, int y, int z, int w) = NativeInt32x4;
+  factory Int32x4.bool(bool x, bool y, bool z, bool w) = NativeInt32x4.bool;
+  factory Int32x4.fromFloat32x4Bits(
       Float32x4 x) = NativeInt32x4.fromFloat32x4Bits;
   Int32x4 operator |(Int32x4 other);
   Int32x4 operator &(Int32x4 other);
@@ -808,11 +799,10 @@ abstract class Int32x4 {
   Float32x4 select(Float32x4 trueValue, Float32x4 falseValue);
 }
 abstract class Float64x2 {
-  @patch factory Float64x2(double x, double y) = NativeFloat64x2;
-  @patch factory Float64x2.splat(double v) = NativeFloat64x2.splat;
-  @patch factory Float64x2.zero() = NativeFloat64x2.zero;
-  @patch factory Float64x2.fromFloat32x4(
-      Float32x4 v) = NativeFloat64x2.fromFloat32x4;
+  factory Float64x2(double x, double y) = NativeFloat64x2;
+  factory Float64x2.splat(double v) = NativeFloat64x2.splat;
+  factory Float64x2.zero() = NativeFloat64x2.zero;
+  factory Float64x2.fromFloat32x4(Float32x4 v) = NativeFloat64x2.fromFloat32x4;
   Float64x2 operator +(Float64x2 other);
   Float64x2 operator -();
   Float64x2 operator -(Float64x2 other);