Simplify and go straight to functionInfo for GetAllowDirectSuper()

Suwei Chen · Suwei Chen · commit e21e77e6a0b1 · 2017-02-14T16:50:19.000-08:00
diff --git a/lib/Runtime/ByteCode/ByteCodeGenerator.cpp b/lib/Runtime/ByteCode/ByteCodeGenerator.cpp
@@ -2585,14 +2585,9 @@ bool FuncAllowsDirectSuper(FuncInfo *funcInfo, ByteCodeGenerator *byteCodeGenera
     if (funcInfo->IsGlobalFunction() && ((byteCodeGenerator->GetFlags() & fscrEval) != 0))
     {
         Js::JavascriptFunction *caller = nullptr;
-        if (Js::JavascriptStackWalker::GetCaller(&caller, byteCodeGenerator->GetScriptContext()) && Js::ScriptFunction::Is(caller))
+        if (Js::JavascriptStackWalker::GetCaller(&caller, byteCodeGenerator->GetScriptContext()) && caller->GetFunctionInfo()->GetAllowDirectSuper())
         {
-            Js::FunctionBody * callerBody = caller->GetFunctionBody();
-            Assert(callerBody);
-            if (callerBody->GetFunctionInfo()->GetAllowDirectSuper())
-            {
-                return true;
-            }
+            return true;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2585,14 +2585,9 @@ bool FuncAllowsDirectSuper(FuncInfo funcInfo, ByteCodeGenerator byteCodeGenera`
`2585`	`2585`	`if (funcInfo->IsGlobalFunction() && ((byteCodeGenerator->GetFlags() & fscrEval) != 0))`
`2586`	`2586`	`{`
`2587`	`2587`	`Js::JavascriptFunction *caller = nullptr;`
`2588`		`- if (Js::JavascriptStackWalker::GetCaller(&caller, byteCodeGenerator->GetScriptContext()) && Js::ScriptFunction::Is(caller))`
	`2588`	`+ if (Js::JavascriptStackWalker::GetCaller(&caller, byteCodeGenerator->GetScriptContext()) && caller->GetFunctionInfo()->GetAllowDirectSuper())`
`2589`	`2589`	`{`
`2590`		`- Js::FunctionBody * callerBody = caller->GetFunctionBody();`
`2591`		`- Assert(callerBody);`
`2592`		`- if (callerBody->GetFunctionInfo()->GetAllowDirectSuper())`
`2593`		`- {`
`2594`		`- return true;`
`2595`		`- }`
	`2590`	`+ return true;`
`2596`	`2591`	`}`
`2597`	`2592`	`}`
`2598`	`2593`