Skip to content

Commit e0e9d4d

Browse files
authored
Update PyPy to release 7.3.16, also update core-lib (#59)
2 parents 0228d31 + c1564e5 commit e0e9d4d

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Download PyPy Sources
3939
if: matrix.id != 'basic'
4040
run: |
41-
export PYPYVER=v7.3.15
41+
export PYPYVER=v7.3.16
4242
curl https://downloads.python.org/pypy/pypy2.7-${PYPYVER}-src.tar.bz2 -o pypy.tar.bz2
4343
tar -xjf pypy.tar.bz2
4444
mv pypy2.7-${PYPYVER}-src .pypy

.gitlab-ci.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ stages:
55

66
variables:
77
PYTHONUNBUFFERED: "true"
8-
PYPY_SRC_DIR: /data/home/gitlab-runner/.asdf/installs/awfy/pypysrc-2.7-v7.3.15
9-
PYPY_BIN_DIR: /data/home/gitlab-runner/.asdf/installs/python/pypy2.7-7.3.15/bin
8+
PYPY_RELEASE: "7.3.16"
109

1110
before_script:
1211
- git submodule update --init
12+
- ~/.asdf/bin/asdf install awfy pypysrc-2.7-v${PYPY_RELEASE}
13+
- ~/.asdf/bin/asdf install python pypy2.7-${PYPY_RELEASE}
14+
- export PYPY_SRC_DIR=/data/home/gitlab-runner/.asdf/installs/awfy/pypysrc-2.7-v${PYPY_RELEASE}
15+
- export PYPY_BIN_DIR=/data/home/gitlab-runner/.asdf/installs/python/pypy2.7-${PYPY_RELEASE}/bin
1316

1417
build-and-test-interpreters:
1518
stage: build-test

src/som/interpreter/bc/bytecodes.py

+3
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ def is_one_of(bytecode, candidates):
187187
Bytecodes.q_super_send_n,
188188
]
189189

190+
# These Bytecodes imply a context level of 0
191+
# and thus, are not in blocks, because there the context level would
192+
# be at least 1.
190193
NOT_EXPECTED_IN_BLOCK_BYTECODES = [
191194
Bytecodes.halt,
192195
Bytecodes.push_field_0,

0 commit comments

Comments
 (0)