Skip to content

Commit 45a0ba2

Browse files
authored
Merge pull request #31 from s-ludwig/ldc-1.42.0-fix
Force reinterpret-cast to reverse the cast in FunctionDefinition.semantic
2 parents f93cb97 + 72edb24 commit 45a0ba2

4 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: ./run-test262.sh
5656

5757
- name: Upload log
58-
uses: actions/upload-artifact@v3
58+
uses: actions/upload-artifact@v4
5959
if: always()
6060
with:
6161
name: runtest262 log

engine/source/dmdscript/expression.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ class FunctionLiteral : Expression
608608

609609
override Expression semantic(Scope *sc)
610610
{
611-
func = cast(FunctionDefinition)(func.semantic(sc));
611+
func = cast(FunctionDefinition)cast(void*)func.semantic(sc);
612612
return this;
613613
}
614614

run-test262.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cd test262-harness-py
2929
python3 src/test262.py --summary --non_strict_only --command ../timed-dmdscript.sh --tests=../test262 | tee ../dmdscript-test262.log | grep -a '=== .* failed in .* ==='
3030
cd ..
3131

32-
EXPECTED_TO_PASS=5238
32+
EXPECTED_TO_PASS=5239
3333
PASSED=$(grep -a ' - Passed [0-9]* tests' dmdscript-test262.log | sed -n 's/.*Passed \([0-9]*\) tests.*/\1/;P')
3434

3535
if [ "$PASSED" -gt "$EXPECTED_TO_PASS" ]; then

test262-patches/test262-parseTestRecord.py.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ diff --git "a/src/parseTestRecord.py" "b/src/parseTestRecord.py"
22
index 22d5664..5be3a5f 100644
33
--- "a/src/parseTestRecord.py"
44
+++ "b/src/parseTestRecord.py"
5+
@@ -16,7 +16,7 @@
6+
import sys
7+
import tempfile
8+
import time
9+
-import imp
10+
+import importlib
11+
12+
from _monkeyYaml import load as yamlLoad
13+
514
@@ -78,7 +78,7 @@ def yamlAttrParser(testRecord, attrs, name):
615
parsed = yamlLoad(body)
716

0 commit comments

Comments
 (0)