Skip to content

Commit e1db218

Browse files
committed
Merge pull request #466 from jmglov/bugfix-entrypoint-removed
Fix the build for the latest PyPy nightly build
2 parents b30b2d9 + 0daaefe commit e1db218

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

pixie/vm/c_api.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,23 @@
11

22

3-
from rpython.rlib.entrypoint import entrypoint, RPython_StartupCode
3+
from rpython.rlib.entrypoint import entrypoint_highlevel, RPython_StartupCode
44
from rpython.rtyper.lltypesystem import rffi, lltype
55
from rpython.rtyper.lltypesystem.lloperation import llop
66

77

8-
@entrypoint('main', [rffi.CCHARP], c_name='pixie_init')
8+
@entrypoint_highlevel('main', [rffi.CCHARP], c_name='pixie_init')
99
def pypy_execute_source(ll_progname):
1010
from target import init_vm
11-
after = rffi.aroundstate.after
12-
if after: after()
1311
progname = rffi.charp2str(ll_progname)
1412
init_vm(progname)
1513
res = 0
16-
before = rffi.aroundstate.before
17-
if before: before()
1814
return rffi.cast(rffi.INT, res)
1915

20-
@entrypoint('main', [rffi.CCHARP], c_name='pixie_execute_source')
16+
@entrypoint_highlevel('main', [rffi.CCHARP], c_name='pixie_execute_source')
2117
def pypy_execute_source(ll_source):
2218
from target import EvalFn, run_with_stacklets
23-
after = rffi.aroundstate.after
24-
if after: after()
2519
source = rffi.charp2str(ll_source)
2620
f = EvalFn(source)
2721
run_with_stacklets.invoke([f])
2822
res = 0
29-
before = rffi.aroundstate.before
30-
if before: before()
31-
return rffi.cast(rffi.INT, res)
23+
return rffi.cast(rffi.INT, res)

0 commit comments

Comments
 (0)