Merge branch 'master' into trifonov/console-log-release

Author: vtrifonov

test-app/runtime/src/main/cpp/ObjectManager.cpp

@@ -468,8 +468,12 @@ void ObjectManager::MarkReachableObjects(Isolate* isolate, const Local<Object>&
     auto fromId = fromJsInfo->JavaObjectID;
 
     auto curGCNumValue = Integer::New(isolate, numberOfGC);
+    bool firstRun = true;
 
     while (!s.empty()) {
+        auto isInFirstRun = firstRun;
+        firstRun = false;
+
         auto top = s.top();
         s.pop();
 
@@ -478,6 +482,14 @@ void ObjectManager::MarkReachableObjects(Isolate* isolate, const Local<Object>&
         }
 
         auto o = top.As<Object>();
+        if(!isInFirstRun) {
+            uint8_t* addr = NativeScriptExtension::GetAddress(o);
+            auto itFound = m_visited.find(addr);
+            if (itFound != m_visited.end()) {
+                continue;
+            }
+            m_visited.insert(addr); // set as processed only if the current object is not the object we are starting from
+        }
 
         auto jsInfo = GetJSInstanceInfo(o);
         if ((jsInfo != nullptr) && (jsInfo->JavaObjectID != fromId)) {
@@ -492,13 +504,6 @@ void ObjectManager::MarkReachableObjects(Isolate* isolate, const Local<Object>&
             V8SetPrivateValue(isolate, o, propName, curGCNumValue);
         }
 
-        uint8_t* addr = NativeScriptExtension::GetAddress(o);
-        auto itFound = m_visited.find(addr);
-        if (itFound != m_visited.end()) {
-            continue;
-        }
-        m_visited.insert(addr);
-
         if (o->IsFunction()) {
             auto func = o.As<Function>();
 

test-app/runtime/src/main/cpp/Runtime.cpp

@@ -411,7 +411,12 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
 
     snapshotPtr = dlopen(snapshotPath.c_str(), RTLD_LAZY | RTLD_LOCAL);
     if (snapshotPtr == nullptr) {
-        DEBUG_WRITE_FORCE("Failed to load snapshot: %s", dlerror());
+        auto ignoredSearchValue = string("library \"" + snapshotPath + "\" not found");
+        auto currentError = dlerror();
+        std::string stringError(currentError);
+        if (stringError.find(ignoredSearchValue) == std::string::npos) {
+            DEBUG_WRITE_FORCE("Failed to load snapshot: %s", currentError);
+        }
     }
 
     if (snapshotPtr) {