Merge #596

bors[bot] · philberty · web-flow · commit 5b3909dd7487 · 2021-07-26T14:29:28.000Z
596: Fix crash when extern function item has no return type r=philberty a=philberty Addresses #421 Fixes #595 Co-authored-by: Philip Herron <philip.herron@embecosm.com>
diff --git a/gcc/rust/ast/rust-ast-full-test.cc b/gcc/rust/ast/rust-ast-full-test.cc
@@ -3595,7 +3595,8 @@ ExternalFunctionItem::as_string () const
     }
 
   // add type on new line
-  str += "\n (return) Type: " + return_type->as_string ();
+  str += "\n (return) Type: "
+	 + (has_return_type () ? return_type->as_string () : "()");
 
   // where clause
   str += "\n Where clause: ";

Original file line number	Diff line number	Diff line change
`@@ -3595,7 +3595,8 @@ ExternalFunctionItem::as_string () const`
`3595`	`3595`	`}`
`3596`	`3596`
`3597`	`3597`	`// add type on new line`
`3598`		`- str += "\n (return) Type: " + return_type->as_string ();`
	`3598`	`+ str += "\n (return) Type: "`
	`3599`	`+ + (has_return_type () ? return_type->as_string () : "()");`
`3599`	`3600`
`3600`	`3601`	`// where clause`
`3601`	`3602`	`str += "\n Where clause: ";`