From 2b61bddc1ab48908a6efb0581c4e0884bf11863e Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Tue, 5 Feb 2019 17:08:30 -0800 Subject: [PATCH] Work around clang-tidy bug in dex_builder.cc. Bug: 123880763 Test: build with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=*,-readability-*, -google-readability-*,-google-runtime-references,-cppcoreguidelines-*, -modernize-*,-llvm-*,-bugprone-narrowing-conversions, -misc-non-private-member-variables-in-classes, -misc-unused-parameters,-hicpp-*,-fuchsia-* Change-Id: Ibf80f951ae2369a55570770febe8a1c4422181e1 --- startop/view_compiler/Android.bp | 2 -- startop/view_compiler/dex_builder.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/startop/view_compiler/Android.bp b/startop/view_compiler/Android.bp index 37caeb2044ffb..f5b4308a1b505 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 4c1a0dc7f7493..6047e8c74e38c 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 scratch{GetScratchRegisters()}; + std::array scratch = GetScratchRegisters(); const auto& prototype = dex_->GetPrototypeByMethodId(instruction.method_id()); CHECK(prototype.has_value());