From d334c09bf49ea1fb7c6f1ed7f5f0fd9cba5d694d Mon Sep 17 00:00:00 2001 From: "ulan@chromium.org" Date: Tue, 25 Mar 2014 16:14:46 +0000 Subject: [PATCH] ARM64: block veneer pool in InstructionAccurateScope. TEST=mozilla/ecma_3/RegExp/regress-169497 TBR=alexandre.rames@arm.com Review URL: https://codereview.chromium.org/211323003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20255 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm64/macro-assembler-arm64.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h index ad706f6..1777c38 100644 --- a/src/arm64/macro-assembler-arm64.h +++ b/src/arm64/macro-assembler-arm64.h @@ -2157,8 +2157,9 @@ class InstructionAccurateScope BASE_EMBEDDED { { // Before blocking the const pool, see if it needs to be emitted. masm_->CheckConstPool(false, true); + masm_->CheckVeneerPool(false, true); - masm_->StartBlockConstPool(); + masm_->StartBlockPools(); #ifdef DEBUG if (count != 0) { masm_->bind(&start_); @@ -2169,7 +2170,7 @@ class InstructionAccurateScope BASE_EMBEDDED { } ~InstructionAccurateScope() { - masm_->EndBlockConstPool(); + masm_->EndBlockPools(); #ifdef DEBUG if (start_.is_bound()) { ASSERT(masm_->SizeOfCodeGeneratedSince(&start_) == size_); -- 2.7.4