sys/fuchsia/fidlgen: update FIDL path & extract new descriptions

Garnet-layer FIDL descriptions are in a new subdirectory.

This CL changes it to the proper directory, and performed a "make
extract" shortly after.

This should fix some of the errors on the Syzkaller hub.

4 files changed, 38 insertions, 48 deletions

diff --git a/sys/fuchsia/fidl_process.txt b/sys/fuchsia/fidl_process.txt
index 55d9eb904..c515fbf33 100644
--- a/sys/fuchsia/fidl_process.txt
+++ b/sys/fuchsia/fidl_process.txt
@@ -46,10 +46,6 @@ fuchsia_process_LaunchInfoHandles {
 	job		zx_job
 } [packed]
 
-fuchsia_process_LaunchResultHandles {
-	process	zx_process
-} [packed]
-
 fuchsia_process_ProcessStartDataHandles {
 	process		zx_process
 	root_vmar	zx_vmar
@@ -57,10 +53,6 @@ fuchsia_process_ProcessStartDataHandles {
 	bootstrap	zx_chan
 } [packed]
 
-fuchsia_process_CreateWithoutStartingResultHandles {
-	data	fuchsia_process_ProcessStartDataHandles
-} [packed]
-
 fuchsia_process_LauncherLaunchRequest {
 	hdr		fidl_message_header[646466973]
 	infoInLine	fuchsia_process_LaunchInfoInLine
@@ -72,7 +64,7 @@ fuchsia_process_LauncherLaunchRequestHandles {
 } [packed]
 
 fuchsia_process_LauncherLaunchResponseHandles {
-	result	fuchsia_process_LaunchResultHandles
+	process	zx_process
 } [packed]
 
 fuchsia_process_LauncherCreateWithoutStartingRequest {
@@ -86,13 +78,13 @@ fuchsia_process_LauncherCreateWithoutStartingRequestHandles {
 } [packed]
 
 fuchsia_process_LauncherCreateWithoutStartingResponseHandles {
-	result	fuchsia_process_CreateWithoutStartingResultHandles
+	data	fuchsia_process_ProcessStartDataHandles
 } [packed]
 
 fuchsia_process_LauncherAddArgsRequest {
 	hdr		fidl_message_header[343996832]
 	argsInLine	fidl_vector
-	argsOutOfLine	parallel_array[fidl_string, fidl_aligned[stringnoz]]
+	argsOutOfLine	parallel_array[fidl_vector, array[int8]]
 } [packed]
 
 fuchsia_process_LauncherAddArgsRequestHandles {
@@ -102,7 +94,7 @@ fuchsia_process_LauncherAddArgsRequestHandles {
 fuchsia_process_LauncherAddEnvironsRequest {
 	hdr			fidl_message_header[1220947097]
 	environInLine		fidl_vector
-	environOutOfLine	parallel_array[fidl_string, fidl_aligned[stringnoz]]
+	environOutOfLine	parallel_array[fidl_vector, array[int8]]
 } [packed]
 
 fuchsia_process_LauncherAddEnvironsRequestHandles {
diff --git a/sys/fuchsia/fidlgen/main.go b/sys/fuchsia/fidlgen/main.go
index c0051dfd6..8a88e5007 100644
--- a/sys/fuchsia/fidlgen/main.go
+++ b/sys/fuchsia/fidlgen/main.go
@@ -62,14 +62,24 @@ func main() {
 	var newFiles []string
 
 	for layer := range layerToLibs {
-		jsonPathBase := filepath.Join(
-			sourceDir,
-			"out",
-			arch,
-			"fidling/gen",
-			layer,
-			"public/fidl",
-		)
+		var jsonPathBase string
+		if layer == "garnet" {
+			jsonPathBase = filepath.Join(
+				sourceDir,
+				"out",
+				arch,
+				"fidling/gen/sdk/fidl",
+			)
+		} else {
+			jsonPathBase = filepath.Join(
+				sourceDir,
+				"out",
+				arch,
+				"fidling/gen",
+				layer,
+				"public/fidl",
+			)
+		}
 
 		for _, lib := range layerToLibs[layer] {
 			jsonPath := filepath.Join(
diff --git a/sys/fuchsia/gen/amd64.go b/sys/fuchsia/gen/amd64.go
index a48c38203..fd1f26b69 100644
--- a/sys/fuchsia/gen/amd64.go
+++ b/sys/fuchsia/gen/amd64.go
@@ -4400,9 +4400,6 @@ var structDescs_amd64 = []*KeyedStruct{
 	{Key: StructKey{Name: "fuchsia_power_PowerManagerWatcherOnChangeBatteryStatusRequestHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_power_PowerManagerWatcherOnChangeBatteryStatusRequestHandles"}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fuchsia_power_BatteryStatusHandles"}, FldName: "battery_status"},
 	}}},
-	{Key: StructKey{Name: "fuchsia_process_CreateWithoutStartingResultHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_CreateWithoutStartingResultHandles", TypeSize: 16, ArgDir: 1}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "fuchsia_process_ProcessStartDataHandles", Dir: 1}, FldName: "data"},
-	}}},
 	{Key: StructKey{Name: "fuchsia_process_HandleInfoHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_HandleInfoHandles", TypeSize: 4}, Fields: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}},
 	}}},
@@ -4425,13 +4422,10 @@ var structDescs_amd64 = []*KeyedStruct{
 	{Key: StructKey{Name: "fuchsia_process_LaunchInfoOutOfLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LaunchInfoOutOfLine", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_aligned[stringnoz]"}, FldName: "nameOutOfLine"},
 	}}},
-	{Key: StructKey{Name: "fuchsia_process_LaunchResultHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LaunchResultHandles", TypeSize: 4, ArgDir: 1}, Fields: []Type{
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_process", FldName: "process", TypeSize: 4, ArgDir: 1}},
-	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddArgsRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddArgsRequest", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_message_header[343996832]"}, FldName: "hdr"},
 		&StructType{Key: StructKey{Name: "fidl_vector"}, FldName: "argsInLine"},
-		&StructType{Key: StructKey{Name: "parallel_array[fidl_string, fidl_aligned[stringnoz]]"}, FldName: "argsOutOfLine"},
+		&StructType{Key: StructKey{Name: "parallel_array[fidl_vector, array[int8]]"}, FldName: "argsOutOfLine"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddArgsRequestHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddArgsRequestHandles"}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "void"}, Kind: 1},
@@ -4439,7 +4433,7 @@ var structDescs_amd64 = []*KeyedStruct{
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddEnvironsRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddEnvironsRequest", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_message_header[1220947097]"}, FldName: "hdr"},
 		&StructType{Key: StructKey{Name: "fidl_vector"}, FldName: "environInLine"},
-		&StructType{Key: StructKey{Name: "parallel_array[fidl_string, fidl_aligned[stringnoz]]"}, FldName: "environOutOfLine"},
+		&StructType{Key: StructKey{Name: "parallel_array[fidl_vector, array[int8]]"}, FldName: "environOutOfLine"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddEnvironsRequestHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddEnvironsRequestHandles"}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "void"}, Kind: 1},
@@ -4469,7 +4463,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fuchsia_process_LaunchInfoHandles"}, FldName: "info"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherCreateWithoutStartingResponseHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherCreateWithoutStartingResponseHandles", TypeSize: 16, ArgDir: 1}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "fuchsia_process_CreateWithoutStartingResultHandles", Dir: 1}, FldName: "result"},
+		&StructType{Key: StructKey{Name: "fuchsia_process_ProcessStartDataHandles", Dir: 1}, FldName: "data"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherLaunchRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherLaunchRequest", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_message_header[646466973]"}, FldName: "hdr"},
@@ -4480,7 +4474,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fuchsia_process_LaunchInfoHandles"}, FldName: "info"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherLaunchResponseHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherLaunchResponseHandles", TypeSize: 4, ArgDir: 1}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "fuchsia_process_LaunchResultHandles", Dir: 1}, FldName: "result"},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_process", FldName: "process", TypeSize: 4, ArgDir: 1}},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_NameInfoHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_NameInfoHandles", TypeSize: 4}, Fields: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_chan_fuchsia_io_Directory_client", FldName: "directory", TypeSize: 4}},
@@ -4602,9 +4596,9 @@ var structDescs_amd64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "timeval"}, FldName: "interv"},
 		&StructType{Key: StructKey{Name: "timeval"}, FldName: "value"},
 	}}},
-	{Key: StructKey{Name: "parallel_array[fidl_string, fidl_aligned[stringnoz]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "parallel_array[fidl_string, fidl_aligned[stringnoz]]", IsVarlen: true}, Fields: []Type{
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "a", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fidl_string"}}},
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "b", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fidl_aligned[stringnoz]"}}},
+	{Key: StructKey{Name: "parallel_array[fidl_vector, array[int8]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "parallel_array[fidl_vector, array[int8]]", IsVarlen: true}, Fields: []Type{
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "a", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fidl_vector"}}},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "b", IsVarlen: true}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}},
 	}}},
 	{Key: StructKey{Name: "parallel_array[fuchsia_cobalt_CobaltEventInLine, fuchsia_cobalt_CobaltEventOutOfLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "parallel_array[fuchsia_cobalt_CobaltEventInLine, fuchsia_cobalt_CobaltEventOutOfLine]", IsVarlen: true}, Fields: []Type{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "a", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fuchsia_cobalt_CobaltEventInLine"}}},
@@ -7555,4 +7549,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "fuchsia_power_Status_OK"},
 }
 
-const revision_amd64 = "9dc77f0d4b31e843dc99bab5336fdcada6f6c94d"
+const revision_amd64 = "020338cc7e797e47ecbbe68691c0954e831070f4"
diff --git a/sys/fuchsia/gen/arm64.go b/sys/fuchsia/gen/arm64.go
index 07b193b9b..4b69ed675 100644
--- a/sys/fuchsia/gen/arm64.go
+++ b/sys/fuchsia/gen/arm64.go
@@ -4400,9 +4400,6 @@ var structDescs_arm64 = []*KeyedStruct{
 	{Key: StructKey{Name: "fuchsia_power_PowerManagerWatcherOnChangeBatteryStatusRequestHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_power_PowerManagerWatcherOnChangeBatteryStatusRequestHandles"}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fuchsia_power_BatteryStatusHandles"}, FldName: "battery_status"},
 	}}},
-	{Key: StructKey{Name: "fuchsia_process_CreateWithoutStartingResultHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_CreateWithoutStartingResultHandles", TypeSize: 16, ArgDir: 1}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "fuchsia_process_ProcessStartDataHandles", Dir: 1}, FldName: "data"},
-	}}},
 	{Key: StructKey{Name: "fuchsia_process_HandleInfoHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_HandleInfoHandles", TypeSize: 4}, Fields: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}},
 	}}},
@@ -4425,13 +4422,10 @@ var structDescs_arm64 = []*KeyedStruct{
 	{Key: StructKey{Name: "fuchsia_process_LaunchInfoOutOfLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LaunchInfoOutOfLine", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_aligned[stringnoz]"}, FldName: "nameOutOfLine"},
 	}}},
-	{Key: StructKey{Name: "fuchsia_process_LaunchResultHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LaunchResultHandles", TypeSize: 4, ArgDir: 1}, Fields: []Type{
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_process", FldName: "process", TypeSize: 4, ArgDir: 1}},
-	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddArgsRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddArgsRequest", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_message_header[343996832]"}, FldName: "hdr"},
 		&StructType{Key: StructKey{Name: "fidl_vector"}, FldName: "argsInLine"},
-		&StructType{Key: StructKey{Name: "parallel_array[fidl_string, fidl_aligned[stringnoz]]"}, FldName: "argsOutOfLine"},
+		&StructType{Key: StructKey{Name: "parallel_array[fidl_vector, array[int8]]"}, FldName: "argsOutOfLine"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddArgsRequestHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddArgsRequestHandles"}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "void"}, Kind: 1},
@@ -4439,7 +4433,7 @@ var structDescs_arm64 = []*KeyedStruct{
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddEnvironsRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddEnvironsRequest", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_message_header[1220947097]"}, FldName: "hdr"},
 		&StructType{Key: StructKey{Name: "fidl_vector"}, FldName: "environInLine"},
-		&StructType{Key: StructKey{Name: "parallel_array[fidl_string, fidl_aligned[stringnoz]]"}, FldName: "environOutOfLine"},
+		&StructType{Key: StructKey{Name: "parallel_array[fidl_vector, array[int8]]"}, FldName: "environOutOfLine"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherAddEnvironsRequestHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherAddEnvironsRequestHandles"}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "void"}, Kind: 1},
@@ -4469,7 +4463,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fuchsia_process_LaunchInfoHandles"}, FldName: "info"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherCreateWithoutStartingResponseHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherCreateWithoutStartingResponseHandles", TypeSize: 16, ArgDir: 1}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "fuchsia_process_CreateWithoutStartingResultHandles", Dir: 1}, FldName: "result"},
+		&StructType{Key: StructKey{Name: "fuchsia_process_ProcessStartDataHandles", Dir: 1}, FldName: "data"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherLaunchRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherLaunchRequest", IsVarlen: true}, Fields: []Type{
 		&StructType{Key: StructKey{Name: "fidl_message_header[646466973]"}, FldName: "hdr"},
@@ -4480,7 +4474,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fuchsia_process_LaunchInfoHandles"}, FldName: "info"},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_LauncherLaunchResponseHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_LauncherLaunchResponseHandles", TypeSize: 4, ArgDir: 1}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "fuchsia_process_LaunchResultHandles", Dir: 1}, FldName: "result"},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_process", FldName: "process", TypeSize: 4, ArgDir: 1}},
 	}}},
 	{Key: StructKey{Name: "fuchsia_process_NameInfoHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_process_NameInfoHandles", TypeSize: 4}, Fields: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "zx_chan_fuchsia_io_Directory_client", FldName: "directory", TypeSize: 4}},
@@ -4602,9 +4596,9 @@ var structDescs_arm64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "timeval"}, FldName: "interv"},
 		&StructType{Key: StructKey{Name: "timeval"}, FldName: "value"},
 	}}},
-	{Key: StructKey{Name: "parallel_array[fidl_string, fidl_aligned[stringnoz]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "parallel_array[fidl_string, fidl_aligned[stringnoz]]", IsVarlen: true}, Fields: []Type{
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "a", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fidl_string"}}},
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "b", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fidl_aligned[stringnoz]"}}},
+	{Key: StructKey{Name: "parallel_array[fidl_vector, array[int8]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "parallel_array[fidl_vector, array[int8]]", IsVarlen: true}, Fields: []Type{
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "a", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fidl_vector"}}},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "b", IsVarlen: true}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}},
 	}}},
 	{Key: StructKey{Name: "parallel_array[fuchsia_cobalt_CobaltEventInLine, fuchsia_cobalt_CobaltEventOutOfLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "parallel_array[fuchsia_cobalt_CobaltEventInLine, fuchsia_cobalt_CobaltEventOutOfLine]", IsVarlen: true}, Fields: []Type{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "a", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fuchsia_cobalt_CobaltEventInLine"}}},
@@ -7555,4 +7549,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "fuchsia_power_Status_OK"},
 }
 
-const revision_arm64 = "8be0f9990181eaecd327c539812d46d285db84cd"
+const revision_arm64 = "6bfd73c3be80297b5e5295deeb2b1cdc93cda43b"