Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24a986bf authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

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

am: c6036971

Change-Id: Id1c7360fe4e886369b48c3ffc1c8bdb3ef2b9ee6
parents 5ff42a79 c6036971

startop/view_compiler/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -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,

}

startop/view_compiler/dex_builder.cc

+1 −1
Original line number Diff line number Diff line
@@ -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());