Unbreak readline support.

src/d8-readline.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 31 matching lines @@
 #endif
 
 
 namespace v8 {
 
 
 class ReadLineEditor: public LineEditor {
  public:
   ReadLineEditor() : LineEditor(LineEditor::READLINE, "readline") { }
   virtual Handle<String> Prompt(const char* prompt);
-  virtual bool Open();
+  virtual bool Open(Isolate* isolate);
   virtual bool Close();
   virtual void AddHistory(const char* str);
 
   static const char* kHistoryFileName;
   static const int kMaxHistoryEntries;
 
  private:
 #ifndef V8_SHARED
   static char** AttemptedCompletion(const char* text, int start, int end);
   static char* CompletionGenerator(const char* text, int state);
 #endif  // V8_SHARED
   static char kWordBreakCharacters[];
+
+  Isolate* isolate_;
 };
 
 
 static ReadLineEditor read_line_editor;
 char ReadLineEditor::kWordBreakCharacters[] = {' ', '\t', '\n', '"',
     '\\', '\'', '`', '@', '.', '>', '<', '=', ';', '|', '&', '{', '(',
     '\0'};
 
 
 const char* ReadLineEditor::kHistoryFileName = ".d8_history";
 const int ReadLineEditor::kMaxHistoryEntries = 1000;
 
 
-bool ReadLineEditor::Open() {
+bool ReadLineEditor::Open(Isolate* isolate) {
+  isolate_ = isolate;
+
   rl_initialize();
 
 #ifdef V8_SHARED
   // Don't do completion on shared library mode
   // http://cnswww.cns.cwru.edu/php/chet/readline/readline.html#SEC24
   rl_bind_key('\t', rl_insert);
 #else
   rl_attempted_completion_function = AttemptedCompletion;
 #endif  // V8_SHARED
 
@@ skipping 48 matching lines @@
                                            int end) {
   char** result = completion_matches(text, CompletionGenerator);
   rl_attempted_completion_over = true;
   return result;
 }
 
 
 char* ReadLineEditor::CompletionGenerator(const char* text, int state) {
   static unsigned current_index;
   static Persistent<Array> current_completions;
+  Isolate* isolate = read_line_editor.isolate_;
+  Locker lock(isolate);
   if (state == 0) {
     HandleScope scope;
     Local<String> full_text = String::New(rl_line_buffer, rl_point);
     Handle<Array> completions =
       Shell::GetCompletions(String::New(text), full_text);
-    current_completions = Persistent<Array>::New(completions);
+    current_completions = Persistent<Array>::New(isolate, completions);
     current_index = 0;
   }
   if (current_index < current_completions->Length()) {
     HandleScope scope;
     Handle<Integer> index = Integer::New(current_index);
     Handle<Value> str_obj = current_completions->Get(index);
     current_index++;
     String::Utf8Value str(str_obj);
     return strdup(*str);
   } else {
-    current_completions.Dispose();
+    current_completions.Dispose(isolate);
     current_completions.Clear();
     return NULL;
   }
 }
 #endif  // V8_SHARED
 
 
 }  // namespace v8