From a5ca888d715cd0c6c421313211caa1928be3e399 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 24 Feb 2015 08:10:57 +0000 Subject: Revert "Add JIT" Sorry, run-test crashes on target: 0-05 12:15:51.633 I/DEBUG (27995): Abort message: 'art/runtime/mirror/art_method.cc:349] Check failed: PcIsWithinQuickCode(reinterpret_cast(code), pc) java.lang.Throwable java.lang.Throwable.fillInStackTrace() pc=71e3366b code=0x71e3362d size=ad000000' 10-05 12:15:51.633 I/DEBUG (27995): r0 00000000 r1 0000542b r2 00000006 r3 00000000 10-05 12:15:51.633 I/DEBUG (27995): r4 00000006 r5 b6f9addc r6 00000002 r7 0000010c 10-05 12:15:51.633 I/DEBUG (27995): r8 b63fe1e8 r9 be8e1418 sl b6427400 fp b63fcce0 10-05 12:15:51.633 I/DEBUG (27995): ip 0000542b sp be8e1358 lr b6e9a27b pc b6e9c280 cpsr 40070010 10-05 12:15:51.633 I/DEBUG (27995): Bug: 17950037 This reverts commit 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4. Change-Id: I6f88849bc6f2befed0c0aaa0b7b2a08c967a83c3 --- compiler/compiled_method.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'compiler/compiled_method.h') diff --git a/compiler/compiled_method.h b/compiler/compiled_method.h index d6a07f6226..6013507ac4 100644 --- a/compiler/compiled_method.h +++ b/compiler/compiled_method.h @@ -27,6 +27,10 @@ #include "utils/array_ref.h" #include "utils/swap_space.h" +namespace llvm { + class Function; +} // namespace llvm + namespace art { class CompilerDriver; @@ -35,9 +39,7 @@ class CompiledCode { public: // For Quick to supply an code blob CompiledCode(CompilerDriver* compiler_driver, InstructionSet instruction_set, - const ArrayRef& quick_code, bool owns_code_array); - - virtual ~CompiledCode(); + const ArrayRef& quick_code); InstructionSet GetInstructionSet() const { return instruction_set_; @@ -54,8 +56,8 @@ class CompiledCode { // To align an offset from a page-aligned value to make it suitable // for code storage. For example on ARM, to ensure that PC relative // valu computations work out as expected. - size_t AlignCode(size_t offset) const; - static size_t AlignCode(size_t offset, InstructionSet instruction_set); + uint32_t AlignCode(uint32_t offset) const; + static uint32_t AlignCode(uint32_t offset, InstructionSet instruction_set); // returns the difference between the code address and a usable PC. // mainly to cope with kThumb2 where the lower bit must be set. @@ -76,9 +78,6 @@ class CompiledCode { const InstructionSet instruction_set_; - // If we own the code array (means that we free in destructor). - const bool owns_code_array_; - // Used to store the PIC code for Quick. SwapVector* quick_code_; @@ -123,7 +122,6 @@ class SrcMap FINAL : public std::vector { using std::vector::size; explicit SrcMap() {} - explicit SrcMap(const Allocator& alloc) : std::vector(alloc) {} template SrcMap(InputIt first, InputIt last, const Allocator& alloc) @@ -293,7 +291,7 @@ class CompiledMethod FINAL : public CompiledCode { const ArrayRef& cfi_info, const ArrayRef& patches = ArrayRef()); - virtual ~CompiledMethod(); + ~CompiledMethod() {} static CompiledMethod* SwapAllocCompiledMethod( CompilerDriver* driver, @@ -349,9 +347,9 @@ class CompiledMethod FINAL : public CompiledCode { return mapping_table_; } - const SwapVector* GetVmapTable() const { + const SwapVector& GetVmapTable() const { DCHECK(vmap_table_ != nullptr); - return vmap_table_; + return *vmap_table_; } SwapVector const* GetGcMap() const { @@ -367,8 +365,6 @@ class CompiledMethod FINAL : public CompiledCode { } private: - // Whether or not the arrays are owned by the compiled method or dedupe sets. - const bool owns_arrays_; // For quick code, the size of the activation used by the code. const size_t frame_size_in_bytes_; // For quick code, a bit mask describing spilled GPR callee-save registers. -- cgit v1.2.3-59-g8ed1b