1 files changed, 15 insertions, 16 deletions

diff --git a/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc b/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc
index 0a169b766c..957bcff1db 100644
--- a/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc
+++ b/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc
@@ -10,19 +10,19 @@
 
 #include "include/libplatform/libplatform.h"
 #include "include/v8.h"
-#include "src/api-inl.h"
+#include "src/api/api-inl.h"
 #include "src/base/logging.h"
+#include "src/codegen/source-position-table.h"
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-generator.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/interpreter/interpreter-intrinsics.h"
 #include "src/interpreter/interpreter.h"
-#include "src/objects-inl.h"
 #include "src/objects/heap-number-inl.h"
 #include "src/objects/module-inl.h"
-#include "src/ostreams.h"
+#include "src/objects/objects-inl.h"
 #include "src/runtime/runtime.h"
-#include "src/source-position-table.h"
+#include "src/utils/ostreams.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
@@ -98,7 +98,7 @@ BytecodeExpectationsPrinter::GetBytecodeArrayForGlobal(
       i::Handle<i::JSFunction>::cast(v8::Utils::OpenHandle(*function));
 
   i::Handle<i::BytecodeArray> bytecodes =
-      i::handle(js_function->shared()->GetBytecodeArray(), i_isolate());
+      i::handle(js_function->shared().GetBytecodeArray(), i_isolate());
 
   return bytecodes;
 }
@@ -108,7 +108,7 @@ BytecodeExpectationsPrinter::GetBytecodeArrayForModule(
     v8::Local<v8::Module> module) const {
   i::Handle<i::Module> i_module = v8::Utils::OpenHandle(*module);
   return i::handle(
-      SharedFunctionInfo::cast(i_module->code())->GetBytecodeArray(),
+      SharedFunctionInfo::cast(i_module->code()).GetBytecodeArray(),
       i_isolate());
 }
 
@@ -116,7 +116,7 @@ i::Handle<i::BytecodeArray>
 BytecodeExpectationsPrinter::GetBytecodeArrayForScript(
     v8::Local<v8::Script> script) const {
   i::Handle<i::JSFunction> js_function = v8::Utils::OpenHandle(*script);
-  return i::handle(js_function->shared()->GetBytecodeArray(), i_isolate());
+  return i::handle(js_function->shared().GetBytecodeArray(), i_isolate());
 }
 
 i::Handle<i::BytecodeArray>
@@ -126,8 +126,8 @@ BytecodeExpectationsPrinter::GetBytecodeArrayOfCallee(
       v8::Utils::OpenHandle(*CompileRun(source_code));
   i::Handle<i::JSFunction> js_function =
       i::Handle<i::JSFunction>::cast(i_object);
-  CHECK(js_function->shared()->HasBytecodeArray());
-  return i::handle(js_function->shared()->GetBytecodeArray(), i_isolate());
+  CHECK(js_function->shared().HasBytecodeArray());
+  return i::handle(js_function->shared().GetBytecodeArray(), i_isolate());
 }
 
 void BytecodeExpectationsPrinter::PrintEscapedString(
@@ -167,7 +167,6 @@ void BytecodeExpectationsPrinter::PrintBytecodeOperand(
       break;
     default:
       UNREACHABLE();
-      return;
   }
 
   if (Bytecodes::IsRegisterOperandType(op_type)) {
@@ -279,8 +278,8 @@ void BytecodeExpectationsPrinter::PrintSourcePosition(
 void BytecodeExpectationsPrinter::PrintV8String(std::ostream& stream,
                                                 i::String string) const {
   stream << '"';
-  for (int i = 0, length = string->length(); i < length; ++i) {
-    stream << i::AsEscapedUC16ForJSON(string->Get(i));
+  for (int i = 0, length = string.length(); i < length; ++i) {
+    stream << i::AsEscapedUC16ForJSON(string.Get(i));
   }
   stream << '"';
 }
@@ -289,13 +288,13 @@ void BytecodeExpectationsPrinter::PrintConstant(
     std::ostream& stream, i::Handle<i::Object> constant) const {
   if (constant->IsSmi()) {
     stream << "Smi [";
-    i::Smi::cast(*constant)->SmiPrint(stream);
+    i::Smi::cast(*constant).SmiPrint(stream);
     stream << "]";
   } else {
-    stream << i::HeapObject::cast(*constant)->map()->instance_type();
+    stream << i::HeapObject::cast(*constant).map().instance_type();
     if (constant->IsHeapNumber()) {
       stream << " [";
-      i::HeapNumber::cast(*constant)->HeapNumberPrint(stream);
+      i::HeapNumber::cast(*constant).HeapNumberPrint(stream);
       stream << "]";
     } else if (constant->IsString()) {
       stream << " [";
@@ -335,7 +334,7 @@ void BytecodeExpectationsPrinter::PrintBytecodeSequence(
 void BytecodeExpectationsPrinter::PrintConstantPool(
     std::ostream& stream, i::FixedArray constant_pool) const {
   stream << "constant pool: [\n";
-  int num_constants = constant_pool->length();
+  int num_constants = constant_pool.length();
   if (num_constants > 0) {
     for (int i = 0; i < num_constants; ++i) {
       stream << kIndent;