From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 6 Oct 2017 14:03:07 +0000 (-0300)
Subject: Add line numbers to Opcache's zend_dump_op() debug output
X-Git-Tag: php-7.3.0alpha1~1323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fe6b29356923c23fadf610a9fa421cff8b06d6d;p=php

Add line numbers to Opcache's zend_dump_op() debug output
---

diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c
index 36e1b68542..1b77eae74e 100644
--- a/ext/opcache/Optimizer/zend_dump.c
+++ b/ext/opcache/Optimizer/zend_dump.c
@@ -419,9 +419,9 @@ static void zend_dump_op(const zend_op_array *op_array, const zend_basic_block *
 	}
 
 	if (!b) {
-		len = fprintf(stderr, "L%u:", (uint32_t)(opline - op_array->opcodes));
+		len = fprintf(stderr, "L%u (%u):", (uint32_t)(opline - op_array->opcodes), opline->lineno);
 	}
-	fprintf(stderr, "%*c", 8-len, ' ');
+	fprintf(stderr, "%*c", 12-len, ' ');
 
 	if (!ssa || !ssa->ops || ssa->ops[opline - op_array->opcodes].result_use < 0) {
 		if (opline->result_type & (IS_CV|IS_VAR|IS_TMP_VAR)) {
diff --git a/ext/opcache/tests/opt/dce_001.phpt b/ext/opcache/tests/opt/dce_001.phpt
index e41afdafa1..475dc8191c 100644
--- a/ext/opcache/tests/opt/dce_001.phpt
+++ b/ext/opcache/tests/opt/dce_001.phpt
@@ -19,13 +19,13 @@ function foo(string $s1, string $s2, string $s3, string $s4) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_001.php:1-8
-L0:     RETURN int(1)
+L0 (8):     RETURN int(1)
 
 foo: ; (lines=5, args=4, vars=4, tmps=0)
     ; (after optimizer)
     ; %sdce_001.php:2-6
-L0:     CV0($s1) = RECV 1
-L1:     CV1($s2) = RECV 2
-L2:     CV2($s3) = RECV 3
-L3:     CV3($s4) = RECV 4
-L4:     RETURN int(0)
+L0 (2):     CV0($s1) = RECV 1
+L1 (2):     CV1($s2) = RECV 2
+L2 (2):     CV2($s3) = RECV 3
+L3 (2):     CV3($s4) = RECV 4
+L4 (5):     RETURN int(0)
diff --git a/ext/opcache/tests/opt/dce_002.phpt b/ext/opcache/tests/opt/dce_002.phpt
index 6cb50a3f0b..0d71a7d809 100644
--- a/ext/opcache/tests/opt/dce_002.phpt
+++ b/ext/opcache/tests/opt/dce_002.phpt
@@ -22,13 +22,13 @@ function foo(int $a) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_002.php:1-11
-L0:     RETURN int(1)
+L0 (11):    RETURN int(1)
 
 foo: ; (lines=5, args=1, vars=2, tmps=0)
     ; (after optimizer)
     ; %sdce_002.php:2-9
-L0:     CV0($a) = RECV 1
-L1:     CV0($a) = QM_ASSIGN int(10)
-L2:     CV1($x) = FUNC_GET_ARGS
-L3:     CV0($a) = QM_ASSIGN int(30)
-L4:     RETURN CV1($x)
+L0 (2):     CV0($a) = RECV 1
+L1 (3):     CV0($a) = QM_ASSIGN int(10)
+L2 (5):     CV1($x) = FUNC_GET_ARGS
+L3 (6):     CV0($a) = QM_ASSIGN int(30)
+L4 (8):     RETURN CV1($x)
diff --git a/ext/opcache/tests/opt/dce_003.phpt b/ext/opcache/tests/opt/dce_003.phpt
index 651a8fea48..ce453c0ca3 100644
--- a/ext/opcache/tests/opt/dce_003.phpt
+++ b/ext/opcache/tests/opt/dce_003.phpt
@@ -18,11 +18,11 @@ function foo($a) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_003.php:1-7
-L0:     RETURN int(1)
+L0 (7):     RETURN int(1)
 
 foo: ; (lines=3, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %sdce_003.php:2-5
-L0:     CV0($a) = RECV 1
-L1:     ASSIGN_ADD CV0($a) int(3)
-L2:     RETURN CV0($a)
+L0 (2):     CV0($a) = RECV 1
+L1 (3):     ASSIGN_ADD CV0($a) int(3)
+L2 (4):     RETURN CV0($a)
diff --git a/ext/opcache/tests/opt/dce_004.phpt b/ext/opcache/tests/opt/dce_004.phpt
index 3038028294..795c938c2c 100644
--- a/ext/opcache/tests/opt/dce_004.phpt
+++ b/ext/opcache/tests/opt/dce_004.phpt
@@ -19,12 +19,12 @@ function foo(int $x, int $y) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_004.php:1-8
-L0:     RETURN int(1)
+L0 (8):     RETURN int(1)
 
 foo: ; (lines=4, args=2, vars=3, tmps=0)
     ; (after optimizer)
     ; %sdce_004.php:2-7
-L0:     CV0($x) = RECV 1
-L1:     CV1($y) = RECV 2
-L2:     CV2($a) = QM_ASSIGN CV1($y)
-L3:     RETURN CV2($a)
+L0 (2):     CV0($x) = RECV 1
+L1 (2):     CV1($y) = RECV 2
+L2 (5):     CV2($a) = QM_ASSIGN CV1($y)
+L3 (6):     RETURN CV2($a)
diff --git a/ext/opcache/tests/opt/dce_005.phpt b/ext/opcache/tests/opt/dce_005.phpt
index 5aa13b3c38..b7f5437a20 100644
--- a/ext/opcache/tests/opt/dce_005.phpt
+++ b/ext/opcache/tests/opt/dce_005.phpt
@@ -19,10 +19,10 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_005.php:1-8
-L0:     RETURN int(1)
+L0 (8):     RETURN int(1)
 
 foo: ; (lines=2, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %sdce_005.php:4-7
-L0:     CV0($x) = RECV 1
-L1:     RETURN null
+L0 (4):     CV0($x) = RECV 1
+L1 (7):     RETURN null
diff --git a/ext/opcache/tests/opt/dce_006.phpt b/ext/opcache/tests/opt/dce_006.phpt
index a45a15e41b..debac5e731 100644
--- a/ext/opcache/tests/opt/dce_006.phpt
+++ b/ext/opcache/tests/opt/dce_006.phpt
@@ -20,20 +20,20 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_006.php:1-9
-L0:     RETURN int(1)
+L0 (9):     RETURN int(1)
 
 foo: ; (lines=7, args=1, vars=2, tmps=1)
     ; (after optimizer)
     ; %sdce_006.php:5-8
-L0:     CV0($x) = RECV 1
-L1:     V2 = NEW 0 string("A")
-L2:     DO_FCALL
-L3:     CV1($a) = QM_ASSIGN V2
-L4:     ASSIGN_OBJ CV1($a) string("foo")
-L5:     OP_DATA CV0($x)
-L6:     RETURN null
+L0 (5):     CV0($x) = RECV 1
+L1 (6):     V2 = NEW 0 string("A")
+L2 (6):     DO_FCALL
+L3 (6):     CV1($a) = QM_ASSIGN V2
+L4 (7):     ASSIGN_OBJ CV1($a) string("foo")
+L5 (7):     OP_DATA CV0($x)
+L6 (8):     RETURN null
 
 A::__destruct: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_006.php:3-3
-L0:     RETURN null
+L0 (3):     RETURN null
diff --git a/ext/opcache/tests/opt/dce_007.phpt b/ext/opcache/tests/opt/dce_007.phpt
index 4ec3da1f05..ce601705c5 100644
--- a/ext/opcache/tests/opt/dce_007.phpt
+++ b/ext/opcache/tests/opt/dce_007.phpt
@@ -18,11 +18,11 @@ function esc($x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_007.php:1-7
-L0:     RETURN int(1)
+L0 (7):     RETURN int(1)
 
 esc: ; (lines=3, args=1, vars=2, tmps=0)
     ; (after optimizer)
     ; %sdce_007.php:2-6
-L0:     CV0($x) = RECV 1
-L1:     CV1($a) = INIT_ARRAY 1 (packed) CV0($x) NEXT
-L2:     RETURN CV1($a)
+L0 (2):     CV0($x) = RECV 1
+L1 (3):     CV1($a) = INIT_ARRAY 1 (packed) CV0($x) NEXT
+L2 (5):     RETURN CV1($a)
diff --git a/ext/opcache/tests/opt/dce_008.phpt b/ext/opcache/tests/opt/dce_008.phpt
index 86c263b48f..f1a29d4d8e 100644
--- a/ext/opcache/tests/opt/dce_008.phpt
+++ b/ext/opcache/tests/opt/dce_008.phpt
@@ -18,12 +18,12 @@ function esc(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %sdce_008.php:1-7
-L0:     RETURN int(1)
+L0 (7):     RETURN int(1)
 
 esc: ; (lines=4, args=1, vars=2, tmps=0)
     ; (after optimizer)
     ; %sdce_008.php:2-6
-L0:     CV0($x) = RECV 1
-L1:     ASSIGN_DIM CV1($a) int(0)
-L2:     OP_DATA CV0($x)
-L3:     RETURN CV1($a)
+L0 (2):     CV0($x) = RECV 1
+L1 (3):     ASSIGN_DIM CV1($a) int(0)
+L2 (3):     OP_DATA CV0($x)
+L3 (5):     RETURN CV1($a)
diff --git a/ext/opcache/tests/opt/sccp_001.phpt b/ext/opcache/tests/opt/sccp_001.phpt
index 9e62927405..9b2421a632 100644
--- a/ext/opcache/tests/opt/sccp_001.phpt
+++ b/ext/opcache/tests/opt/sccp_001.phpt
@@ -20,9 +20,9 @@ function foo() {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_001.php:1-9
-L0:     RETURN int(1)
+L0 (9):     RETURN int(1)
 
 foo: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_001.php:2-7
-L0:     RETURN int(4)
+L0 (6):     RETURN int(4)
diff --git a/ext/opcache/tests/opt/sccp_002.phpt b/ext/opcache/tests/opt/sccp_002.phpt
index 960888e1fd..748358c894 100644
--- a/ext/opcache/tests/opt/sccp_002.phpt
+++ b/ext/opcache/tests/opt/sccp_002.phpt
@@ -25,12 +25,12 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_002.php:1-14
-L0:     RETURN int(1)
+L0 (14):    RETURN int(1)
 
 foo: ; (lines=4, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_002.php:2-12
-L0:     CV0($x) = RECV 1
-L1:     ECHO int(1)
-L2:     ECHO int(1)
-L3:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (9):     ECHO int(1)
+L2 (11):    ECHO int(1)
+L3 (12):    RETURN null
diff --git a/ext/opcache/tests/opt/sccp_003.phpt b/ext/opcache/tests/opt/sccp_003.phpt
index 63e225b4be..555c8efb75 100644
--- a/ext/opcache/tests/opt/sccp_003.phpt
+++ b/ext/opcache/tests/opt/sccp_003.phpt
@@ -25,11 +25,11 @@ function foo() {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_003.php:1-14
-L0:     RETURN int(1)
+L0 (14):    RETURN int(1)
 
 foo: ; (lines=3, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_003.php:2-12
-L0:     ECHO int(1)
-L1:     ECHO int(1)
-L2:     RETURN null
+L0 (9):     ECHO int(1)
+L1 (11):    ECHO int(1)
+L2 (12):    RETURN null
diff --git a/ext/opcache/tests/opt/sccp_004.phpt b/ext/opcache/tests/opt/sccp_004.phpt
index e8a7593b65..05987f6660 100644
--- a/ext/opcache/tests/opt/sccp_004.phpt
+++ b/ext/opcache/tests/opt/sccp_004.phpt
@@ -28,12 +28,12 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_004.php:1-17
-L0:     RETURN int(1)
+L0 (17):    RETURN int(1)
 
 foo: ; (lines=4, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_004.php:2-15
-L0:     CV0($x) = RECV 1
-L1:     ECHO bool(true)
-L2:     ECHO int(1)
-L3:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (11):    ECHO bool(true)
+L2 (14):    ECHO int(1)
+L3 (15):    RETURN null
diff --git a/ext/opcache/tests/opt/sccp_005.phpt b/ext/opcache/tests/opt/sccp_005.phpt
index 0ec6e04be5..aeef1beb96 100644
--- a/ext/opcache/tests/opt/sccp_005.phpt
+++ b/ext/opcache/tests/opt/sccp_005.phpt
@@ -18,11 +18,11 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_005.php:1-7
-L0:     RETURN int(1)
+L0 (7):     RETURN int(1)
 
 foo: ; (lines=3, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_005.php:2-5
-L0:     CV0($x) = RECV 1
-L1:     ECHO int(2)
-L2:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (4):     ECHO int(2)
+L2 (5):     RETURN null
diff --git a/ext/opcache/tests/opt/sccp_006.phpt b/ext/opcache/tests/opt/sccp_006.phpt
index bc3bac0b87..e8f10ef064 100644
--- a/ext/opcache/tests/opt/sccp_006.phpt
+++ b/ext/opcache/tests/opt/sccp_006.phpt
@@ -18,18 +18,18 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_006.php:1-7
-L0:     RETURN int(1)
+L0 (7):     RETURN int(1)
 
 foo: ; (lines=8, args=1, vars=2, tmps=1)
     ; (after optimizer)
     ; %ssccp_006.php:2-5
-L0:     CV0($x) = RECV 1
-L1:     T2 = INIT_ARRAY 3 int(1) string("a")
-L2:     T2 = ADD_ARRAY_ELEMENT int(2) string("a")
-L3:     T2 = ADD_ARRAY_ELEMENT CV0($x) string("a")
-L4:     CV1($a) = QM_ASSIGN T2
-L5:     V2 = FETCH_DIM_R CV1($a) string("a")
-L6:     ECHO V2
-L7:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (3):     T2 = INIT_ARRAY 3 int(1) string("a")
+L2 (3):     T2 = ADD_ARRAY_ELEMENT int(2) string("a")
+L3 (3):     T2 = ADD_ARRAY_ELEMENT CV0($x) string("a")
+L4 (3):     CV1($a) = QM_ASSIGN T2
+L5 (4):     V2 = FETCH_DIM_R CV1($a) string("a")
+L6 (4):     ECHO V2
+L7 (5):     RETURN null
 LIVE RANGES:
         2: L2 - L4 (tmp/var)
diff --git a/ext/opcache/tests/opt/sccp_007.phpt b/ext/opcache/tests/opt/sccp_007.phpt
index 515facfd6d..027f1c7281 100644
--- a/ext/opcache/tests/opt/sccp_007.phpt
+++ b/ext/opcache/tests/opt/sccp_007.phpt
@@ -22,11 +22,11 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_007.php:1-11
-L0:     RETURN int(1)
+L0 (11):    RETURN int(1)
 
 foo: ; (lines=3, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_007.php:2-9
-L0:     CV0($x) = RECV 1
-L1:     ECHO int(0)
-L2:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (8):     ECHO int(0)
+L2 (9):     RETURN null
diff --git a/ext/opcache/tests/opt/sccp_008.phpt b/ext/opcache/tests/opt/sccp_008.phpt
index d540ce4706..d5ff3ae681 100644
--- a/ext/opcache/tests/opt/sccp_008.phpt
+++ b/ext/opcache/tests/opt/sccp_008.phpt
@@ -22,16 +22,16 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_008.php:1-11
-L0:     RETURN int(1)
+L0 (11):    RETURN int(1)
 
 foo: ; (lines=8, args=1, vars=2, tmps=1)
     ; (after optimizer)
     ; %ssccp_008.php:2-9
-L0:     CV0($x) = RECV 1
-L1:     JMPZ CV0($x) L4
-L2:     CV1($a) = QM_ASSIGN array(...)
-L3:     JMP L5
-L4:     CV1($a) = QM_ASSIGN array(...)
-L5:     V2 = FETCH_DIM_R CV1($a) int(1)
-L6:     ECHO V2
-L7:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (3):     JMPZ CV0($x) L4
+L2 (4):     CV1($a) = QM_ASSIGN array(...)
+L3 (4):     JMP L5
+L4 (6):     CV1($a) = QM_ASSIGN array(...)
+L5 (8):     V2 = FETCH_DIM_R CV1($a) int(1)
+L6 (8):     ECHO V2
+L7 (9):     RETURN null
diff --git a/ext/opcache/tests/opt/sccp_009.phpt b/ext/opcache/tests/opt/sccp_009.phpt
index 78efe45815..2f32cb8276 100644
--- a/ext/opcache/tests/opt/sccp_009.phpt
+++ b/ext/opcache/tests/opt/sccp_009.phpt
@@ -19,11 +19,11 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_009.php:1-8
-L0:     RETURN int(1)
+L0 (8):     RETURN int(1)
 
 foo: ; (lines=3, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_009.php:2-6
-L0:     CV0($x) = RECV 1
-L1:     ECHO int(2)
-L2:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (5):     ECHO int(2)
+L2 (6):     RETURN null
diff --git a/ext/opcache/tests/opt/sccp_010.phpt b/ext/opcache/tests/opt/sccp_010.phpt
index 7e91107f41..298c65efd7 100644
--- a/ext/opcache/tests/opt/sccp_010.phpt
+++ b/ext/opcache/tests/opt/sccp_010.phpt
@@ -26,11 +26,11 @@ function foo() {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_010.php:1-15
-L0:     RETURN int(1)
+L0 (15):    RETURN int(1)
 
 foo: ; (lines=3, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_010.php:2-13
-L0:     ECHO int(1)
-L1:     ECHO int(1)
-L2:     RETURN null
+L0 (10):    ECHO int(1)
+L1 (12):    ECHO int(1)
+L2 (13):    RETURN null
diff --git a/ext/opcache/tests/opt/sccp_011.phpt b/ext/opcache/tests/opt/sccp_011.phpt
index 761a251b0d..2d817310d5 100644
--- a/ext/opcache/tests/opt/sccp_011.phpt
+++ b/ext/opcache/tests/opt/sccp_011.phpt
@@ -25,11 +25,11 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_011.php:1-14
-L0:     RETURN int(1)
+L0 (14):    RETURN int(1)
 
 foo: ; (lines=3, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_011.php:2-12
-L0:     CV0($x) = RECV 1
-L1:     ECHO int(0)
-L2:     RETURN null
+L0 (2):     CV0($x) = RECV 1
+L1 (11):    ECHO int(0)
+L2 (12):    RETURN null
diff --git a/ext/opcache/tests/opt/sccp_012.phpt b/ext/opcache/tests/opt/sccp_012.phpt
index fb4ee3d897..3380331922 100644
--- a/ext/opcache/tests/opt/sccp_012.phpt
+++ b/ext/opcache/tests/opt/sccp_012.phpt
@@ -28,11 +28,11 @@ function foo() {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_012.php:1-17
-L0:     RETURN int(1)
+L0 (17):    RETURN int(1)
 
 foo: ; (lines=3, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_012.php:2-15
-L0:     ECHO int(1)
-L1:     ECHO int(4)
-L2:     RETURN null
+L0 (10):    ECHO int(1)
+L1 (14):    ECHO int(4)
+L2 (15):    RETURN null
diff --git a/ext/opcache/tests/opt/sccp_016.phpt b/ext/opcache/tests/opt/sccp_016.phpt
index d877e57a71..0af0d64ab2 100644
--- a/ext/opcache/tests/opt/sccp_016.phpt
+++ b/ext/opcache/tests/opt/sccp_016.phpt
@@ -15,7 +15,7 @@ return isset($undef) || php_sapi_name() == php_sapi_name();
 $_main: ; (lines=4, args=0, vars=1, tmps=1)
     ; (after optimizer)
     ; %ssccp_016.php:1-4
-L0:     T1 = ISSET_ISEMPTY_CV (isset) CV0($undef)
-L1:     T1 = JMPNZ_EX T1 L3
-L2:     T1 = QM_ASSIGN bool(true)
-L3:     RETURN T1
+L0 (2):     T1 = ISSET_ISEMPTY_CV (isset) CV0($undef)
+L1 (2):     T1 = JMPNZ_EX T1 L3
+L2 (2):     T1 = QM_ASSIGN bool(true)
+L3 (2):     RETURN T1
diff --git a/ext/opcache/tests/opt/sccp_017.phpt b/ext/opcache/tests/opt/sccp_017.phpt
index a8cbcae723..eb2694769c 100644
--- a/ext/opcache/tests/opt/sccp_017.phpt
+++ b/ext/opcache/tests/opt/sccp_017.phpt
@@ -21,10 +21,10 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_017.php:1-10
-L0:     RETURN int(1)
+L0 (10):    RETURN int(1)
 
 foo: ; (lines=2, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_017.php:2-8
-L0:     CV0($x) = RECV 1
-L1:     RETURN int(5)
+L0 (2):     CV0($x) = RECV 1
+L1 (7):     RETURN int(5)
diff --git a/ext/opcache/tests/opt/sccp_019.phpt b/ext/opcache/tests/opt/sccp_019.phpt
index 80d4123411..eb2a431b55 100644
--- a/ext/opcache/tests/opt/sccp_019.phpt
+++ b/ext/opcache/tests/opt/sccp_019.phpt
@@ -20,10 +20,10 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_019.php:1-9
-L0:     RETURN int(1)
+L0 (9):     RETURN int(1)
 
 foo: ; (lines=2, args=1, vars=1, tmps=0)
     ; (after optimizer)
     ; %ssccp_019.php:2-7
-L0:     CV0($x) = RECV 1
-L1:     RETURN int(5)
+L0 (2):     CV0($x) = RECV 1
+L1 (6):     RETURN int(5)
diff --git a/ext/opcache/tests/opt/sccp_022.phpt b/ext/opcache/tests/opt/sccp_022.phpt
index 64ff8dd5ca..551d705c11 100644
--- a/ext/opcache/tests/opt/sccp_022.phpt
+++ b/ext/opcache/tests/opt/sccp_022.phpt
@@ -21,19 +21,19 @@ function foo(int $x) {
 $_main: ; (lines=1, args=0, vars=0, tmps=0)
     ; (after optimizer)
     ; %ssccp_022.php:1-10
-L0:     RETURN int(1)
+L0 (10):    RETURN int(1)
 
 foo: ; (lines=11, args=1, vars=2, tmps=1)
     ; (after optimizer)
     ; %ssccp_022.php:2-8
-L0:     CV0($x) = RECV 1
-L1:     ASSIGN_DIM CV1($a) int(0)
-L2:     OP_DATA CV0($x)
-L3:     ASSIGN_DIM CV1($a) int(1)
-L4:     OP_DATA int(5)
-L5:     ECHO int(5)
-L6:     ASSIGN_OBJ CV1($a) string("foo")
-L7:     OP_DATA int(5)
-L8:     V2 = FETCH_DIM_R CV1($a) int(1)
-L9:     ECHO V2
-L10:    RETURN null
\ No newline at end of file
+L0 (2):     CV0($x) = RECV 1
+L1 (3):     ASSIGN_DIM CV1($a) int(0)
+L2 (3):     OP_DATA CV0($x)
+L3 (4):     ASSIGN_DIM CV1($a) int(1)
+L4 (4):     OP_DATA int(5)
+L5 (5):     ECHO int(5)
+L6 (6):     ASSIGN_OBJ CV1($a) string("foo")
+L7 (6):     OP_DATA int(5)
+L8 (7):     V2 = FETCH_DIM_R CV1($a) int(1)
+L9 (7):     ECHO V2
+L10 (8):    RETURN null