[MERGE #5819 @pleath] Fix full repo UT break

pleath · pleath · commit 573adb7658dd · 2018-11-07T21:19:54.000-08:00
Merge pull request #5819 from pleath:fixcrosssite
diff --git a/lib/Runtime/Library/JavascriptLibrary.cpp b/lib/Runtime/Library/JavascriptLibrary.cpp
@@ -5322,7 +5322,7 @@ namespace Js
             {
                 function->ChangeType();
                 function->SetEntryPoint(scriptContext->CurrentCrossSiteThunk);
-                if (functionProxy && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))
+                if (functionProxy && functionProxy->HasParseableInfo() && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))
                 {
                     function->ShareType();
                     functionProxy->SetCrossSiteDeferredFunctionType(UnsafeVarTo<ScriptFunction>(function)->GetScriptFunctionType());
@@ -5355,7 +5355,7 @@ namespace Js
                     function->ChangeType();
                 }
                 function->SetEntryPoint(scriptContext->CurrentCrossSiteThunk);
-                if (functionProxy && function->GetTypeHandler()->GetMayBecomeShared() && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))
+                if (functionProxy && functionProxy->HasParseableInfo() && function->GetTypeHandler()->GetMayBecomeShared() && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))
                 {
                     function->ShareType();
                     functionProxy->SetCrossSiteUndeferredFunctionType(UnsafeVarTo<ScriptFunction>(function)->GetScriptFunctionType());

Original file line number	Diff line number	Diff line change
`@@ -5322,7 +5322,7 @@ namespace Js`
`5322`	`5322`	`{`
`5323`	`5323`	`function->ChangeType();`
`5324`	`5324`	`function->SetEntryPoint(scriptContext->CurrentCrossSiteThunk);`
`5325`		`- if (functionProxy && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))`
	`5325`	`+ if (functionProxy && functionProxy->HasParseableInfo() && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))`
`5326`	`5326`	`{`
`5327`	`5327`	`function->ShareType();`
`5328`	`5328`	`functionProxy->SetCrossSiteDeferredFunctionType(UnsafeVarTo<ScriptFunction>(function)->GetScriptFunctionType());`
`@@ -5355,7 +5355,7 @@ namespace Js`
`5355`	`5355`	`function->ChangeType();`
`5356`	`5356`	`}`
`5357`	`5357`	`function->SetEntryPoint(scriptContext->CurrentCrossSiteThunk);`
`5358`		`- if (functionProxy && function->GetTypeHandler()->GetMayBecomeShared() && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))`
	`5358`	`+ if (functionProxy && functionProxy->HasParseableInfo() && function->GetTypeHandler()->GetMayBecomeShared() && !PHASE_OFF1(ShareCrossSiteFuncTypesPhase))`
`5359`	`5359`	`{`
`5360`	`5360`	`function->ShareType();`
`5361`	`5361`	`functionProxy->SetCrossSiteUndeferredFunctionType(UnsafeVarTo<ScriptFunction>(function)->GetScriptFunctionType());`