v8: Fix the script name and line number in CompileEval

ogoffart · nierob · commit e44b4b6d43d2 · 2011-05-04T10:59:13.000+02:00
Add a way to register the script name and the line/column offset
in CompileEval
diff --git a/src/3rdparty/v8/src/api.cc b/src/3rdparty/v8/src/api.cc
@@ -1513,11 +1513,28 @@ Local<Script> Script::CompileEval(v8::Handle<String> source,
   ENTER_V8(isolate);
   i::Handle<i::String> str = Utils::OpenHandle(*source);
   i::Handle<i::Context> context(isolate->context());
+
+  i::Handle<i::Object> name_obj;
+  int line_offset = 0;
+  int column_offset = 0;
+  if (origin != NULL) {
+    if (!origin->ResourceName().IsEmpty()) {
+      name_obj = Utils::OpenHandle(*origin->ResourceName());
+    }
+    if (!origin->ResourceLineOffset().IsEmpty()) {
+      line_offset = static_cast<int>(origin->ResourceLineOffset()->Value());
+    }
+    if (!origin->ResourceColumnOffset().IsEmpty()) {
+      column_offset = static_cast<int>(origin->ResourceColumnOffset()->Value());
+    }
+  }
+
   i::Handle<i::SharedFunctionInfo> shared = i::Compiler::CompileEval(
       str,
       context,
       context->IsGlobalContext(),
-      i::kNonStrictMode);
+      i::kNonStrictMode,
+      name_obj, line_offset, column_offset);
   if (shared.is_null())
       return Local<Script>();
   i::Handle<i::JSFunction> result = isolate->factory()->NewFunctionFromSharedFunctionInfo(
diff --git a/src/3rdparty/v8/src/compilation-cache.cc b/src/3rdparty/v8/src/compilation-cache.cc
@@ -148,7 +148,7 @@ bool CompilationCacheScript::HasOrigin(
     int line_offset,
     int column_offset) {
   Handle<Script> script =
-      Handle<Script>(Script::cast(function_info->script()), isolate());
+      Handle<Script>(Script::cast(function_info->script()), internal::Isolate::Current());
   // If the script name isn't set, the boilerplate script should have
   // an undefined name to have the same origin.
   if (name.is_null()) {
@@ -254,7 +254,11 @@ void CompilationCacheScript::Put(Handle<String> source,
 Handle<SharedFunctionInfo> CompilationCacheEval::Lookup(
     Handle<String> source,
     Handle<Context> context,
-    StrictModeFlag strict_mode) {
+    StrictModeFlag strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+    , Handle<Object> name, int line_offset, int column_offset
+#endif
+    ) {
   // Make sure not to leak the table into the surrounding handle
   // scope. Otherwise, we risk keeping old tables around even after
   // having cleared the cache.
@@ -263,9 +267,18 @@ Handle<SharedFunctionInfo> CompilationCacheEval::Lookup(
   { HandleScope scope(isolate());
     for (generation = 0; generation < generations(); generation++) {
       Handle<CompilationCacheTable> table = GetTable(generation);
-      result = table->LookupEval(*source, *context, strict_mode);
-      if (result->IsSharedFunctionInfo()) {
-        break;
+      Handle<Object> probe(table->LookupEval(*source, *context, strict_mode));
+      if (probe->IsSharedFunctionInfo()) {
+#ifdef QT_BUILD_SCRIPT_LIB
+        Handle<SharedFunctionInfo> function_info =
+          Handle<SharedFunctionInfo>::cast(probe);
+        // Break when we've found a suitable shared function info that
+        // matches the origin.
+        if (CompilationCacheScript::HasOrigin(function_info, name, line_offset, column_offset)) {
+          result = *function_info;
+          break;
+        }
+#endif
       }
     }
   }
@@ -393,16 +406,29 @@ Handle<SharedFunctionInfo> CompilationCache::LookupEval(
     Handle<String> source,
     Handle<Context> context,
     bool is_global,
-    StrictModeFlag strict_mode) {
+    StrictModeFlag strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+    , Handle<Object> script_name,
+    int line_offset, int column_offset
+#endif
+) {
   if (!IsEnabled()) {
     return Handle<SharedFunctionInfo>::null();
   }
 
   Handle<SharedFunctionInfo> result;
   if (is_global) {
-    result = eval_global_.Lookup(source, context, strict_mode);
+    result = eval_global_.Lookup(source, context, strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+        ,script_name, line_offset, column_offset
+#endif
+        );
   } else {
-    result = eval_contextual_.Lookup(source, context, strict_mode);
+    result = eval_contextual_.Lookup(source, context, strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+        ,script_name, line_offset, column_offset
+#endif
+        );
   }
   return result;
 }
diff --git a/src/3rdparty/v8/src/compilation-cache.h b/src/3rdparty/v8/src/compilation-cache.h
@@ -111,6 +111,10 @@ class CompilationCacheScript : public CompilationSubCache {
   Handle<CompilationCacheTable> TablePut(
       Handle<String> source, Handle<SharedFunctionInfo> function_info);
 
+#ifdef QT_BUILD_SCRIPT_LIB
+public:
+  static
+#endif
   bool HasOrigin(Handle<SharedFunctionInfo> function_info,
                  Handle<Object> name,
                  int line_offset,
@@ -131,7 +135,11 @@ class CompilationCacheEval: public CompilationSubCache {
 
   Handle<SharedFunctionInfo> Lookup(Handle<String> source,
                                     Handle<Context> context,
-                                    StrictModeFlag strict_mode);
+                                    StrictModeFlag strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+                                    , Handle<Object> script_name, int line_offset, int column_offset
+#endif
+                                   );
 
   void Put(Handle<String> source,
            Handle<Context> context,
@@ -198,7 +206,12 @@ class CompilationCache {
   Handle<SharedFunctionInfo> LookupEval(Handle<String> source,
                                         Handle<Context> context,
                                         bool is_global,
-                                        StrictModeFlag strict_mode);
+                                        StrictModeFlag strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+                                        , Handle<Object> script_name  = Handle<Object>(),
+                                        int line_offset = 0, int column_offset = 0
+#endif
+                                       );
 
   // Returns the regexp data associated with the given regexp if it
   // is in cache, otherwise an empty handle.
diff --git a/src/3rdparty/v8/src/compiler.cc b/src/3rdparty/v8/src/compiler.cc
@@ -543,7 +543,12 @@ Handle<SharedFunctionInfo> Compiler::Compile(Handle<String> source,
 Handle<SharedFunctionInfo> Compiler::CompileEval(Handle<String> source,
                                                  Handle<Context> context,
                                                  bool is_global,
-                                                 StrictModeFlag strict_mode) {
+                                                 StrictModeFlag strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+                                                 , Handle<Object> script_name,
+                                                 int line_offset, int column_offset
+#endif
+  ) {
   Isolate* isolate = source->GetIsolate();
   int source_length = source->length();
   isolate->counters()->total_eval_size()->Increment(source_length);
@@ -559,11 +564,22 @@ Handle<SharedFunctionInfo> Compiler::CompileEval(Handle<String> source,
   result = compilation_cache->LookupEval(source,
                                          context,
                                          is_global,
-                                         strict_mode);
+                                         strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+        ,script_name, line_offset, column_offset
+#endif
+        );
 
   if (result.is_null()) {
     // Create a script object describing the script to be compiled.
     Handle<Script> script = isolate->factory()->NewScript(source);
+#ifdef QT_BUILD_SCRIPT_LIB
+    if (!script_name.is_null()) {
+        script->set_name(*script_name);
+        script->set_line_offset(Smi::FromInt(line_offset));
+        script->set_column_offset(Smi::FromInt(column_offset));
+    }
+#endif
     CompilationInfo info(script);
     info.MarkAsEval();
     if (is_global) info.MarkAsGlobal();
diff --git a/src/3rdparty/v8/src/compiler.h b/src/3rdparty/v8/src/compiler.h
@@ -259,7 +259,12 @@ class Compiler : public AllStatic {
   static Handle<SharedFunctionInfo> CompileEval(Handle<String> source,
                                                 Handle<Context> context,
                                                 bool is_global,
-                                                StrictModeFlag strict_mode);
+                                                StrictModeFlag strict_mode
+#ifdef QT_BUILD_SCRIPT_LIB
+                                                , Handle<Object> script_name = Handle<Object>(),
+                                                int line_offset = 0, int column_offset = 0
+#endif
+                                               );
 
   // Compile from function info (used for lazy compilation). Returns true on
   // success and false if the compilation resulted in a stack overflow.
