[MERGE #5350 @rajatd] Enabling stack args in functions having exception handling. OS #17869732

rajatd · rajatd · commit 40a21ee02c71 · 2018-06-22T15:46:07.000-07:00
Merge pull request #5350 from rajatd:stackargs-tc
diff --git a/lib/Backend/Func.cpp b/lib/Backend/Func.cpp
@@ -185,7 +185,7 @@ Func::Func(JitArenaAllocator *alloc, JITTimeWorkItem * workItem,
 
     if (m_workItem->Type() == JsFunctionType &&
         GetJITFunctionBody()->DoBackendArgumentsOptimization() &&
-        !GetJITFunctionBody()->HasTry())
+        (!GetJITFunctionBody()->HasTry() || this->DoOptimizeTry()))
     {
         // doBackendArgumentsOptimization bit is set when there is no eval inside a function
         // as determined by the bytecode generator.

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ Func::Func(JitArenaAllocator alloc, JITTimeWorkItem workItem,`
`185`	`185`
`186`	`186`	`if (m_workItem->Type() == JsFunctionType &&`
`187`	`187`	`GetJITFunctionBody()->DoBackendArgumentsOptimization() &&`
`188`		`- !GetJITFunctionBody()->HasTry())`
	`188`	`+ (!GetJITFunctionBody()->HasTry() \|\| this->DoOptimizeTry()))`
`189`	`189`	`{`
`190`	`190`	`// doBackendArgumentsOptimization bit is set when there is no eval inside a function`
`191`	`191`	`// as determined by the bytecode generator.`