Mercurial > hg > openjdk > aarch64-port > hotspot

changeset 7543:c6375c27cbfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct merge error
author aph
date Fri, 05 Sep 2014 07:18:32 -0400
parents c4826f8d7896
children 7f4c970a6b0c bdd6cf8f4f10
files src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	Fri Sep 05 06:26:44 2014 -0400
+++ b/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp	Fri Sep 05 07:18:32 2014 -0400
@@ -1089,7 +1089,7 @@
 #endif
   CodeEmitInfo* info = state_for(x, x->state());
   LIR_Opr reg = result_register_for(x->type());
-  new_instance(reg, x->klass(),
+  new_instance(reg, x->klass(), x->is_unresolved(),
                        FrameMap::r2_oop_opr,
                        FrameMap::r5_oop_opr,
                        FrameMap::r4_oop_opr,