[Merge chakra-core/ChakraCore@1262d2ea6d] [1.6>1.7] [MERGE #3583 @rajatd

] Allow cross-site objects too in ActivationObjectEx::Is Merge pull request #3583 from rajatd:actObj
nodejs · Sep 25, 2017 · bc8df9e · bc8df9e
1 parent b43c5ee
commit bc8df9e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/deps/chakrashim/core/lib/Runtime/Types/ActivationObject.h b/deps/chakrashim/core/lib/Runtime/Types/ActivationObject.h
@@ -210,7 +210,8 @@ namespace Js
 
         static bool Is(void* instance)
         {
-            return VirtualTableInfo<Js::ActivationObjectEx>::HasVirtualTable(instance);
+            return VirtualTableInfo<ActivationObjectEx>::HasVirtualTable(instance) ||
+                VirtualTableInfo<CrossSiteObject<ActivationObjectEx>>::HasVirtualTable(instance);
         }
 
         static ActivationObjectEx * FromVar(Var instance)

diff --git a/deps/chakrashim/core/test/Closures/bug_OS_13412380.js b/deps/chakrashim/core/test/Closures/bug_OS_13412380.js
@@ -0,0 +1,16 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
+var x = 'outside';
+var result;
+
+(function() {
+  var eval = WScript.LoadScript("", "samethread").eval;
+
+  eval('var x = "inside";');
+
+  result = x;
+}());
+print("passed");
diff --git a/deps/chakrashim/core/test/Closures/rlexe.xml b/deps/chakrashim/core/test/Closures/rlexe.xml
@@ -181,4 +181,10 @@
       <baseline>copy-prop-stack-slot.baseline</baseline>
     </default>
   </test>
+  <test>
+    <default>
+      <files>bug_OS_13412380.js</files>
+      <tags>BugFix,exclude_dynapogo</tags>
+    </default>
+  </test>
 </regress-exe>