[1.8>1.9] [MERGE #4598 @sigatrev] OS#15490382: assign string value ty…

…pe to the result of TypeofElem Merge pull request #4598 from sigatrev:typeOfElem
chakra-core · Jan 29, 2018 · abd18d0 · abd18d0
2 parents acd7454 + 3e52c09
commit abd18d0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/lib/Backend/GlobOpt.cpp b/lib/Backend/GlobOpt.cpp
@@ -5195,6 +5195,7 @@ GlobOpt::ValueNumberDst(IR::Instr **pInstr, Value *src1Val, Value *src2Val)
         break;
 
     case Js::OpCode::Typeof:
+    case Js::OpCode::TypeofElem:
         return this->NewGenericValue(ValueType::String, dst);
     case Js::OpCode::InitLocalClosure:
         Assert(instr->GetDst());

diff --git a/test/Bugs/bug15490382.js b/test/Bugs/bug15490382.js
@@ -0,0 +1,23 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
+function bar(x)
+{
+    if (x != x)
+    {
+        return;
+    }
+}
+
+function foo()
+{
+    bar(typeof arguments[0]);
+};
+
+foo();
+foo();
+foo();
+
+WScript.Echo("Passed");
diff --git a/test/Bugs/rlexe.xml b/test/Bugs/rlexe.xml
@@ -428,4 +428,9 @@
       <baseline>bug13830477.baseline</baseline>
     </default>
   </test>
+  <test>
+    <default>
+      <files>bug15490382.js</files>
+    </default>
+  </test>
 </regress-exe>