commit 5806a9ec99b5494b511e84c74f494f0b3a8ebec5
author Vladimir Marko <vmarko@google.com> Wed Apr 04 17:23:28 2018 +0000
committer Vladimir Marko <vmarko@google.com> Wed Apr 04 17:23:28 2018 +0000
tree bb50d00ff0890c2e10f351f462b47b56b01e78ea
parent c9dd2207dfdab42586b1d6a5e7f11cf2fcea3a7a

Revert "Compile link-time thunks in codegen."

Reason for revert: This caused clang linker crash
in several branches.

Bug: 77581732

This reverts commit c9dd2207dfdab42586b1d6a5e7f11cf2fcea3a7a.

Change-Id: I1923809083cf41c4f19e3e60df03ae80517aaedb

compiler/optimizing/optimizing_cfi_test.cc

diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc
index 2e189fd..d20b681 100644
--- a/compiler/optimizing/optimizing_cfi_test.cc
+++ b/compiler/optimizing/optimizing_cfi_test.cc
@@ -105,15 +105,15 @@
              const std::vector<uint8_t>& expected_asm,
              const std::vector<uint8_t>& expected_cfi) {
     // Get the outputs.
-    ArrayRef<const uint8_t> actual_asm = code_allocator_.GetMemory();
+    const std::vector<uint8_t>& actual_asm = code_allocator_.GetMemory();
     Assembler* opt_asm = code_gen_->GetAssembler();
-    ArrayRef<const uint8_t> actual_cfi(*(opt_asm->cfi().data()));
+    const std::vector<uint8_t>& actual_cfi = *(opt_asm->cfi().data());
 
     if (kGenerateExpected) {
       GenerateExpected(stdout, isa, isa_str, actual_asm, actual_cfi);
     } else {
-      EXPECT_EQ(ArrayRef<const uint8_t>(expected_asm), actual_asm);
-      EXPECT_EQ(ArrayRef<const uint8_t>(expected_cfi), actual_cfi);
+      EXPECT_EQ(expected_asm, actual_asm);
+      EXPECT_EQ(expected_cfi, actual_cfi);
     }
   }
 
@@ -140,7 +140,7 @@
       return memory_.data();
     }
 
-    ArrayRef<const uint8_t> GetMemory() const OVERRIDE { return ArrayRef<const uint8_t>(memory_); }
+    const std::vector<uint8_t>& GetMemory() { return memory_; }
 
    private:
     std::vector<uint8_t> memory_;