[pypy-commit] pypy vmprof2: ups

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: vmprof2
Changeset: r76820:49daf024add4
Date: 2015-04-17 17:09 +0200
http://bitbucket.org/pypy/pypy/changeset/49daf024add4/

Log:	ups

diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -200,9 +200,9 @@
         return fail_descr, target
 
     def enter_portal_frame(self, op):
-        self.codemap_builder.debug_merge_point(op.getarg(0).getint(),
-                                               op.getarg(1).getint(),
-                                               self.mc.get_relative_pos())
+        self.codemap_builder.enter_portal_frame(op.getarg(0).getint(),
+                                                op.getarg(1).getint(),
+                                                self.mc.get_relative_pos())
 
     def leave_portal_frame(self, op):
         self.codemap_builder.leave_portal_frame(op.getarg(0).getint(),