Author: Richard Plangger <[email protected]>
Branch: vmprof-native
Changeset: r90075:38a11c8364c1
Date: 2017-02-13 11:38 +0100
http://bitbucket.org/pypy/pypy/changeset/38a11c8364c1/

Log:    local variable overwrote previous definition, crashes translated
        version

diff --git a/rpython/jit/metainterp/optimizeopt/version.py 
b/rpython/jit/metainterp/optimizeopt/version.py
--- a/rpython/jit/metainterp/optimizeopt/version.py
+++ b/rpython/jit/metainterp/optimizeopt/version.py
@@ -76,7 +76,7 @@
                                                  descr, vl.inputargs,
                                                  vl.operations, jitcell_token,
                                                  metainterp.box_names_memo)
-                record_loop_or_bridge(metainterp_sd, vl)
+                record_loop_or_bridge(metainterp_sd, vl, asminfo)
                 assert asminfo is not None
                 compiled[version] = (asminfo, descr, version, jitcell_token)
             else:
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -106,9 +106,9 @@
                                   lltype.Void, compilation_info=eci,
                                   _nowrapper=True)
 
-    vmp_dyn_cancel = rffi.llexternal("vmp_dyn_teardown", [lltype.Void],
-                                  rffi.INT, compilation_info=eci,
-                                  _nowrapper=True)
+    vmp_dyn_teardown = rffi.llexternal("vmp_dyn_teardown", [lltype.Void],
+                                       rffi.INT, compilation_info=eci,
+                                       _nowrapper=True)
 
     return CInterface(locals())
 
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to