Skip to content

Commit 9130841

Browse files
committed
[MERGE #5422 @mrkmarron] TTD: Fix hang in pug + other NPM failures.
Merge pull request #5422 from mrkmarron:hangfix
2 parents a1bdacf + de8be08 commit 9130841

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/Runtime/Debug/TTEventLog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ namespace TTD
10351035
#endif
10361036

10371037
#if ENABLE_BASIC_TRACE || ENABLE_FULL_BC_TRACE
1038-
this->m_threadContext->TTDExecutionInfo->GetTraceLogger()->WriteCall(func, true, argc, argv, this->GetLastEventTime());
1038+
this->m_threadContext->TTDExecutionInfo->GetTraceLogger()->WriteCall(func, true, args.Info.Count, args.Values, this->GetLastEventTime());
10391039
#endif
10401040

10411041
return evt;
@@ -1063,7 +1063,7 @@ namespace TTD
10631063
ThreadContextTTD* executeContext = ctx->GetThreadContext()->TTDContext;
10641064

10651065
#if ENABLE_BASIC_TRACE || ENABLE_FULL_BC_TRACE
1066-
this->m_threadContext->TTDExecutionInfo->GetTraceLogger()->WriteCall(function, true, argc, argv, this->GetLastEventTime());
1066+
this->m_threadContext->TTDExecutionInfo->GetTraceLogger()->WriteCall(function, true, args.Info.Count, args.Values, this->GetLastEventTime());
10671067
#endif
10681068

10691069
//make sure we log all of the passed arguments in the replay host

lib/Runtime/Types/DynamicObject.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,13 @@ namespace Js
895895

896896
bool DynamicObject::TryCopy(DynamicObject* from)
897897
{
898+
#if ENABLE_TTD
899+
if (from->GetScriptContext()->ShouldPerformRecordOrReplayAction())
900+
{
901+
return false;
902+
}
903+
#endif
904+
898905
if (PHASE_OFF1(ObjectCopyPhase))
899906
{
900907
return false;

0 commit comments

Comments
 (0)