Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Work around clang-tidy bug in dex_builder.cc."

Browse Source
This commit is contained in:
Chih-hung Hsieh
2019-02-06 22:01:44 +00:00
committed by Gerrit Code Review
parent bd2016353c 2b61bddc1a
commit c6036971e7
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
startop/view_compiler/Android.bp
View File

@@ -58,8 +58,6 @@ cc_library_static {
"util.cc", "util.cc",
"layout_validation.cc", "layout_validation.cc",
], ],
// b/123880763, clang-tidy analyzer has segmentation fault with dex_builder.cc
tidy_checks: ["-clang-analyzer-*"],
host_supported: true, host_supported: true,
} }

2
startop/view_compiler/dex_builder.cc
View File

@@ -426,7 +426,7 @@ void MethodBuilder::EncodeInvoke(const Instruction& instruction, ::art::Instruct
// Some of the registers don't fit in the four bit short form of the invoke // Some of the registers don't fit in the four bit short form of the invoke
// instruction, so we need to do an invoke/range. To do this, we need to // instruction, so we need to do an invoke/range. To do this, we need to
// first move all the arguments into contiguous temporary registers. // first move all the arguments into contiguous temporary registers.
std::array<Value, kMaxArgs> scratch{GetScratchRegisters<kMaxArgs>()}; std::array<Value, kMaxArgs> scratch = GetScratchRegisters<kMaxArgs>();
const auto& prototype = dex_->GetPrototypeByMethodId(instruction.method_id()); const auto& prototype = dex_->GetPrototypeByMethodId(instruction.method_id());
CHECK(prototype.has_value()); CHECK(prototype.has_value());