diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-01 00:36:42 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-01 00:36:42 -0700 |
| commit | 75fda57d0aa3106c7ebad88656c3eea056e5ea6a (patch) | |
| tree | dc7c9fadb547a0cab87528e09de808d0b07f78c6 | |
| parent | 3360a990b79e4f7759b28d351908982d1953572e (diff) | |
| download | art-75fda57d0aa3106c7ebad88656c3eea056e5ea6a.zip art-75fda57d0aa3106c7ebad88656c3eea056e5ea6a.tar.gz art-75fda57d0aa3106c7ebad88656c3eea056e5ea6a.tar.bz2 | |
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
| -rw-r--r-- | compiler/optimizing/code_generator_arm64.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 32ada38..03d3445 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 __ |