Merge "Optimizing: Allow storing value objects in containers."

2 files changed, 3 insertions, 3 deletions

diff --git a/compiler/optimizing/locations.h b/compiler/optimizing/locations.h
index cc3b35b467..2162ab928b 100644
--- a/compiler/optimizing/locations.h
+++ b/compiler/optimizing/locations.h
@@ -35,7 +35,7 @@ std::ostream& operator<<(std::ostream& os, const Location& location);
  * A Location is an abstraction over the potential location
  * of an instruction. It could be in register or stack.
  */
-class Location {
+class Location : public ValueObject {
  public:
   enum OutputOverlap {
     kOutputOverlap,
@@ -69,7 +69,7 @@ class Location {
     kUnallocated = 10,
   };
 
-  Location() : value_(kInvalid) {
+  Location() : ValueObject(), value_(kInvalid) {
     // Verify that non-constant location kinds do not interfere with kConstant.
     static_assert((kInvalid & kLocationConstantMask) != kConstant, "TagError");
     static_assert((kUnallocated & kLocationConstantMask) != kConstant, "TagError");
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 38f46670a6..8dd31bef86 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -1243,7 +1243,7 @@ class HUseIterator : public ValueObject {
 // instructions they use and pointers to the corresponding HUseListNodes kept
 // by the used instructions.
 template <typename T>
-class HUserRecord {
+class HUserRecord : public ValueObject {
  public:
   HUserRecord() : instruction_(nullptr), use_node_(nullptr) {}
   explicit HUserRecord(HInstruction* instruction) : instruction_(instruction), use_node_(nullptr) {}