Mercurial > hg > graal-jvmci-8
changeset 12887:1263c7e17e1c
Merge
author | kvn |
---|---|
date | Tue, 15 Oct 2013 17:47:46 -0700 |
parents | 8df6f123d35e (current diff) f91a9a696e5e (diff) |
children | 4a2acfb16e97 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.cpp Sat Oct 12 17:26:41 2013 -0400 +++ b/src/share/vm/opto/graphKit.cpp Tue Oct 15 17:47:46 2013 -0700 @@ -3615,7 +3615,7 @@ Node* marking = __ load(__ ctrl(), marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw); // if (!marking) - __ if_then(marking, BoolTest::ne, zero); { + __ if_then(marking, BoolTest::ne, zero, unlikely); { BasicType index_bt = TypeX_X->basic_type(); assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading G1 PtrQueue::_index with wrong size."); Node* index = __ load(__ ctrl(), index_adr, TypeX_X, index_bt, Compile::AliasIdxRaw);