diff options
author | eric fang <eric.fang@arm.com> | 2020-04-20 08:42:01 +0000 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2020-05-11 17:36:24 -0700 |
commit | 5ca575182338a2670f3e7d636c48a2e2ef2d32dc (patch) | |
tree | 1762e727216a89e5f13e95b3b0e6e8f6d96ed750 /gcc | |
parent | 4f157ed7749fd13c3562dd09696f7d675b86434f (diff) | |
download | gcc-5ca575182338a2670f3e7d636c48a2e2ef2d32dc.zip gcc-5ca575182338a2670f3e7d636c48a2e2ef2d32dc.tar.gz gcc-5ca575182338a2670f3e7d636c48a2e2ef2d32dc.tar.bz2 |
runtime: fix TestCallersNilPointerPanic
The expected result of TestCallersNilPointerPanic has changed in
GoLLVM. This CL makes some elements of the expected result optional
so that this test passes in both gccgo and GoLLVM.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/230138
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/go/gofrontend/MERGE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 939ba7c..02f6746 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -8645632618262d1661ece0c9e6fe9e04c6e3a878 +876bdf3df3bb33dbf1414237d84be5da32a48082 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |