Merge SimpleRegisterCoalescing.cpp into RegisterCoalescer.cpp.

llvm-svn: 133897
2011-06-26 22:06:36 +00:00 · 2011-06-26 22:06:36 +00:00 · ea1a9c342d
parent 14a314b1c6
commit ea1a9c342d
3 changed files with 1523 additions and 1541 deletions
--- a/llvm/lib/CodeGen/CMakeLists.txt
+++ b/llvm/lib/CodeGen/CMakeLists.txt
@ -79,7 +79,6 @@ add_llvm_library(LLVMCodeGen
  ScoreboardHazardRecognizer.cpp
  ShadowStackGC.cpp
  ShrinkWrapping.cpp
-  SimpleRegisterCoalescing.cpp
  SjLjEHPrepare.cpp
  SlotIndexes.cpp
  Spiller.cpp
--- a/llvm/lib/CodeGen/RegisterCoalescer.cpp
+++ b/llvm/lib/CodeGen/RegisterCoalescer.cpp
--- a/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp
+++ b/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp