fix(shared): SourceLocation::ToString

altmp · Dec 29, 2023 · c73c1a7 · c73c1a7
1 parent f02660a
commit c73c1a7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/shared/V8Helpers.cpp b/shared/V8Helpers.cpp
@@ -189,17 +189,18 @@ V8Helpers::SourceLocation::SourceLocation(std::string&& _fileName, int _line, v8
     context.Reset(ctx->GetIsolate(), ctx);
 }
 
-std::string V8Helpers::SourceLocation::ToString()
+std::string V8Helpers::SourceLocation::ToString(v8::Isolate* isolate)
 {
-    auto isolate = v8::Isolate::GetCurrent();
-
     std::stringstream stream;
     stream << "[";
+
     // Check if not inside a worker
-    if(!(*static_cast<bool*>(isolate->GetData(v8::Isolate::GetNumberOfDataSlots() - 1))))
+    bool* isWorker = static_cast<bool*>(isolate->GetData(v8::Isolate::GetNumberOfDataSlots() - 1));
+    if (!isWorker || !(*isWorker))
     {
-        stream << V8ResourceImpl::Get(context.Get(v8::Isolate::GetCurrent()))->GetResource()->GetName() << ":";
+        stream << V8ResourceImpl::Get(context.Get(isolate))->GetResource()->GetName() << ":";
     }
+
     stream << fileName << ":" << line << "]";
     return stream.str();
 }

diff --git a/shared/V8Helpers.h b/shared/V8Helpers.h
@@ -59,7 +59,7 @@ namespace V8Helpers
             return line;
         }
 
-        std::string ToString();
+        std::string ToString(v8::Isolate* isolate);
 
         static SourceLocation GetCurrent(v8::Isolate* isolate, V8ResourceImpl* resource = nullptr);
 

diff --git a/shared/V8ResourceImpl.h b/shared/V8ResourceImpl.h
@@ -86,7 +86,7 @@ class V8ResourceImpl : public alt::IResource::Impl
 
         if(!anyHandlerRemoved)
         {
-            Log::Warning << location.ToString() << " alt.off was called for event \"" << ev << "\" with function reference that was not subscribed" << Log::Endl;
+            Log::Warning << location.ToString(isolate) << " alt.off was called for event \"" << ev << "\" with function reference that was not subscribed" << Log::Endl;
             return;
         }
 

diff --git a/shared/helpers/Macros.h b/shared/helpers/Macros.h
@@ -377,6 +377,6 @@
     {                                                                                                                                                                                     \
         V8_GET_ISOLATE();                                                                                                                                                                 \
         V8_GET_RESOURCE();                                                                                                                                                                \
-        Log::Warning << V8Helpers::SourceLocation::GetCurrent(isolate, resource).ToString() << " " << oldName << " is deprecated and will be removed in future versions. Consider using " \
+        Log::Warning << V8Helpers::SourceLocation::GetCurrent(isolate, resource).ToString(isolate) << " " << oldName << " is deprecated and will be removed in future versions. Consider using " \
                      << newName << " instead" << Log::Endl;                                                                                                                               \
     }
diff --git a/shared/helpers/Serialization.cpp b/shared/helpers/Serialization.cpp
@@ -56,7 +56,7 @@ alt::MValue V8Helpers::V8ToMValue(v8::Local<v8::Value> val, bool allowFunction)
         {
             if(!allowFunction)
             {
-                Log::Error << V8Helpers::SourceLocation::GetCurrent(isolate).ToString() << " "
+                Log::Error << V8Helpers::SourceLocation::GetCurrent(isolate).ToString(isolate) << " "
                            << "Cannot convert function to MValue" << Log::Endl;
                 return core.CreateMValueNone();
             }