[8u] RFR: JDK-8055530 - assert(_exits.control()->is_top() || !_gvn.type(ret_phi)->empty()) failed: return value must be well defined

[Shafi Ahmad]

Thanks for review. 

> Where was conflict?

shafi at shafi-ahmad:~/Java/jdk8/jdk8u-dev/hotspot$ hg import 7dfa629d203a
applying 7dfa629d203a
patching file src/share/vm/opto/parse1.cpp
Hunk #1 FAILED at 26
1 out of 2 hunks FAILED -- saving rejects to file src/share/vm/opto/parse1.cpp.rej
abort: patch failed to apply

shafi at shafi-ahmad:~/Java/jdk8/jdk8u-dev/hotspot$ cat src/share/vm/opto/parse1.cpp.rej
--- parse1.cpp
+++ parse1.cpp
@@ -27,6 +27,7 @@
 #include "interpreter/linkResolver.hpp"
 #include "oops/method.hpp"
 #include "opto/addnode.hpp"
+#include "opto/c2compiler.hpp"
 #include "opto/castnode.hpp"
 #include "opto/idealGraphPrinter.hpp"
 #include "opto/locknode.hpp"

Regards,
Shafi

-----Original Message-----
From: Vladimir Kozlov 
Sent: Monday, April 18, 2016 9:17 PM
To: Shafi Ahmad; hotspot-dev at openjdk.java.net
Subject: Re: [8u] RFR: JDK-8055530 - assert(_exits.control()->is_top() || !_gvn.type(ret_phi)->empty()) failed: return value must be well defined

Hi Shafi,

I verified that changes match jdk 9 changes. They are good.

Where was conflict?

Thanks,
Vladimir

On 4/18/16 2:56 AM, Shafi Ahmad wrote:
> Hi,
>
>
>
> Please review the backport of bug: "JDK-8055530 - assert(_exits.control()->is_top() || !_gvn.type(ret_phi)->empty()) failed: return value must be well defined" to jdk8u.
>
> There is  a single line conflict.
>
>
>
> Webrev: http://cr.openjdk.java.net/~csahu/8055530/webrev.00/
>
> Jdk9 bug: https://bugs.openjdk.java.net/browse/JDK-8055530
>
> Original patch pushed to jdk9: http://hg.openjdk.java.net/jdk9/jdk9/hotspot/rev/7dfa629d203a
>
>
>
> Test:  Run jprt.
>
>
>
> Regards,
>
> Shafi
>
>
>