Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
deps: Update chakracore to 1.1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
kunalspathak committed Feb 10, 2016
1 parent ee02cb6 commit a34dd03
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 1 deletion.
1 change: 1 addition & 0 deletions deps/chakrashim/core/lib/Backend/GlobOptFields.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1607,6 +1607,7 @@ GlobOpt::CreateFieldSrcValue(PropertySym * sym, PropertySym * originalSym, IR::O
// We don't clear the value when we kill the field.
// Clear it to make sure we don't use the old value.
this->blockData.symToValueMap->Clear(sym->m_id);
this->blockData.symToValueMap->Clear(originalSym->m_id);
}

Assert((*ppOpnd)->AsSymOpnd()->m_sym == sym || this->IsLoopPrePass());
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/common/CommonDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define CHAKRA_CORE_MINOR_VERSION 1
#define CHAKRA_CORE_VERSION_RELEASE 1
#define CHAKRA_CORE_VERSION_PRERELEASE 0
#define CHAKRA_CORE_VERSION_RELEASE_QFE 2
#define CHAKRA_CORE_VERSION_RELEASE_QFE 3

#define CHAKRA_VERSION_RELEASE 0
#define CHAKRA_VERSION_PRERELEASE 1
Expand Down
43 changes: 43 additions & 0 deletions deps/chakrashim/core/test/fieldopts/objptrcopyprop_typescript.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------

function foo(obj, obj2)
{
if (obj.x == 10)
{
obj = obj2;

if (obj.x == 20)
{
return;
}
}

return obj.x;
}


function test()
{
var o1 = new Object();
var o2 = new Object();

o1.x = 10;
o2.x = 30;

for (var i = 0; i < 1000; i++)
{
var result = foo(o1,o2);
if (result != 30)
{
WScript.Echo("FAILED\n");
return;
}
}

WScript.Echo("Passed");
}

test();
5 changes: 5 additions & 0 deletions deps/chakrashim/core/test/fieldopts/rlexe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,11 @@
<baseline>objptrcopyprop_bug.baseline</baseline>
</default>
</test>
<test>
<default>
<files>objptrcopyprop_typescript.js</files>
</default>
</test>
<test>
<default>
<files>fieldcopyprop_typespec.js</files>
Expand Down

0 comments on commit a34dd03

Please sign in to comment.