[fidlc] Remove remaining deprecated type fields
Fixed: 43957
Change-Id: I68b1894301e32eb25125294557b041b4f4ea50a4
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json
index f50a894..80355b9 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json
@@ -317,8 +317,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -366,8 +365,7 @@
"name": "Doc",
"value": " table field comment #1\n\n table field comment #3\n"
}
- ],
- "size": 4
+ ]
}
],
"strict": false,
@@ -416,9 +414,7 @@
"name": "Doc",
"value": " union member comment #1\n\n union member comment #3\n"
}
- ],
- "size": 4,
- "offset": 4
+ ]
}
],
"strict": true,
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/handles.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/handles.test.fidl.json
index a437fe1..073bbc1 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/handles.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/handles.test.fidl.json
@@ -34,8 +34,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -54,8 +53,7 @@
"field_shape_v1": {
"offset": 4,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -74,8 +72,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -94,8 +91,7 @@
"field_shape_v1": {
"offset": 12,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -114,8 +110,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -134,8 +129,7 @@
"field_shape_v1": {
"offset": 20,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -154,8 +148,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -174,8 +167,7 @@
"field_shape_v1": {
"offset": 28,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -194,8 +186,7 @@
"field_shape_v1": {
"offset": 32,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -214,8 +205,7 @@
"field_shape_v1": {
"offset": 36,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -234,8 +224,7 @@
"field_shape_v1": {
"offset": 40,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -254,8 +243,7 @@
"field_shape_v1": {
"offset": 44,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -274,8 +262,7 @@
"field_shape_v1": {
"offset": 48,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -294,8 +281,7 @@
"field_shape_v1": {
"offset": 52,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -314,8 +300,7 @@
"field_shape_v1": {
"offset": 56,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -334,8 +319,7 @@
"field_shape_v1": {
"offset": 60,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -354,8 +338,7 @@
"field_shape_v1": {
"offset": 64,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -374,8 +357,7 @@
"field_shape_v1": {
"offset": 68,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -394,8 +376,7 @@
"field_shape_v1": {
"offset": 72,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -414,8 +395,7 @@
"field_shape_v1": {
"offset": 76,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -434,8 +414,7 @@
"field_shape_v1": {
"offset": 80,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -454,8 +433,7 @@
"field_shape_v1": {
"offset": 84,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -474,8 +452,7 @@
"field_shape_v1": {
"offset": 88,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -494,8 +471,7 @@
"field_shape_v1": {
"offset": 92,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -514,8 +490,7 @@
"field_shape_v1": {
"offset": 96,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -534,8 +509,7 @@
"field_shape_v1": {
"offset": 100,
"padding": 0
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json
index d5aeb3d..8249ac5 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json
@@ -61,8 +61,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix1",
@@ -116,8 +115,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix3",
@@ -159,8 +157,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix4",
@@ -203,8 +200,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix5",
@@ -250,8 +246,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -289,8 +284,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -328,8 +322,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -367,8 +360,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json
index f57e863..d9e36a0 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json
@@ -159,8 +159,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix4",
@@ -201,8 +200,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix5",
@@ -244,8 +242,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix6",
@@ -298,8 +295,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix8",
@@ -329,8 +325,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix9",
@@ -396,8 +391,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix11",
@@ -461,8 +455,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 32
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix13",
@@ -516,8 +509,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix15",
@@ -571,8 +563,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix17",
@@ -629,8 +620,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -646,8 +636,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix18",
@@ -690,8 +679,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -707,8 +695,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix19",
@@ -749,8 +736,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -766,8 +752,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix20",
@@ -797,8 +782,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix21",
@@ -842,8 +826,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_request_payload": "test.name/SomeLongAnonymousPrefix22",
@@ -876,8 +859,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix23",
@@ -921,8 +903,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -959,8 +940,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -997,8 +977,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -1035,8 +1014,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -1073,8 +1051,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -1111,8 +1088,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -1149,8 +1125,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -1166,8 +1141,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -1183,8 +1157,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -1222,8 +1195,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 32
+ }
}
],
"type_shape_v1": {
@@ -1281,8 +1253,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -1340,8 +1311,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -1378,8 +1348,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -1395,8 +1364,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -1433,8 +1401,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -1450,8 +1417,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -1488,8 +1454,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -1505,8 +1470,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -1543,8 +1507,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -1584,8 +1547,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -1625,8 +1587,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -1670,9 +1631,7 @@
"filename": "generated",
"line": 16,
"column": 1
- },
- "size": 24,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -1686,9 +1645,7 @@
"filename": "generated",
"line": 17,
"column": 1
- },
- "size": 4,
- "offset": 8
+ }
}
],
"strict": true,
@@ -1730,9 +1687,7 @@
"filename": "generated",
"line": 23,
"column": 1
- },
- "size": 1,
- "offset": 4
+ }
},
{
"xunion_ordinal": 2,
@@ -1746,9 +1701,7 @@
"filename": "generated",
"line": 24,
"column": 1
- },
- "size": 4,
- "offset": 4
+ }
}
],
"strict": true,
@@ -1790,9 +1743,7 @@
"filename": "generated",
"line": 30,
"column": 1
- },
- "size": 1,
- "offset": 4
+ }
},
{
"xunion_ordinal": 2,
@@ -1807,9 +1758,7 @@
"filename": "generated",
"line": 31,
"column": 1
- },
- "size": 4,
- "offset": 4
+ }
}
],
"strict": true,
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/struct_inline.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/struct_inline.test.fidl.json
index 7cedbe7..4a6b821 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/struct_inline.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/struct_inline.test.fidl.json
@@ -31,8 +31,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
},
{
"type": {
@@ -48,8 +47,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/tables.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/tables.test.fidl.json
index 2b3c86c..4c18ad6 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/tables.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/tables.test.fidl.json
@@ -49,8 +49,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 7,
"column": 14
- },
- "size": 8
+ }
},
{
"ordinal": 2,
@@ -59,8 +58,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 8,
"column": 5
- },
- "size": 0
+ }
},
{
"ordinal": 3,
@@ -69,8 +67,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 9,
"column": 5
- },
- "size": 0
+ }
},
{
"ordinal": 4,
@@ -79,8 +76,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 10,
"column": 5
- },
- "size": 0
+ }
},
{
"ordinal": 5,
@@ -94,8 +90,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 11,
"column": 14
- },
- "size": 8
+ }
}
],
"strict": false,
@@ -130,8 +125,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 15,
"column": 14
- },
- "size": 8
+ }
},
{
"ordinal": 2,
@@ -140,8 +134,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 16,
"column": 5
- },
- "size": 0
+ }
}
],
"strict": false,
@@ -176,8 +169,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 20,
"column": 14
- },
- "size": 8
+ }
},
{
"ordinal": 2,
@@ -186,8 +178,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 21,
"column": 5
- },
- "size": 0
+ }
},
{
"ordinal": 3,
@@ -196,8 +187,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 22,
"column": 5
- },
- "size": 0
+ }
},
{
"ordinal": 4,
@@ -206,8 +196,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 23,
"column": 5
- },
- "size": 0
+ }
},
{
"ordinal": 5,
@@ -221,8 +210,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 24,
"column": 14
- },
- "size": 8
+ }
},
{
"ordinal": 6,
@@ -236,8 +224,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 25,
"column": 14
- },
- "size": 8
+ }
},
{
"ordinal": 7,
@@ -246,8 +233,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 26,
"column": 5
- },
- "size": 0
+ }
}
],
"strict": false,
@@ -282,8 +268,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 30,
"column": 14
- },
- "size": 8
+ }
},
{
"ordinal": 2,
@@ -297,8 +282,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 31,
"column": 14
- },
- "size": 8
+ }
},
{
"ordinal": 1,
@@ -312,8 +296,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/tables.test.fidl",
"line": 32,
"column": 14
- },
- "size": 8
+ }
}
],
"strict": false,
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/union.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/union.test.fidl.json
index 9954ebd..381d596 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/union.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/union.test.fidl.json
@@ -32,8 +32,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -70,9 +69,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 4,
"column": 14
- },
- "size": 4,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -86,9 +83,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 5,
"column": 15
- },
- "size": 16,
- "offset": 8
+ }
},
{
"xunion_ordinal": 3,
@@ -106,9 +101,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 6,
"column": 23
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": true,
@@ -143,9 +136,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 10,
"column": 14
- },
- "size": 4,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -159,9 +150,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 11,
"column": 15
- },
- "size": 16,
- "offset": 8
+ }
},
{
"xunion_ordinal": 3,
@@ -179,9 +168,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 12,
"column": 23
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": false,
@@ -216,9 +203,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 16,
"column": 14
- },
- "size": 4,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -232,9 +217,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 17,
"column": 15
- },
- "size": 16,
- "offset": 8
+ }
},
{
"xunion_ordinal": 3,
@@ -252,9 +235,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 18,
"column": 23
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": true,
@@ -289,9 +270,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 22,
"column": 14
- },
- "size": 4,
- "offset": 4
+ }
}
],
"strict": true,
@@ -326,9 +305,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 27,
"column": 14
- },
- "size": 4,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -351,9 +328,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 28,
"column": 15
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": true,
@@ -388,9 +363,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 33,
"column": 15
- },
- "size": 4,
- "offset": 4
+ }
},
{
"xunion_ordinal": 2,
@@ -404,9 +377,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union.test.fidl",
"line": 32,
"column": 15
- },
- "size": 4,
- "offset": 4
+ }
}
],
"strict": true,
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/union_sandwich.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/union_sandwich.test.fidl.json
index bf827b4..b75c12e 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/union_sandwich.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/union_sandwich.test.fidl.json
@@ -31,8 +31,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
},
{
"type": {
@@ -49,8 +48,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -66,8 +64,7 @@
"field_shape_v1": {
"offset": 32,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -104,8 +101,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
},
{
"type": {
@@ -122,8 +118,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 12
+ }
},
{
"type": {
@@ -139,8 +134,7 @@
"field_shape_v1": {
"offset": 32,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -177,8 +171,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -194,8 +187,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -232,8 +224,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
},
{
"type": {
@@ -250,8 +241,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 24
+ }
},
{
"type": {
@@ -267,8 +257,7 @@
"field_shape_v1": {
"offset": 32,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -305,8 +294,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
},
{
"type": {
@@ -323,8 +311,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 36
+ }
},
{
"type": {
@@ -340,8 +327,7 @@
"field_shape_v1": {
"offset": 32,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -378,9 +364,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union_sandwich.test.fidl",
"line": 11,
"column": 15
- },
- "size": 4,
- "offset": 4
+ }
}
],
"strict": true,
@@ -419,9 +403,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union_sandwich.test.fidl",
"line": 21,
"column": 23
- },
- "size": 6,
- "offset": 4
+ }
}
],
"strict": true,
@@ -457,9 +439,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union_sandwich.test.fidl",
"line": 36,
"column": 31
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": true,
@@ -498,9 +478,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/union_sandwich.test.fidl",
"line": 46,
"column": 24
- },
- "size": 32,
- "offset": 4
+ }
}
],
"strict": true,
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/xunion.test.fidl.json b/garnet/go/src/fidl/compiler/backend/goldens/xunion.test.fidl.json
index 789b306..d5fdd848 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/xunion.test.fidl.json
+++ b/garnet/go/src/fidl/compiler/backend/goldens/xunion.test.fidl.json
@@ -52,8 +52,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 24
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix1",
@@ -107,8 +106,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 24
+ }
}
],
"maybe_response_payload": "test.name/SomeLongAnonymousPrefix3",
@@ -153,8 +151,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 24
+ }
}
],
"type_shape_v1": {
@@ -192,8 +189,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 24
+ }
}
],
"type_shape_v1": {
@@ -251,8 +247,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 24
+ }
}
],
"type_shape_v1": {
@@ -292,9 +287,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 4,
"column": 14
- },
- "size": 8,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -310,9 +303,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 5,
"column": 16
- },
- "size": 4,
- "offset": 0
+ }
}
],
"strict": false,
@@ -349,9 +340,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 11,
"column": 14
- },
- "size": 8,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -367,9 +356,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 13,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
},
{
"ordinal": 3,
@@ -389,9 +376,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 14,
"column": 23
- },
- "size": 16,
- "offset": 0
+ }
}
],
"strict": false,
@@ -428,9 +413,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 20,
"column": 14
- },
- "size": 4,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -446,9 +429,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 21,
"column": 16
- },
- "size": 4,
- "offset": 0
+ }
},
{
"ordinal": 3,
@@ -464,9 +445,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 22,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
}
],
"strict": true,
@@ -504,9 +483,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 31,
"column": 14
- },
- "size": 1,
- "offset": 0
+ }
}
],
"strict": false,
@@ -548,9 +525,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 35,
"column": 25
- },
- "size": 16,
- "offset": 0
+ }
}
],
"strict": true,
@@ -607,9 +582,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 50,
"column": 14
- },
- "size": 8,
- "offset": 0
+ }
},
{
"ordinal": 4,
@@ -625,9 +598,7 @@
"filename": "garnet/go/src/fidl/compiler/backend/typestest/xunion.test.fidl",
"line": 51,
"column": 16
- },
- "size": 4,
- "offset": 0
+ }
}
],
"strict": false,
diff --git a/zircon/tools/fidl/goldens/byte_and_bytes.test.json.golden b/zircon/tools/fidl/goldens/byte_and_bytes.test.json.golden
index 67df66d..e3ba4fe 100644
--- a/zircon/tools/fidl/goldens/byte_and_bytes.test.json.golden
+++ b/zircon/tools/fidl/goldens/byte_and_bytes.test.json.golden
@@ -31,8 +31,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 7
- },
- "size": 1
+ }
},
{
"type": {
@@ -52,8 +51,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -74,8 +72,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -96,8 +93,7 @@
"field_shape_v1": {
"offset": 40,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/constants.test.json.golden b/zircon/tools/fidl/goldens/constants.test.json.golden
index cefd808..ee8272a 100644
--- a/zircon/tools/fidl/goldens/constants.test.json.golden
+++ b/zircon/tools/fidl/goldens/constants.test.json.golden
@@ -581,8 +581,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
},
{
"type": {
@@ -608,8 +607,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -635,8 +633,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 3
- },
- "size": 1
+ }
},
{
"type": {
@@ -659,8 +656,7 @@
"field_shape_v1": {
"offset": 28,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -683,8 +679,7 @@
"field_shape_v1": {
"offset": 32,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/empty_struct.test.json.golden b/zircon/tools/fidl/goldens/empty_struct.test.json.golden
index bccb029..356c2a7 100644
--- a/zircon/tools/fidl/goldens/empty_struct.test.json.golden
+++ b/zircon/tools/fidl/goldens/empty_struct.test.json.golden
@@ -40,8 +40,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 7
- },
- "size": 1
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix0",
@@ -85,8 +84,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 7
- },
- "size": 1
+ }
}
],
"maybe_response_payload": "fidl.test.json/SomeLongAnonymousPrefix1",
@@ -128,8 +126,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 7
- },
- "size": 1
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix2",
@@ -160,8 +157,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 7
- },
- "size": 1
+ }
}
],
"maybe_response_payload": "fidl.test.json/SomeLongAnonymousPrefix3",
@@ -206,8 +202,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 7
- },
- "size": 1
+ }
}
],
"type_shape_v1": {
@@ -245,8 +240,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 7
- },
- "size": 1
+ }
}
],
"type_shape_v1": {
@@ -284,8 +278,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 7
- },
- "size": 1
+ }
}
],
"type_shape_v1": {
@@ -323,8 +316,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 7
- },
- "size": 1
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/error.test.json.golden b/zircon/tools/fidl/goldens/error.test.json.golden
index 0a9ca0a..c8e7ede 100644
--- a/zircon/tools/fidl/goldens/error.test.json.golden
+++ b/zircon/tools/fidl/goldens/error.test.json.golden
@@ -39,8 +39,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix0",
@@ -71,8 +70,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_response_payload": "fidl.test.json/SomeLongAnonymousPrefix1",
@@ -116,8 +114,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -154,8 +151,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -193,8 +189,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -238,9 +233,7 @@
"filename": "generated",
"line": 4,
"column": 1
- },
- "size": 8,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -254,9 +247,7 @@
"filename": "generated",
"line": 5,
"column": 1
- },
- "size": 4,
- "offset": 8
+ }
}
],
"strict": true,
diff --git a/zircon/tools/fidl/goldens/foreign_type_in_response_used_through_compose.test.json.golden b/zircon/tools/fidl/goldens/foreign_type_in_response_used_through_compose.test.json.golden
index dd88b04..d1202fb 100644
--- a/zircon/tools/fidl/goldens/foreign_type_in_response_used_through_compose.test.json.golden
+++ b/zircon/tools/fidl/goldens/foreign_type_in_response_used_through_compose.test.json.golden
@@ -67,8 +67,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_response_payload": "middle/SomeLongAnonymousPrefix1",
@@ -113,8 +112,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/handles.test.json.golden b/zircon/tools/fidl/goldens/handles.test.json.golden
index 93b44b9..ddf6a2e 100644
--- a/zircon/tools/fidl/goldens/handles.test.json.golden
+++ b/zircon/tools/fidl/goldens/handles.test.json.golden
@@ -44,8 +44,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -64,8 +63,7 @@
"field_shape_v1": {
"offset": 4,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -84,8 +82,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -104,8 +101,7 @@
"field_shape_v1": {
"offset": 12,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -124,8 +120,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -144,8 +139,7 @@
"field_shape_v1": {
"offset": 20,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -164,8 +158,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -189,8 +182,7 @@
"field_shape_v1": {
"offset": 28,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -214,8 +206,7 @@
"field_shape_v1": {
"offset": 32,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -239,8 +230,7 @@
"field_shape_v1": {
"offset": 36,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -264,8 +254,7 @@
"field_shape_v1": {
"offset": 40,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -282,8 +271,7 @@
"field_shape_v1": {
"offset": 44,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -300,8 +288,7 @@
"field_shape_v1": {
"offset": 48,
"padding": 0
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/inheritance.test.json.golden b/zircon/tools/fidl/goldens/inheritance.test.json.golden
index 8d09b8a..f2c8d0f 100644
--- a/zircon/tools/fidl/goldens/inheritance.test.json.golden
+++ b/zircon/tools/fidl/goldens/inheritance.test.json.golden
@@ -45,8 +45,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix0",
@@ -76,8 +75,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_response_payload": "fidl.test.json/SomeLongAnonymousPrefix1",
@@ -128,8 +126,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 16
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix0",
@@ -159,8 +156,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 8
+ }
}
],
"maybe_response_payload": "fidl.test.json/SomeLongAnonymousPrefix1",
@@ -204,8 +200,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -242,8 +237,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
@@ -280,8 +274,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -318,8 +311,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 8
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/inheritance_with_recursive_decl.test.json.golden b/zircon/tools/fidl/goldens/inheritance_with_recursive_decl.test.json.golden
index 5ce5e9f..5d1ce78 100644
--- a/zircon/tools/fidl/goldens/inheritance_with_recursive_decl.test.json.golden
+++ b/zircon/tools/fidl/goldens/inheritance_with_recursive_decl.test.json.golden
@@ -46,8 +46,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix0",
@@ -100,8 +99,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix0",
@@ -144,8 +142,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix1",
@@ -191,8 +188,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -230,8 +226,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -269,8 +264,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/placement_of_attributes.test.json.golden b/zircon/tools/fidl/goldens/placement_of_attributes.test.json.golden
index 1420e9e..c669dbf 100644
--- a/zircon/tools/fidl/goldens/placement_of_attributes.test.json.golden
+++ b/zircon/tools/fidl/goldens/placement_of_attributes.test.json.golden
@@ -178,8 +178,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 7
- },
- "size": 1
+ }
}
],
"maybe_request_payload": "example/SomeLongAnonymousPrefix0",
@@ -225,8 +224,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 7
- },
- "size": 1
+ }
}
],
"type_shape_v1": {
@@ -275,8 +273,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
@@ -324,8 +321,7 @@
"name": "OnTableMember",
"value": ""
}
- ],
- "size": 4
+ ]
}
],
"strict": false,
@@ -374,9 +370,7 @@
"name": "OnUnionMember",
"value": ""
}
- ],
- "size": 4,
- "offset": 4
+ ]
}
],
"strict": true,
@@ -427,9 +421,7 @@
"name": "OnXUnionMember",
"value": ""
}
- ],
- "size": 4,
- "offset": 0
+ ]
}
],
"strict": false,
diff --git a/zircon/tools/fidl/goldens/request_flexible_envelope.test.json.golden b/zircon/tools/fidl/goldens/request_flexible_envelope.test.json.golden
index 3bfe03f..211fd8c 100644
--- a/zircon/tools/fidl/goldens/request_flexible_envelope.test.json.golden
+++ b/zircon/tools/fidl/goldens/request_flexible_envelope.test.json.golden
@@ -40,8 +40,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 24
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix0",
@@ -72,8 +71,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 24
+ }
}
],
"maybe_response_payload": "fidl.test.json/SomeLongAnonymousPrefix1",
@@ -115,8 +113,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 24
+ }
}
],
"maybe_request_payload": "fidl.test.json/SomeLongAnonymousPrefix2",
@@ -147,8 +144,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 0
- },
- "size": 24
+ }
}
],
"maybe_response_payload": "fidl.test.json/SomeLongAnonymousPrefix3",
@@ -193,8 +189,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 24
+ }
}
],
"type_shape_v1": {
@@ -232,8 +227,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 24
+ }
}
],
"type_shape_v1": {
@@ -271,8 +265,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 24
+ }
}
],
"type_shape_v1": {
@@ -310,8 +303,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 24
+ }
}
],
"type_shape_v1": {
@@ -351,9 +343,7 @@
"filename": "request_flexible_envelope.test.fidl",
"line": 4,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -369,9 +359,7 @@
"filename": "request_flexible_envelope.test.fidl",
"line": 5,
"column": 14
- },
- "size": 4,
- "offset": 0
+ }
}
],
"strict": false,
@@ -408,9 +396,7 @@
"filename": "request_flexible_envelope.test.fidl",
"line": 9,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -426,9 +412,7 @@
"filename": "request_flexible_envelope.test.fidl",
"line": 10,
"column": 14
- },
- "size": 4,
- "offset": 0
+ }
}
],
"strict": true,
diff --git a/zircon/tools/fidl/goldens/struct.test.json.golden b/zircon/tools/fidl/goldens/struct.test.json.golden
index 4fc15b0..e1e2152 100644
--- a/zircon/tools/fidl/goldens/struct.test.json.golden
+++ b/zircon/tools/fidl/goldens/struct.test.json.golden
@@ -31,8 +31,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 1
+ }
},
{
"type": {
@@ -48,8 +47,7 @@
"field_shape_v1": {
"offset": 1,
"padding": 0
- },
- "size": 1
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/struct_default_value_enum_library_reference.test.json.golden b/zircon/tools/fidl/goldens/struct_default_value_enum_library_reference.test.json.golden
index e2fd2d6..98466d6 100644
--- a/zircon/tools/fidl/goldens/struct_default_value_enum_library_reference.test.json.golden
+++ b/zircon/tools/fidl/goldens/struct_default_value_enum_library_reference.test.json.golden
@@ -45,8 +45,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/table.test.json.golden b/zircon/tools/fidl/goldens/table.test.json.golden
index dbb358b..072fd68 100644
--- a/zircon/tools/fidl/goldens/table.test.json.golden
+++ b/zircon/tools/fidl/goldens/table.test.json.golden
@@ -29,8 +29,7 @@
"filename": "table.test.fidl",
"line": 4,
"column": 14
- },
- "size": 1
+ }
},
{
"ordinal": 2,
@@ -44,8 +43,7 @@
"filename": "table.test.fidl",
"line": 5,
"column": 13
- },
- "size": 1
+ }
},
{
"ordinal": 3,
@@ -54,8 +52,7 @@
"filename": "table.test.fidl",
"line": 6,
"column": 5
- },
- "size": 0
+ }
}
],
"strict": false,
diff --git a/zircon/tools/fidl/goldens/transitive_dependencies.test.json.golden b/zircon/tools/fidl/goldens/transitive_dependencies.test.json.golden
index 21ff69c..fe3f4c9 100644
--- a/zircon/tools/fidl/goldens/transitive_dependencies.test.json.golden
+++ b/zircon/tools/fidl/goldens/transitive_dependencies.test.json.golden
@@ -39,8 +39,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/transitive_dependencies_compose.test.json.golden b/zircon/tools/fidl/goldens/transitive_dependencies_compose.test.json.golden
index 59c213e..1098694 100644
--- a/zircon/tools/fidl/goldens/transitive_dependencies_compose.test.json.golden
+++ b/zircon/tools/fidl/goldens/transitive_dependencies_compose.test.json.golden
@@ -68,8 +68,7 @@
"field_shape_v1": {
"offset": 16,
"padding": 4
- },
- "size": 4
+ }
}
],
"maybe_response_payload": "bottom/SomeLongAnonymousPrefix1",
@@ -114,8 +113,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/type_aliases.test.json.golden b/zircon/tools/fidl/goldens/type_aliases.test.json.golden
index 79494520..ed1cee5 100644
--- a/zircon/tools/fidl/goldens/type_aliases.test.json.golden
+++ b/zircon/tools/fidl/goldens/type_aliases.test.json.golden
@@ -43,8 +43,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 4
- },
- "size": 4
+ }
},
{
"type": {
@@ -72,8 +71,7 @@
"field_shape_v1": {
"offset": 8,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -101,8 +99,7 @@
"field_shape_v1": {
"offset": 24,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -127,8 +124,7 @@
"field_shape_v1": {
"offset": 40,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -155,8 +151,7 @@
"field_shape_v1": {
"offset": 56,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -182,8 +177,7 @@
"field_shape_v1": {
"offset": 72,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -212,8 +206,7 @@
"field_shape_v1": {
"offset": 88,
"padding": 0
- },
- "size": 16
+ }
},
{
"type": {
@@ -237,8 +230,7 @@
"field_shape_v1": {
"offset": 104,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -262,8 +254,7 @@
"field_shape_v1": {
"offset": 108,
"padding": 0
- },
- "size": 4
+ }
},
{
"type": {
@@ -287,8 +278,7 @@
"field_shape_v1": {
"offset": 112,
"padding": 4
- },
- "size": 4
+ }
}
],
"type_shape_v1": {
diff --git a/zircon/tools/fidl/goldens/union.test.json.golden b/zircon/tools/fidl/goldens/union.test.json.golden
index 0349c4f..5175435 100644
--- a/zircon/tools/fidl/goldens/union.test.json.golden
+++ b/zircon/tools/fidl/goldens/union.test.json.golden
@@ -36,8 +36,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -75,8 +74,7 @@
"field_shape_v1": {
"offset": 0,
"padding": 0
- },
- "size": 16
+ }
}
],
"type_shape_v1": {
@@ -114,9 +112,7 @@
"filename": "union.test.fidl",
"line": 12,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -131,9 +127,7 @@
"filename": "union.test.fidl",
"line": 13,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": true,
@@ -169,9 +163,7 @@
"filename": "union.test.fidl",
"line": 19,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -204,9 +196,7 @@
"filename": "union.test.fidl",
"line": 20,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": true,
@@ -242,9 +232,7 @@
"filename": "union.test.fidl",
"line": 24,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -259,9 +247,7 @@
"filename": "union.test.fidl",
"line": 25,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": false,
@@ -297,9 +283,7 @@
"filename": "union.test.fidl",
"line": 29,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
},
{
"xunion_ordinal": 2,
@@ -314,9 +298,7 @@
"filename": "union.test.fidl",
"line": 30,
"column": 14
- },
- "size": 16,
- "offset": 8
+ }
}
],
"strict": true,
diff --git a/zircon/tools/fidl/goldens/xunion.test.json.golden b/zircon/tools/fidl/goldens/xunion.test.json.golden
index 7dc8ceb..83f1b69 100644
--- a/zircon/tools/fidl/goldens/xunion.test.json.golden
+++ b/zircon/tools/fidl/goldens/xunion.test.json.golden
@@ -33,9 +33,7 @@
"filename": "xunion.test.fidl",
"line": 4,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -51,9 +49,7 @@
"filename": "xunion.test.fidl",
"line": 5,
"column": 14
- },
- "size": 4,
- "offset": 0
+ }
}
],
"strict": false,
@@ -90,9 +86,7 @@
"filename": "xunion.test.fidl",
"line": 9,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -108,9 +102,7 @@
"filename": "xunion.test.fidl",
"line": 10,
"column": 14
- },
- "size": 4,
- "offset": 0
+ }
}
],
"strict": true,
@@ -147,9 +139,7 @@
"filename": "xunion.test.fidl",
"line": 14,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
},
{
"ordinal": 1,
@@ -165,9 +155,7 @@
"filename": "xunion.test.fidl",
"line": 15,
"column": 14
- },
- "size": 4,
- "offset": 0
+ }
},
{
"ordinal": 3,
@@ -224,9 +212,7 @@
"filename": "xunion.test.fidl",
"line": 21,
"column": 15
- },
- "size": 16,
- "offset": 0
+ }
},
{
"ordinal": 2,
@@ -242,9 +228,7 @@
"filename": "xunion.test.fidl",
"line": 22,
"column": 14
- },
- "size": 4,
- "offset": 0
+ }
}
],
"strict": true,
diff --git a/zircon/tools/fidl/lib/json_generator.cc b/zircon/tools/fidl/lib/json_generator.cc
index e7daf66..b66214d 100644
--- a/zircon/tools/fidl/lib/json_generator.cc
+++ b/zircon/tools/fidl/lib/json_generator.cc
@@ -409,11 +409,7 @@
GenerateObjectMember("maybe_attributes", value.attributes);
if (value.maybe_default_value)
GenerateObjectMember("maybe_default_value", value.maybe_default_value);
-
GenerateFieldShapes(value, is_request_or_response);
- // TODO(fxb/43957): this should be removed or updated
- auto deprecated_type_shape = value.typeshape(WireFormat::kOld);
- GenerateObjectMember("size", deprecated_type_shape.InlineSize());
});
}
@@ -446,10 +442,6 @@
GenerateObjectMember("reserved", true);
GenerateObjectMember("location", NameSpan(value.span.value()));
}
-
- // TODO(fxb/43957): this should be removed or updated
- auto deprecated_type_shape = value.typeshape(WireFormat::kOld);
- GenerateObjectMember("size", deprecated_type_shape.InlineSize());
});
}
@@ -511,12 +503,6 @@
GenerateObjectMember("location", NameSpan(value.maybe_used->name));
if (value.maybe_used->attributes)
GenerateObjectMember("maybe_attributes", value.maybe_used->attributes);
-
- // TODO(fxb/43957): this should be removed or updated
- auto deprecated_type_shape = value.typeshape(WireFormat::kOld);
- auto deprecated_field_shape = value.maybe_used->fieldshape(WireFormat::kOld);
- GenerateObjectMember("size", deprecated_type_shape.InlineSize());
- GenerateObjectMember("offset", deprecated_field_shape.Offset());
} else {
GenerateObjectMember("reserved", true);
GenerateObjectMember("location", NameSpan(value.span.value()));
@@ -549,12 +535,6 @@
GenerateObjectMember("location", NameSpan(value.maybe_used->name));
if (value.maybe_used->attributes)
GenerateObjectMember("maybe_attributes", value.maybe_used->attributes);
-
- // TODO(fxb/43957): this should be removed or updated
- auto deprecated_type_shape = value.typeshape(WireFormat::kOld);
- auto deprecated_field_shape = value.maybe_used->fieldshape(WireFormat::kOld);
- GenerateObjectMember("size", deprecated_type_shape.InlineSize());
- GenerateObjectMember("offset", deprecated_field_shape.Offset());
} else {
GenerateObjectMember("reserved", true);
GenerateObjectMember("location", NameSpan(value.span.value()));
