From 2088752c709f3f921685e6bc27b2fe7fd22f2aac Mon Sep 17 00:00:00 2001 From: rmcilroy Date: Thu, 17 Sep 2015 10:24:13 -0700 Subject: [PATCH] [arm64]: Fix bug introduced accidentally in r30710 Uncomment the if (!serializer_enabled()) check which I accidentially left commented out after debugging during the CLs development. BUG=chromium:532969 R=bmeurer@chromium.org LOG=n Review URL: https://codereview.chromium.org/1351943002 Cr-Commit-Position: refs/heads/master@{#30811} --- src/arm64/assembler-arm64.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc index 9d9dd1b3b..37a2f5a29 100644 --- a/src/arm64/assembler-arm64.cc +++ b/src/arm64/assembler-arm64.cc @@ -2246,7 +2246,7 @@ void Assembler::debug(const char* message, uint32_t code, Instr params) { #ifdef USE_SIMULATOR // Don't generate simulator specific code if we are building a snapshot, which // might be run on real hardware. - // if (!serializer_enabled()) { + if (!serializer_enabled()) { // The arguments to the debug marker need to be contiguous in memory, so // make sure we don't try to emit pools. BlockPoolsScope scope(this); @@ -2266,7 +2266,7 @@ void Assembler::debug(const char* message, uint32_t code, Instr params) { hlt(kImmExceptionIsUnreachable); return; - // } + } // Fall through if Serializer is enabled. #endif -- 2.34.1