WIP: merge master

This commit is contained in:
2025-03-25 21:53:01 +03:00

View File

@@ -198,7 +198,6 @@ set(TRANSFORMS
${TR_IMPLICIT_NONE}
${TR_REPLACE_ARRAYS_IN_IO})
<<<<<<< HEAD
set(CFG _src/CFGraph/IR.cpp
_src/CFGraph/IR.h
_src/CFGraph/CFGraph.cpp
@@ -211,18 +210,6 @@ set(CFG _src/CFGraph/IR.cpp
_src/CFGraph/private_variables_analysis.h
_src/CFGraph/IRSSAForm.cpp
_src/CFGraph/IRSSAForm.h
=======
set(CFG src/CFGraph/IR.cpp
src/CFGraph/IR.h
src/CFGraph/CFGraph.cpp
src/CFGraph/CFGraph.h
src/CFGraph/RD_subst.cpp
src/CFGraph/RD_subst.h
src/CFGraph/live_variable_analysis.cpp
src/CFGraph/live_variable_analysis.h
src/CFGraph/private_variables_analysis.cpp
src/CFGraph/private_variables_analysis.h
>>>>>>> 18f5619 (fixed paths)
)
set(DATA_FLOW