summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-03-29 13:52:51 +0000
committerDamien George <damien.p.george@gmail.com>2014-03-29 13:52:51 +0000
commitb04be056fe7694cdfe2df4c5103546a39d4fd8b2 (patch)
treeae3c8e8a38270ba557542c5d3dd0ff17f887f467
parent918638ec6e6bf69ff402af5a95913515f6f8f632 (diff)
downloadmicropython-b04be056fe7694cdfe2df4c5103546a39d4fd8b2.tar.gz
micropython-b04be056fe7694cdfe2df4c5103546a39d4fd8b2.zip
py: Fix regress with GeneratorExit object becoming truly const.
-rw-r--r--py/vm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/py/vm.c b/py/vm.c
index 1f349dea61..0ff27254a0 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -735,7 +735,8 @@ yield:
// set file and line number that the exception occurred at
// TODO: don't set traceback for exceptions re-raised by END_FINALLY.
// But consider how to handle nested exceptions.
- if (mp_obj_is_exception_instance(nlr.ret_val)) {
+ // TODO need a better way of not adding traceback to constant objects (right now, just GeneratorExit_obj)
+ if (mp_obj_is_exception_instance(nlr.ret_val) && nlr.ret_val != &mp_const_GeneratorExit_obj) {
machine_uint_t code_info_size = code_info[0] | (code_info[1] << 8) | (code_info[2] << 16) | (code_info[3] << 24);
qstr source_file = code_info[4] | (code_info[5] << 8) | (code_info[6] << 16) | (code_info[7] << 24);
qstr block_name = code_info[8] | (code_info[9] << 8) | (code_info[10] << 16) | (code_info[11] << 24);