From e9e2f7f8632aca04af9dccb0bdd912fc22b25ad6 Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Tue, 29 Apr 2014 14:14:06 +0000 Subject: [PATCH] Fix android_arm.debug after r20051 The ConstantPoolBuilder stores RelocInfo in an stl::vector, therefore RelocInfo cannot subclass BASE_EMBEDDED. R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/253923005 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@21056 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/assembler-arm.h | 2 ++ src/assembler.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h index df22a20..a7273a2 100644 --- a/src/arm/assembler-arm.h +++ b/src/arm/assembler-arm.h @@ -730,6 +730,8 @@ class ConstantPoolBuilder BASE_EMBEDDED { bool IsCodePtrEntry(RelocInfo::Mode rmode); bool IsHeapPtrEntry(RelocInfo::Mode rmode); + // TODO(rmcilroy): This should ideally be a ZoneList, however that would mean + // RelocInfo would need to subclass ZoneObject which it currently doesn't. std::vector entries_; std::vector merged_indexes_; int count_of_64bit_; diff --git a/src/assembler.h b/src/assembler.h index 71e8c1d..ed3d99b 100644 --- a/src/assembler.h +++ b/src/assembler.h @@ -254,7 +254,7 @@ enum SaveFPRegsMode { kDontSaveFPRegs, kSaveFPRegs }; // describe a property of the datum. Such rmodes are useful for GC // and nice disassembly output. -class RelocInfo BASE_EMBEDDED { +class RelocInfo { public: // The constant kNoPosition is used with the collecting of source positions // in the relocation information. Two types of source positions are collected -- 2.7.4