diff options
| -rw-r--r-- | compiler/optimizing/load_store_elimination.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/stack_map_stream.cc | 2 | ||||
| -rw-r--r-- | dex2oat/linker/oat_writer.cc | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/compiler/optimizing/load_store_elimination.cc b/compiler/optimizing/load_store_elimination.cc index 93c4ac4715..7441e28e77 100644 --- a/compiler/optimizing/load_store_elimination.cc +++ b/compiler/optimizing/load_store_elimination.cc @@ -2011,7 +2011,7 @@ bool LSEVisitor::MaterializeLoopPhis(ArrayRef<const size_t> phi_placeholder_inde HInstruction* phi = phi_it.Current(); DCHECK_EQ(phi->InputCount(), predecessors.size()); ArrayRef<HUserRecord<HInstruction*>> phi_inputs = phi->GetInputRecords(); - auto cmp = [=](const HUserRecord<HInstruction*>& lhs, HBasicBlock* rhs) { + auto cmp = [=, this](const HUserRecord<HInstruction*>& lhs, HBasicBlock* rhs) { Value value = ReplacementOrValue(heap_values_for_[rhs->GetBlockId()][idx].value); if (value.NeedsPhi()) { DCHECK(value.GetPhiPlaceholder() == phi_placeholder); diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index 83551a9750..10d8c91265 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -153,7 +153,7 @@ void StackMapStream::BeginStackMapEntry( size_t stack_map_index = stack_maps_.size(); // Create lambda method, which will be executed at the very end to verify data. // Parameters and local variables will be captured(stored) by the lambda "[=]". - dchecks_.emplace_back([=](const CodeInfo& code_info) { + dchecks_.emplace_back([=, this](const CodeInfo& code_info) { // The `native_pc_offset` may have been overridden using `SetStackMapNativePcOffset(.)`. uint32_t final_native_pc_offset = GetStackMapNativePcOffset(stack_map_index); if (kind == StackMap::Kind::Default || kind == StackMap::Kind::OSR) { diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc index a0056c85c4..07ef7ee7c5 100644 --- a/dex2oat/linker/oat_writer.cc +++ b/dex2oat/linker/oat_writer.cc @@ -2172,7 +2172,7 @@ size_t OatWriter::InitIndexBssMappingsHelper(size_t offset, offset += CalculateIndexBssMappingSize(dex_file->NumMethodIds(), static_cast<size_t>(pointer_size), method_indexes, - [=](uint32_t index) { + [this, dex_file](uint32_t index) { return bss_method_entries_.Get({dex_file, index}); }); } @@ -2210,7 +2210,7 @@ size_t OatWriter::InitIndexBssMappingsHelper(size_t offset, dex_file->NumStringIds(), sizeof(GcRoot<mirror::String>), string_indexes, - [=](uint32_t index) { + [this, dex_file](uint32_t index) { return bss_string_entries_.Get({dex_file, dex::StringIndex(index)}); }); } @@ -2224,7 +2224,7 @@ size_t OatWriter::InitIndexBssMappingsHelper(size_t offset, dex_file->NumProtoIds(), sizeof(GcRoot<mirror::MethodType>), proto_indexes, - [=](uint32_t index) { + [this, dex_file](uint32_t index) { return bss_method_type_entries_.Get({dex_file, dex::ProtoIndex(index)}); }); } @@ -2894,7 +2894,7 @@ size_t OatWriter::WriteIndexBssMappingsHelper(OutputStream* out, dex_file->NumMethodIds(), static_cast<size_t>(pointer_size), method_indexes, - [=](uint32_t index) { + [this, dex_file](uint32_t index) { return bss_method_entries_.Get({dex_file, index}); }); if (method_mappings_size == 0u) { @@ -2964,7 +2964,7 @@ size_t OatWriter::WriteIndexBssMappingsHelper(OutputStream* out, dex_file->NumStringIds(), sizeof(GcRoot<mirror::String>), string_indexes, - [=](uint32_t index) { + [this, dex_file](uint32_t index) { return bss_string_entries_.Get({dex_file, dex::StringIndex(index)}); }); if (string_mappings_size == 0u) { @@ -2986,7 +2986,7 @@ size_t OatWriter::WriteIndexBssMappingsHelper(OutputStream* out, dex_file->NumProtoIds(), sizeof(GcRoot<mirror::MethodType>), method_type_indexes, - [=](uint32_t index) { + [this, dex_file](uint32_t index) { return bss_method_type_entries_ .Get({dex_file, dex::ProtoIndex(index)}); }); |