OpenJDK / valhalla / valhalla
changeset 59163:3c1d6d6335ca lworld
8240174: [lworld] C2 compilation fails with -XX:+VerifyGraphEdges
| author | thartmann |
|---|---|
| date | Thu, 27 Feb 2020 13:52:53 +0100 |
| parents | 79133d98703f |
| children | 34d7fc5f89d8 |
| files | src/hotspot/share/opto/node.cpp test/hotspot/jtreg/compiler/c2/TestVerifyGraphEdges.java |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/opto/node.cpp Thu Feb 27 13:30:36 2020 +0100 +++ b/src/hotspot/share/opto/node.cpp Thu Feb 27 13:52:53 2020 +0100 @@ -2132,8 +2132,10 @@ } assert( cnt == 0,"Mismatched edge count."); } else if (n == NULL) { - assert(i >= req() || i == 0 || is_Region() || is_Phi() || is_ArrayCopy() - || (is_Unlock() && i == req()-1), "only region, phi, arraycopy or unlock nodes have null data edges"); + assert(i >= req() || i == 0 || is_Region() || is_Phi() || is_ArrayCopy() || + (is_Allocate() && i >= AllocateNode::ValueNode) || + (is_Unlock() && i == req()-1), + "only region, phi, arraycopy, allocate or unlock nodes have null data edges"); } else { assert(n->is_top(), "sanity"); // Nothing to check.
--- a/test/hotspot/jtreg/compiler/c2/TestVerifyGraphEdges.java Thu Feb 27 13:30:36 2020 +0100 +++ b/test/hotspot/jtreg/compiler/c2/TestVerifyGraphEdges.java Thu Feb 27 13:52:53 2020 +0100 @@ -23,7 +23,6 @@ /* * @test - * @ignore until 8240174 is fixed * @bug 8238811 * @requires vm.debug == true & vm.flavor == "server" * @summary Run with -Xcomp to test -XX:+VerifyGraphEdges in debug builds.