diff -r 000000000000 -r 6474c204b198 js/src/jit-test/tests/debug/Environment-callee-03.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit-test/tests/debug/Environment-callee-03.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,31 @@
+// Environments of different instances of the same generator have the same
+// callee. I love this job.
+
+var g = newGlobal();
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+
+function check(gen, label) {
+  print("check(" + label + ")");
+  var hits;
+  dbg.onDebuggerStatement = function (frame) {
+    hits++;
+    var env = frame.environment;
+    assertEq(env.callee, gw.makeDebuggeeValue(g.f));
+  };
+  hits = 0;
+  gen.next();
+  assertEq(hits, 1);
+}
+
+g.eval('function f(x) { debugger; yield x; }');
+g.eval('var g = f(2);');
+g.eval('var h = f(3);');
+check(g.g, 'g.g');
+check(g.h, 'g.h');
+
+g.eval('function* f(x) { debugger; yield x; }');
+g.eval('var g = f(2);');
+g.eval('var h = f(3);');
+check(g.g, 'g.g');
+check(g.h, 'g.h');