Permalink
Browse files

Add original filepath for continuations in backtrace

  • Loading branch information...
scannell authored and sgolemon committed Apr 4, 2013
1 parent 46e547b commit b1e00e219b8d0b538b1d067d3cc3d8ca4dc907dc
Showing with 4 additions and 7 deletions.
  1. +3 −2 hphp/runtime/vm/bytecode.cpp
  2. +1 −5 hphp/test/vm/debug_backtrace_continuation.php.exp
@@ -2386,8 +2386,9 @@ Array VMExecutionContext::debugBacktrace(bool skip /* = false */,
if (fp->m_func->isNoInjection()) {
continue;
}
- // Builtins don't have a file and line number
- if (prevFp && !prevFp->m_func->isBuiltin()) {
+ // Builtins don't have a file and line number and Zend 5.5 does not
+ // include this information for generators
+ if (prevFp && !prevFp->m_func->isBuiltin() && !fp->m_func->isGenerator()) {
Unit* unit = prevFp->m_func->unit();
assert(unit);
const char *filename = unit->filepath()->data();
@@ -1,10 +1,6 @@
array(3) {
[0]=>
- array(4) {
- ["file"]=>
- string(0) ""
- ["line"]=>
- int(-1)
+ array(2) {
["function"]=>
string(12) "my_generator"
["args"]=>

0 comments on commit b1e00e2

Please sign in to comment.