[interpreter] Fix nosnap build for interpreter table generation.

src/interpreter/interpreter.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/interpreter/interpreter.h"
 
 #include "src/compiler.h"
 #include "src/compiler/interpreter-assembler.h"
 #include "src/factory.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/zone.h"
 
 namespace v8 {
 namespace internal {
 namespace interpreter {
 
 using compiler::Node;
 #define __ assembler->
 
 
-Interpreter::Interpreter(Isolate* isolate) : isolate_(isolate) {}
+Interpreter::Interpreter(Isolate* isolate)
+    : isolate_(isolate), initialized_(false) {}
+
+
+// static
+Handle<FixedArray> Interpreter::CreateUninitializedInterpreterTable(
+    Isolate* isolate) {
+  Handle<FixedArray> handler_table = isolate->factory()->NewFixedArray(
+      static_cast<int>(Bytecode::kLast) + 1, TENURED);
+  // We rely on the interpreter handler table being immovable, so check that
+  // it was allocated on the first page (which is always immovable).
+  DCHECK(isolate->heap()->old_space()->FirstPage()->Contains(
+      handler_table->address()));
+  for (int i = 0; i < static_cast<int>(Bytecode::kLast); i++) {
+    handler_table->set(i, isolate->builtins()->builtin(Builtins::kIllegal));
+  }
+  return handler_table;
+}
 
 
 void Interpreter::Initialize(bool create_heap_objects) {
   DCHECK(FLAG_ignition);
-  if (create_heap_objects) {
+  if (initialized_) return;

[Hannes Payer (out of office), 2015/08/10 16:28:05]

What is the purpose of initialized_?

[rmcilroy, 2015/08/10 16:37:03]

It was for the code in test-interpreter to check whether it was initialized
before calling initialize again, but agree, this is no longer useful - removed.

+
+  Handle<FixedArray> handler_table = isolate_->factory()->interpreter_table();
+  if (create_heap_objects || !IsInterpreterTableInitialized(handler_table)) {
     Zone zone;
     HandleScope scope(isolate_);
-    Handle<FixedArray> handler_table = isolate_->factory()->NewFixedArray(
-        static_cast<int>(Bytecode::kLast) + 1, TENURED);
-    // We rely on the interpreter handler table being immovable, so check that
-    // it was allocated on the first page (which is always immovable).
-    DCHECK(isolate_->heap()->old_space()->FirstPage()->Contains(
-        handler_table->address()));
-    isolate_->heap()->public_set_interpreter_table(*handler_table);
 
-#define GENERATE_CODE(Name, ...)                                    \
-  {                                                                 \
-    compiler::InterpreterAssembler assembler(isolate_, &zone,       \
-                                             Bytecode::k##Name);    \
-    Do##Name(&assembler);                                           \
-    Handle<Code> code = assembler.GenerateCode();                   \
-    handler_table->set(static_cast<int>(Bytecode::k##Name), *code); \
-  }
+#define GENERATE_CODE(Name, ...)                                      \
+    {                                                                 \
+      compiler::InterpreterAssembler assembler(isolate_, &zone,       \
+                                               Bytecode::k##Name);    \
+      Do##Name(&assembler);                                           \
+      Handle<Code> code = assembler.GenerateCode();                   \
+      handler_table->set(static_cast<int>(Bytecode::k##Name), *code); \
+    }
     BYTECODE_LIST(GENERATE_CODE)
 #undef GENERATE_CODE
   }
+
+  initialized_ = true;
 }
 
 
+bool Interpreter::IsInterpreterTableInitialized(
+    Handle<FixedArray> handler_table) {
+  DCHECK(handler_table->length() == static_cast<int>(Bytecode::kLast) + 1);
+  return handler_table->get(0) ==
+         isolate_->builtins()->builtin(Builtins::kIllegal);
+}
+
+
 // LdaZero
 //
 // Load literal '0' into the accumulator.
 void Interpreter::DoLdaZero(compiler::InterpreterAssembler* assembler) {
   // TODO(rmcilroy) Implement.
   __ Dispatch();
 }
 
 
 // LdaSmi8 <imm8>
@@ skipping 108 matching lines @@
 //
 // Return the value in register 0.
 void Interpreter::DoReturn(compiler::InterpreterAssembler* assembler) {
   __ Return();
 }
 
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8