OpenJDK / valhalla / valhalla
changeset 47324:afa07dc0bc90 mvt
Missing change from 8152856 conflict
| author | dsimms |
|---|---|
| date | Thu, 12 Oct 2017 14:31:37 +0200 |
| parents | f0d9ab80d457 |
| children | fca6b066ff80 |
| files | src/hotspot/share/opto/library_call.cpp |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/opto/library_call.cpp Thu Oct 12 14:22:16 2017 +0200 +++ b/src/hotspot/share/opto/library_call.cpp Thu Oct 12 14:31:37 2017 +0200 @@ -3896,7 +3896,7 @@ } // Now test the correct condition. jint nval = (obj_array - ? (jint)(Klass::_lh_array_tag_type_value + ? (jint)((juint)Klass::_lh_array_tag_type_value << Klass::_lh_array_tag_shift) : Klass::_lh_neutral_value); Node* cmp = _gvn.transform(new CmpINode(layout_val, intcon(nval)));