Affiliation:
1. Loyola College, Baltimore, MD
2. Univ. of Wisconsin, Madison
Abstract
Given a program Base and two variants, A and B, each created by modifying separate copies of Base, the goal of program integration is to determine whether the modifications interfere, and if they do not, to create an integrated program that incorporates both sets of changes as well as the portions of Base preserved in both variants. Text-based integration techniques, such as the one used by the Unix
diff3
utility, are obviously unsatisfactory because one has no guarantees about how the execution behavior of the integrated program relates to the behaviors of Base, A, and B. The first program integration algorithm to provide such guarantees was developed by Horwitz, Prins, and Reps. However, a limitation of that algorithm is that it only applied to programs written in a restricted language—in particular, the algorithm does not handle programs with procedures. This article describes a generalization of the Horwitz-Prins-Reps algorithm that handles programs that consist of multiple (and possibly mutually recursive) procedures.
We show that two straightforward generalizations of the Horwitz-Prins-Reps algorithm yield unsatisfactory results. The key issue in developing a satisfactory algorithm is how to take into account different calling contexts when determining what has changed in the variants A and B. Our solution to this problem involves identifying two different kinds of affected components of A and B: those affected regardless of how the procedure is called, and those affected by a changed or new calling context. The algorithm makes use of interprocedural program slicing to identify these components, as well as components in Base, A, and B with the same behavior.
Publisher
Association for Computing Machinery (ACM)
Reference19 articles.
1. ~BALL~ T. HORWITZ S AND REPS T. 1990. Correctness of an algorithm for reconstituting a ~program from a depend~nce graph. TR-947 Computer Sciences Dept. Univ. of Wisconsin ~Madison Wisc. ~BALL~ T. HORWITZ S AND REPS T. 1990. Correctness of an algorithm for reconstituting a ~program from a depend~nce graph. TR-947 Computer Sciences Dept. Univ. of Wisconsin ~Madison Wisc.
2. Interprocedural side-effect analysis in linear time
3. Programming environments ~based on structured editors: The MENTOR experience. In Interactwe Programming Environ- ~Ments, D. Barstow, E. Sandewall, and H. Shrobe, Eds. McGraw-Hfil;~DONZEAU-GOUGE V.;New York,1984
4. The program dependence graph and its use in optimization
Cited by
75 articles.
订阅此论文施引文献
订阅此论文施引文献,注册后可以免费订阅5篇论文的施引文献,订阅后可以查看论文全部施引文献
1. Detecting semantic conflicts with unit tests;Journal of Systems and Software;2024-08
2. Lightweight Semantic Conflict Detection with Static Analysis;Proceedings of the 2024 IEEE/ACM 46th International Conference on Software Engineering: Companion Proceedings;2024-04-14
3. Do code refactorings influence the merge effort?;2023 IEEE/ACM 45th International Conference on Software Engineering (ICSE);2023-05
4. Semantic conflict detection with overriding assignment analysis;Proceedings of the XXXVI Brazilian Symposium on Software Engineering;2022-10-05
5. Leveraging Structure in Software Merge: An Empirical Study;IEEE Transactions on Software Engineering;2021