RFR(XS): 8131761: Fix merge error adding code that was removed in 8077936.

[Lindenmaier, Goetz]

Thomas,

thanks for helping out with these two changes!

Best regards,
  Goetz.

-----Original Message-----
From: Thomas Schatzl [mailto:thomas.schatzl at oracle.com] 
Sent: Dienstag, 21. Juli 2015 11:58
To: Lindenmaier, Goetz
Cc: hotspot-gc-dev at openjdk.java.net
Subject: Re: RFR(XS): 8131761: Fix merge error adding code that was removed in 8077936.

Hi Goetz,

On Fri, 2015-07-17 at 13:24 +0000, Lindenmaier, Goetz wrote:
> Hi,
>  
> 8077936 http://hg.openjdk.java.net/jdk9/dev/hotspot/rev/e57fce7b6ad2
> removed the function obj_field_volatile(). This was added again 
> in this merge
> change:http://hg.openjdk.java.net/jdk9/dev/hotspot/rev/5f2ef612ed74.
>  
> This change removes it once more.
>  
> Please review this change. I please need a sponsor.
> http://cr.openjdk.java.net/~goetz/webrevs/8131761-fixMerge/webrev.01/

  looks good. I will push it with the other change.

Thanks,
  Thomas