diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-01 19:27:26 -0700 |
|---|---|---|
| committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 02:38:22 +0000 |
| commit | a90c04389f86ed4363674e20b0d5f171dea7ebeb (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /disassembler_elf_unittest.cc | |
| parent | f2da819cb37cb2376c917506fb1eb154ec61586a (diff) | |
| parent | 8bb965d29e918d0559589a215ff7f4bd0874bc08 (diff) | |
| download | zucchini-a90c04389f86ed4363674e20b0d5f171dea7ebeb.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev
This performs a merge on upstream zucchini.
Change-Id: I8a4844407558d6f1e439939ee634fe17ed7a4e55
Diffstat (limited to 'disassembler_elf_unittest.cc')
| -rw-r--r-- | disassembler_elf_unittest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/disassembler_elf_unittest.cc b/disassembler_elf_unittest.cc index d98eb50..1e52136 100644 --- a/disassembler_elf_unittest.cc +++ b/disassembler_elf_unittest.cc @@ -153,8 +153,7 @@ TEST(DisassemblerElfTest, QuickDetect) { header.e_machine = elf::EM_386; header.e_version = 1; header.e_shentsize = sizeof(elf::Elf32_Shdr); - ConstBufferView image(reinterpret_cast<const uint8_t*>(&header), - sizeof(header)); + image = {reinterpret_cast<const uint8_t*>(&header), sizeof(header)}; EXPECT_TRUE(DisassemblerElfX86::QuickDetect(image)); EXPECT_FALSE(DisassemblerElfX64::QuickDetect(image)); } @@ -169,8 +168,7 @@ TEST(DisassemblerElfTest, QuickDetect) { header.e_machine = elf::EM_X86_64; header.e_version = 1; header.e_shentsize = sizeof(elf::Elf64_Shdr); - ConstBufferView image(reinterpret_cast<const uint8_t*>(&header), - sizeof(header)); + image = {reinterpret_cast<const uint8_t*>(&header), sizeof(header)}; EXPECT_FALSE(DisassemblerElfX86::QuickDetect(image)); EXPECT_TRUE(DisassemblerElfX64::QuickDetect(image)); } |