diff options
| author | Chih-hung Hsieh <chh@google.com> | 2019-02-06 14:34:50 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-06 14:34:50 -0800 |
| commit | acd74cfac0350ded6114a5aa02357f4100e30638 (patch) | |
| tree | 688f0e9e0cde689f1dddfd1d641e018cc737812d | |
| parent | f62df78690268ef695b33f67ab7e8f811f2128a2 (diff) | |
| parent | 24a986bfb1e271df3a401a9306dea7e3e493c83f (diff) | |
Merge "Work around clang-tidy bug in dex_builder.cc." am: c6036971e7
am: 24a986bfb1
Change-Id: Ic46821b9512dc4b73ce153202012984a714649c5
| -rw-r--r-- | startop/view_compiler/Android.bp | 2 | ||||
| -rw-r--r-- | startop/view_compiler/dex_builder.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/startop/view_compiler/Android.bp b/startop/view_compiler/Android.bp index 37caeb2044ff..f5b4308a1b50 100644 --- a/startop/view_compiler/Android.bp +++ b/startop/view_compiler/Android.bp @@ -58,8 +58,6 @@ cc_library_static { "util.cc", "layout_validation.cc", ], - // b/123880763, clang-tidy analyzer has segmentation fault with dex_builder.cc - tidy_checks: ["-clang-analyzer-*"], host_supported: true, } diff --git a/startop/view_compiler/dex_builder.cc b/startop/view_compiler/dex_builder.cc index 4c1a0dc7f749..6047e8c74e38 100644 --- a/startop/view_compiler/dex_builder.cc +++ b/startop/view_compiler/dex_builder.cc @@ -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 // instruction, so we need to do an invoke/range. To do this, we need to // 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()); CHECK(prototype.has_value()); |