From 6ddd4be669bdcb032a277f44af2ed4f795abddb1 Mon Sep 17 00:00:00 2001
From: jdelong <jdelong@fb.com>
Date: Sun, 31 Mar 2013 15:31:06 -0700
Subject: [PATCH] Fix an assertion in traceRet, relating to generator frames

This was firing in my sandbox.  I didn't find anything that
looked like it changed it recently, so I'm not sure why it wasn't
firing earlier.
---
 hphp/runtime/vm/translator/hopt/codegen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hphp/runtime/vm/translator/hopt/codegen.cpp b/hphp/runtime/vm/translator/hopt/codegen.cpp
index 0b5347bf2..4356042aa 100644
--- a/hphp/runtime/vm/translator/hopt/codegen.cpp
+++ b/hphp/runtime/vm/translator/hopt/codegen.cpp
@@ -2023,7 +2023,7 @@ void traceRet(ActRec* fp, Cell* sp, void* rip) {
     return;
   }
   checkFrame(fp, sp, /*checkLocals*/ false);
-  assert(sp <= (Cell*)fp);
+  assert(sp <= (Cell*)fp || fp->m_func->isGenerator());
   // check return value if stack not empty
   if (sp < (Cell*)fp) assertTv(sp);
 }