[MERGE #5563 @VSadov] Fixing build of internal projects.

Merge pull request #5563 from VSadov:hpp
chakra-core · Aug 1, 2018 · e1e73e7 · e1e73e7
2 parents f270e03 + ae5abc6
commit e1e73e7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/lib/Runtime/Library/JavascriptProxy.cpp b/lib/Runtime/Library/JavascriptProxy.cpp
@@ -1619,6 +1619,25 @@ namespace Js
         return JavascriptObject::ToStringHelper(target, scriptContext);
     }
 
+    // before recursively calling something on 'target' use this helper in case there is nesting of proxies.
+    // the proxies could be deep nested and cause SO when processed recursively.
+    const JavascriptProxy* JavascriptProxy::UnwrapNestedProxies(const JavascriptProxy* proxy)
+    {
+        // continue while we have a proxy that is not revoked
+        while (proxy->handler != nullptr)
+        {
+            JavascriptProxy* nestedProxy = JavascriptOperators::TryFromVar<JavascriptProxy>(proxy->target);
+            if (nestedProxy == nullptr)
+            {
+                break;
+            }
+
+            proxy = nestedProxy;
+        }
+
+        return proxy;
+    }
+
     BOOL JavascriptProxy::GetDiagTypeString(StringBuilder<ArenaAllocator>* stringBuilder, ScriptContext* requestContext)
     {
         const JavascriptProxy* proxy = UnwrapNestedProxies(this);

diff --git a/lib/Runtime/Library/JavascriptProxy.h b/lib/Runtime/Library/JavascriptProxy.h
@@ -57,22 +57,7 @@ namespace Js
 
         // before recursively calling something on 'target' use this helper in case there is nesting of proxies.
         // the proxies could be deep nested and cause SO when processed recursively.
-        static const JavascriptProxy* UnwrapNestedProxies(const JavascriptProxy* proxy)
-        {
-            // continue while we have a proxy that is not revoked
-            while (proxy->handler != nullptr)
-            {
-                JavascriptProxy* nestedProxy = JavascriptOperators::TryFromVar<JavascriptProxy>(proxy->target);
-                if (nestedProxy == nullptr)
-                {
-                    break;
-                }
-
-                proxy = nestedProxy;
-            }
-
-            return proxy;
-        }
+        static const JavascriptProxy* UnwrapNestedProxies(const JavascriptProxy* proxy);
 
 #ifndef IsJsDiag
         RecyclableObject* GetTarget();