Stop inserting invalid blockEnd instructions in simplify.cpp

paulbiss · facebook-github-bot · commit 013b847a6012 · 2020-03-11T10:51:04.000-07:00
Summary: The simplifier cannot insert block end instructions in the middle of an instruction stream. Generate `LdFuncName` before `RaiseWarning`.

Reviewed By: markw65

Differential Revision: D20250260

fbshipit-source-id: ae66953feeeb2ec369c82b76c19e1fca2c5a10b9
diff --git a/hphp/runtime/vm/jit/simplify.cpp b/hphp/runtime/vm/jit/simplify.cpp
@@ -2370,10 +2370,11 @@ SSATmp* simplifyConvTVToStr(State& env, const IRInstruction* inst) {
   if (srcType <= TObj)    return gen(env, ConvObjToStr, catchTrace, src);
   if (srcType <= TRes)    return gen(env, ConvResToStr, catchTrace, src);
   if (srcType <= TFunc) {
+    auto const ret = gen(env, LdFuncName, src);
     if (RuntimeOption::EvalRaiseFuncConversionWarning) {
       gen(env, RaiseWarning, catchTrace, cns(env, s_msgFuncToStr.get()));
     }
-    return gen(env, LdFuncName, src);
+    return ret;
   }
   if (srcType <= TClsMeth) {
     if (RuntimeOption::EvalRaiseClsMethConversionWarning) {

Original file line number	Diff line number	Diff line change
`@@ -2370,10 +2370,11 @@ SSATmp* simplifyConvTVToStr(State& env, const IRInstruction* inst) {`
`2370`	`2370`	`if (srcType <= TObj) return gen(env, ConvObjToStr, catchTrace, src);`
`2371`	`2371`	`if (srcType <= TRes) return gen(env, ConvResToStr, catchTrace, src);`
`2372`	`2372`	`if (srcType <= TFunc) {`
	`2373`	`+ auto const ret = gen(env, LdFuncName, src);`
`2373`	`2374`	`if (RuntimeOption::EvalRaiseFuncConversionWarning) {`
`2374`	`2375`	`gen(env, RaiseWarning, catchTrace, cns(env, s_msgFuncToStr.get()));`
`2375`	`2376`	`}`
`2376`		`- return gen(env, LdFuncName, src);`
	`2377`	`+ return ret;`
`2377`	`2378`	`}`
`2378`	`2379`	`if (srcType <= TClsMeth) {`
`2379`	`2380`	`if (RuntimeOption::EvalRaiseClsMethConversionWarning) {`