1 files changed, 16 insertions, 16 deletions

diff --git a/deps/v8/src/objects/js-regexp-inl.h b/deps/v8/src/objects/js-regexp-inl.h
index 8322a3c258..93e6ee008d 100644
--- a/deps/v8/src/objects/js-regexp-inl.h
+++ b/deps/v8/src/objects/js-regexp-inl.h
@@ -7,7 +7,7 @@
 
 #include "src/objects/js-regexp.h"
 
-#include "src/objects-inl.h"  // Needed for write barriers
+#include "src/objects/objects-inl.h"  // Needed for write barriers
 #include "src/objects/smi.h"
 #include "src/objects/string.h"
 
@@ -28,9 +28,9 @@ ACCESSORS(JSRegExp, last_index, Object, kLastIndexOffset)
 
 JSRegExp::Type JSRegExp::TypeTag() const {
   Object data = this->data();
-  if (data->IsUndefined()) return JSRegExp::NOT_COMPILED;
-  Smi smi = Smi::cast(FixedArray::cast(data)->get(kTagIndex));
-  return static_cast<JSRegExp::Type>(smi->value());
+  if (data.IsUndefined()) return JSRegExp::NOT_COMPILED;
+  Smi smi = Smi::cast(FixedArray::cast(data).get(kTagIndex));
+  return static_cast<JSRegExp::Type>(smi.value());
 }
 
 int JSRegExp::CaptureCount() {
@@ -45,21 +45,21 @@ int JSRegExp::CaptureCount() {
 }
 
 JSRegExp::Flags JSRegExp::GetFlags() {
-  DCHECK(this->data()->IsFixedArray());
+  DCHECK(this->data().IsFixedArray());
   Object data = this->data();
-  Smi smi = Smi::cast(FixedArray::cast(data)->get(kFlagsIndex));
-  return Flags(smi->value());
+  Smi smi = Smi::cast(FixedArray::cast(data).get(kFlagsIndex));
+  return Flags(smi.value());
 }
 
 String JSRegExp::Pattern() {
-  DCHECK(this->data()->IsFixedArray());
+  DCHECK(this->data().IsFixedArray());
   Object data = this->data();
-  String pattern = String::cast(FixedArray::cast(data)->get(kSourceIndex));
+  String pattern = String::cast(FixedArray::cast(data).get(kSourceIndex));
   return pattern;
 }
 
 Object JSRegExp::CaptureNameMap() {
-  DCHECK(this->data()->IsFixedArray());
+  DCHECK(this->data().IsFixedArray());
   DCHECK_EQ(TypeTag(), IRREGEXP);
   Object value = DataAt(kIrregexpCaptureNameMapIndex);
   DCHECK_NE(value, Smi::FromInt(JSRegExp::kUninitializedValue));
@@ -68,24 +68,24 @@ Object JSRegExp::CaptureNameMap() {
 
 Object JSRegExp::DataAt(int index) const {
   DCHECK(TypeTag() != NOT_COMPILED);
-  return FixedArray::cast(data())->get(index);
+  return FixedArray::cast(data()).get(index);
 }
 
 void JSRegExp::SetDataAt(int index, Object value) {
   DCHECK(TypeTag() != NOT_COMPILED);
   DCHECK_GE(index,
             kDataIndex);  // Only implementation data can be set this way.
-  FixedArray::cast(data())->set(index, value);
+  FixedArray::cast(data()).set(index, value);
 }
 
 bool JSRegExp::HasCompiledCode() const {
   if (TypeTag() != IRREGEXP) return false;
 #ifdef DEBUG
-  DCHECK(DataAt(kIrregexpLatin1CodeIndex)->IsCode() ||
-         DataAt(kIrregexpLatin1CodeIndex)->IsByteArray() ||
+  DCHECK(DataAt(kIrregexpLatin1CodeIndex).IsCode() ||
+         DataAt(kIrregexpLatin1CodeIndex).IsByteArray() ||
          DataAt(kIrregexpLatin1CodeIndex) == Smi::FromInt(kUninitializedValue));
-  DCHECK(DataAt(kIrregexpUC16CodeIndex)->IsCode() ||
-         DataAt(kIrregexpUC16CodeIndex)->IsByteArray() ||
+  DCHECK(DataAt(kIrregexpUC16CodeIndex).IsCode() ||
+         DataAt(kIrregexpUC16CodeIndex).IsByteArray() ||
          DataAt(kIrregexpUC16CodeIndex) == Smi::FromInt(kUninitializedValue));
 #endif  // DEBUG
   Smi uninitialized = Smi::FromInt(kUninitializedValue);