Update PyPy to release 7.3.16, also update core-lib (#59)

SOM-st · May 7, 2024 · e0e9d4d · e0e9d4d
2 parents 0228d31 + c1564e5
commit e0e9d4d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Download PyPy Sources
         if: matrix.id != 'basic'
         run: |
-          export PYPYVER=v7.3.15
+          export PYPYVER=v7.3.16
           curl https://downloads.python.org/pypy/pypy2.7-${PYPYVER}-src.tar.bz2 -o pypy.tar.bz2
           tar -xjf pypy.tar.bz2
           mv pypy2.7-${PYPYVER}-src .pypy

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,11 +5,14 @@ stages:
 
 variables:
   PYTHONUNBUFFERED: "true"
-  PYPY_SRC_DIR: /data/home/gitlab-runner/.asdf/installs/awfy/pypysrc-2.7-v7.3.15
-  PYPY_BIN_DIR: /data/home/gitlab-runner/.asdf/installs/python/pypy2.7-7.3.15/bin
+  PYPY_RELEASE: "7.3.16"
 
 before_script:
   - git submodule update --init
+  - ~/.asdf/bin/asdf install awfy pypysrc-2.7-v${PYPY_RELEASE}
+  - ~/.asdf/bin/asdf install python pypy2.7-${PYPY_RELEASE}
+  - export PYPY_SRC_DIR=/data/home/gitlab-runner/.asdf/installs/awfy/pypysrc-2.7-v${PYPY_RELEASE}
+  - export PYPY_BIN_DIR=/data/home/gitlab-runner/.asdf/installs/python/pypy2.7-${PYPY_RELEASE}/bin
 
 build-and-test-interpreters:
   stage: build-test

diff --git a/core-lib b/core-lib
diff --git a/src/som/interpreter/bc/bytecodes.py b/src/som/interpreter/bc/bytecodes.py
@@ -187,6 +187,9 @@ def is_one_of(bytecode, candidates):
     Bytecodes.q_super_send_n,
 ]
 
+# These Bytecodes imply a context level of 0
+# and thus, are not in blocks, because there the context level would
+# be at least 1.
 NOT_EXPECTED_IN_BLOCK_BYTECODES = [
     Bytecodes.halt,
     Bytecodes.push_field_0,
+76 −0		Examples/Benchmarks/LanguageFeatures/LocalLoop.som
+76 −0		Examples/Benchmarks/LanguageFeatures/LocalLoopNop.som
+76 −0		Examples/Benchmarks/LanguageFeatures/LocalLoopStore.som
+78 −0		Examples/Benchmarks/LanguageFeatures/LoopTrivialDispatch.som