From 75fda57d0aa3106c7ebad88656c3eea056e5ea6a Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 1 Apr 2015 00:36:42 -0700 Subject: [PATCH] ART: Valgrind hotfix for VIXL 1.9 Make sure recommended_checkpoint_ is initialized in the VIXL macro assembler by calling EmitLiteralPool with an empty pool. Change-Id: I08589b8fb092a33a8f4aad824e91b5c16ff761b6 --- compiler/optimizing/code_generator_arm64.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 32ada3837..03d344555 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -394,6 +394,10 @@ CodeGeneratorARM64::CodeGeneratorARM64(HGraph* graph, isa_features_(isa_features) { // Save the link register (containing the return address) to mimic Quick. AddAllocatedRegister(LocationFrom(lr)); + + // Workaround for valgrind undefined recommended_checkpoint_. + // This won't do anything, as the literal pool is empty, but initialize the field. + GetVIXLAssembler()->EmitLiteralPool(LiteralPool::EmitOption::kNoBranchRequired); } #undef __ -- 2.11.0