Experimental parser: merge r19949

test/cctest/cctest.h

 // Copyright 2008 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 290 matching lines @@
 static inline v8::Local<v8::String> v8_str(const char* x) {
   return v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), x);
 }
 
 
 static inline v8::Local<v8::Script> v8_compile(const char* x) {
   return v8::Script::Compile(v8_str(x));
 }
 
 
-// Helper function that compiles and runs the source.
+static inline v8::Local<v8::Script> v8_compile(v8::Local<v8::String> x) {
+  return v8::Script::Compile(x);
+}
+
+
+static inline v8::Local<v8::Script> CompileWithOrigin(
+    v8::Local<v8::String> source, v8::Local<v8::String> origin_url) {
+  v8::ScriptOrigin origin(origin_url);
+  return v8::ScriptCompiler::Compile(
+      v8::Isolate::GetCurrent(), v8::ScriptCompiler::Source(source, origin));
+}
+
+
+static inline v8::Local<v8::Script> CompileWithOrigin(
+    v8::Local<v8::String> source, const char* origin_url) {
+  return CompileWithOrigin(source, v8_str(origin_url));
+}
+
+
+static inline v8::Local<v8::Script> CompileWithOrigin(const char* source,
+                                                      const char* origin_url) {
+  return CompileWithOrigin(v8_str(source), v8_str(origin_url));
+}
+
+
+// Helper functions that compile and run the source.
 static inline v8::Local<v8::Value> CompileRun(const char* source) {
-  return v8::Script::Compile(
-      v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), source))->Run();
+  return v8::Script::Compile(v8_str(source))->Run();
+}
+
+
+static inline v8::Local<v8::Value> CompileRun(v8::Local<v8::String> source) {
+  return v8::Script::Compile(source)->Run();
 }
 
 
 static inline v8::Local<v8::Value> PreCompileCompileRun(const char* source) {
-  v8::Local<v8::String> script_source =
-      v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), source);
-  v8::ScriptData* preparse = v8::ScriptData::PreCompile(script_source);
-  v8::Local<v8::Script> script =
-      v8::Script::Compile(script_source, NULL, preparse);
+  v8::Isolate* isolate = v8::Isolate::GetCurrent();
+  v8::Local<v8::String> source_string =
+      v8::String::NewFromUtf8(isolate, source);
+  v8::ScriptData* preparse = v8::ScriptData::PreCompile(source_string);
+  v8::ScriptCompiler::Source script_source(
+      source_string, v8::ScriptCompiler::CachedData(
+                         reinterpret_cast<const uint8_t*>(preparse->Data()),
+                         preparse->Length()));
+  v8::Local<v8::Script> script = v8::ScriptCompiler::Compile(
+      isolate, v8::ScriptCompiler::Source(script_source));
   v8::Local<v8::Value> result = script->Run();
   delete preparse;
   return result;
 }
 
 
-// Helper function that compiles and runs the source with given origin.
+// Helper functions that compile and run the source with given origin.
 static inline v8::Local<v8::Value> CompileRunWithOrigin(const char* source,
                                                         const char* origin_url,
                                                         int line_number,
                                                         int column_number) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
-  v8::ScriptOrigin origin(v8::String::NewFromUtf8(isolate, origin_url),
+  v8::ScriptOrigin origin(v8_str(origin_url),
                           v8::Integer::New(isolate, line_number),
                           v8::Integer::New(isolate, column_number));
-  return v8::Script::Compile(v8::String::NewFromUtf8(isolate, source), &origin)
+  return v8::ScriptCompiler::Compile(
+             isolate, v8::ScriptCompiler::Source(v8_str(source), origin))
       ->Run();
 }
 
 
+static inline v8::Local<v8::Value> CompileRunWithOrigin(
+    v8::Local<v8::String> source, const char* origin_url) {
+  v8::ScriptOrigin origin(v8_str(origin_url));
+  return v8::ScriptCompiler::Compile(
+      v8::Isolate::GetCurrent(),
+      v8::ScriptCompiler::Source(source, origin))->Run();
+}
+
+
+static inline v8::Local<v8::Value> CompileRunWithOrigin(
+    const char* source, const char* origin_url) {
+  return CompileRunWithOrigin(v8_str(source), origin_url);
+}
+
+
 // Pick a slightly different port to allow tests to be run in parallel.
 static inline int FlagDependentPortOffset() {
   return ::v8::internal::FLAG_crankshaft == false ? 100 :
          ::v8::internal::FLAG_always_opt ? 200 : 0;
 }
 
 
 // Helper function that simulates a full new-space in the heap.
 static inline void SimulateFullSpace(v8::internal::NewSpace* space) {
   int new_linear_size = static_cast<int>(
@@ skipping 29 matching lines @@
     CHECK_EQ(0, heap_profiler_->heap_object_map()->FindUntrackedObjects());
     heap_profiler_->StopHeapObjectsTracking();
   }
 
  private:
   i::HeapProfiler* heap_profiler_;
 };
 
 
 #endif  // ifndef CCTEST_H_