Mar 9, 2024 · Feb 28, 2024 · Feb 28, 2024 · Mar 1, 2024 · Mar 1, 2024 · Mar 1, 2024
diff --git a/mypyc/test-data/opt-copy-propagation.test b/mypyc/test-data/opt-copy-propagation.test
 L2:
    y = 2
    return y
 L3:
    unreachable

 [case testCopyPropagationArg]
 def f(x: int) -> int:
    x = 4
    return x

 [case testCopyPropagationPartiallyDefined1]
 def f(b: bool) -> int:
    if b:
        x = 1
    y = x
    return y
 [out]
 def f(b):
    b :: bool
    r0, x :: int
    r1 :: bool
 L0:
    r0 = <error> :: int
    x = r0
    if b goto L1 else goto L2 :: bool
 L1:
    x = 2
 L2:
    if is_error(x) goto L3 else goto L4
 L3:
    r1 = raise UnboundLocalError('local variable "x" referenced before assignment')
    unreachable
 L4:
    return x

 -- The remaining test cases test basic IRTransform functionality and are not
 -- all needed for testing copy propagation as such.

    return 2
 L2:
    return 4
 L3:
    unreachable

 [case testIRTransformAssignment]
 def f(b: bool, x: int) -> int:
    y = x
    if b:
        return y
    else:
        return 1
 [out]
 def f(b, x):
    b :: bool
    x :: int
 L0:
    if b goto L1 else goto L2 :: bool
 L1:
    return x
 L2:
    return 2

 [case testIRTransformRegisterOps1]
 from __future__ import annotations
diff --git a/mypyc/test/test_copy_propagation.py b/mypyc/test/test_copy_propagation.py
    use_custom_builtins,
 )
 from mypyc.transform.copy_propagation import do_copy_propagation
 from mypyc.transform.uninit import insert_uninit_checks

 files = ["opt-copy-propagation.test"]

                for fn in ir:
                    if fn.name == TOP_LEVEL_NAME and not testcase.name.endswith("_toplevel"):
                        continue
                    insert_uninit_checks(fn)
                    do_copy_propagation(fn, CompilerOptions())
                    actual.extend(format_func(fn))

diff --git a/mypyc/transform/copy_propagation.py b/mypyc/transform/copy_propagation.py
 from mypyc.irbuild.ll_builder import LowLevelIRBuilder
 from mypyc.options import CompilerOptions
 from mypyc.transform.ir_transform import IRTransform
 from mypyc.sametype import is_same_type


 def do_copy_propagation(fn: FuncIR, options: CompilerOptions) -> None:
            if isinstance(op, Assign):
                c = counts.get(op.dest, 0)
                counts[op.dest] = c + 1
                if c == 0:
                if c == 0 and is_same_type(op.dest.type, op.src.type):
                    replacements[op.dest] = op.src
                elif c == 1:
 delreplacements[op.dest]
                    replacements.pop(op.dest, 0)
            elif isinstance(op, AssignMulti):
                # Copy propagation not supported for AssignMulti destinations
                counts[op.dest] = 2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,8 +42,6 @@ L1:
		L2:
		y = 2
		return y
		L3:
		unreachable

		[case testCopyPropagationArg]
		def f(x: int) -> int:
Expand All		@@ -56,6 +54,31 @@ L0:
		x = 4
		return x

		[case testCopyPropagationPartiallyDefined1]
		def f(b: bool) -> int:
		if b:
		x = 1
		y = x
		return y
		[out]
		def f(b):
		b :: bool
		r0, x :: int
		r1 :: bool
		L0:
		r0 = <error> :: int
		x = r0
		if b goto L1 else goto L2 :: bool
		L1:
		x = 2
		L2:
		if is_error(x) goto L3 else goto L4
		L3:
		r1 = raise UnboundLocalError('local variable "x" referenced before assignment')
		unreachable
		L4:
		return x

		-- The remaining test cases test basic IRTransform functionality and are not
		-- all needed for testing copy propagation as such.

Expand All		@@ -77,8 +100,24 @@ L1:
		return 2
		L2:
		return 4
		L3:
		unreachable

		[case testIRTransformAssignment]
		def f(b: bool, x: int) -> int:
		y = x
		if b:
		return y
		else:
		return 1
		[out]
		def f(b, x):
		b :: bool
		x :: int
		L0:
		if b goto L1 else goto L2 :: bool
		L1:
		return x
		L2:
		return 2

		[case testIRTransformRegisterOps1]
		from __future__ import annotations
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,6 +19,7 @@
		use_custom_builtins,
		)
		from mypyc.transform.copy_propagation import do_copy_propagation
		from mypyc.transform.uninit import insert_uninit_checks

		files = ["opt-copy-propagation.test"]

Expand All		@@ -39,6 +40,7 @@ def run_case(self, testcase: DataDrivenTestCase) -> None:
		for fn in ir:
		if fn.name == TOP_LEVEL_NAME and not testcase.name.endswith("_toplevel"):
		continue
		insert_uninit_checks(fn)
		do_copy_propagation(fn, CompilerOptions())
		actual.extend(format_func(fn))

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,6 +19,7 @@
		from mypyc.irbuild.ll_builder import LowLevelIRBuilder
		from mypyc.options import CompilerOptions
		from mypyc.transform.ir_transform import IRTransform
		from mypyc.sametype import is_same_type


		def do_copy_propagation(fn: FuncIR, options: CompilerOptions) -> None:
Expand All		@@ -39,10 +40,10 @@ def do_copy_propagation(fn: FuncIR, options: CompilerOptions) -> None:
		if isinstance(op, Assign):
		c = counts.get(op.dest, 0)
		counts[op.dest] = c + 1
		if c == 0:
		if c == 0 and is_same_type(op.dest.type, op.src.type):
		replacements[op.dest] = op.src
		elif c == 1:
		delreplacements[op.dest]
		replacements.pop(op.dest, 0)
		elif isinstance(op, AssignMulti):
		# Copy propagation not supported for AssignMulti destinations
		counts[op.dest] = 2
Expand Down