From 83ee34773641bb080ee37dcada3858fff955c5ae Mon Sep 17 00:00:00 2001 From: "rodolph.perfetta@arm.com" Date: Tue, 24 Jun 2014 16:20:44 +0000 Subject: [PATCH] ARM64: fix operator precedence issue. As a result the constant pool marker was always 0. BUG= R=ulan@chromium.org Review URL: https://codereview.chromium.org/350923003 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21987 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm64/assembler-arm64.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc index 484bf10..ee41875 100644 --- a/src/arm64/assembler-arm64.cc +++ b/src/arm64/assembler-arm64.cc @@ -455,7 +455,7 @@ void ConstPool::EmitMarker() { // + 1 is for the crash guard. // + 0/1 for alignment. int word_count = EntryCount() * 2 + 1 + - (IsAligned(assm_->pc_offset(), 8)) ? 0 : 1; + (IsAligned(assm_->pc_offset(), 8) ? 0 : 1); assm_->Emit(LDR_x_lit | Assembler::ImmLLiteral(word_count) | Assembler::Rt(xzr)); -- 2.7.4