commit 87cac8a6b4441ee90cbcb0308a8abef7800a914e
author Felix Zhu <fcz@google.com> Wed Mar 11 13:58:29 2020 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Mar 11 13:58:29 2020 +0000
tree 91ac1ffc180012b73e9239248725daa8161a7d1f
parent 1587eb14d810292208ddbccbeeaf2999c61f92da

[fidlmerge json] Read Unions instead of XUnions

See step 4/5 of linked bug

Bug: 45702
Change-Id: I9fb88714a4b5d1fefc597c52a370eada44c8ef84

bin/dart_fidl_json/json.fidlmerge

diff --git a/bin/dart_fidl_json/json.fidlmerge b/bin/dart_fidl_json/json.fidlmerge
index f1c0b7c..495a575 100644
--- a/bin/dart_fidl_json/json.fidlmerge
+++ b/bin/dart_fidl_json/json.fidlmerge
@@ -330,7 +330,7 @@
   {{- template "FileHeader" . }}
   {{- template "FidlInclude" . }}
   {{- template "EnumConverterDecls" . }}
-  {{- template "UnionConverterDecls" .XUnions }}
+  {{- template "UnionConverterDecls" .Unions }}
   {{- template "StructConverterDecls" . }}
   {{- template "TableConverterDecls" . }}
 {{- end }}

bin/fidlgen_dart/backend/ir/ir.go

diff --git a/bin/fidlgen_dart/backend/ir/ir.go b/bin/fidlgen_dart/backend/ir/ir.go
index 0de8658..3798432 100644
--- a/bin/fidlgen_dart/backend/ir/ir.go
+++ b/bin/fidlgen_dart/backend/ir/ir.go
@@ -1169,10 +1169,6 @@
 		root.Unions = append(root.Unions, c.compileUnion(v))
 	}
 
-	if len(r.XUnions) > 0 {
-		panic("xunions should not be used anymore")
-	}
-
 	for _, v := range r.Interfaces {
 		root.Interfaces = append(root.Interfaces, c.compileInterface(v))
 	}