Fix a really nasty bug that was breaking ijpeg in LLC mode. We were incorrectly

folding load instructions into other instructions across free instruction
boundaries.  Perhaps this will also fix the other strange failures?

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12494 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/InstSelectSimple.cpp b/lib/Target/X86/InstSelectSimple.cpp
index 5fad0e788afbea3ab5643f24579d3ab7497f8477..e631fdb6ff589100a317677a76db4d9aa3fde075 100644 (file)
--- a/lib/Target/X86/InstSelectSimple.cpp
+++ b/lib/Target/X86/InstSelectSimple.cpp
@@ -1422,6 +1422,8 @@ static bool isSafeToFoldLoadIntoInstruction(LoadInst &LI, Instruction &User) {
   // really use alias analysis here, but for now we just do something simple.
   for (++It; It != BasicBlock::iterator(&User); ++It) {
     switch (It->getOpcode()) {
+    case Instruction::Malloc:
+    case Instruction::Free:
     case Instruction::Store:
     case Instruction::Call:
     case Instruction::Invoke:

diff --git a/lib/Target/X86/X86ISelSimple.cpp b/lib/Target/X86/X86ISelSimple.cpp
index 5fad0e788afbea3ab5643f24579d3ab7497f8477..e631fdb6ff589100a317677a76db4d9aa3fde075 100644 (file)
--- a/lib/Target/X86/X86ISelSimple.cpp
+++ b/lib/Target/X86/X86ISelSimple.cpp
@@ -1422,6 +1422,8 @@ static bool isSafeToFoldLoadIntoInstruction(LoadInst &LI, Instruction &User) {
   // really use alias analysis here, but for now we just do something simple.
   for (++It; It != BasicBlock::iterator(&User); ++It) {
     switch (It->getOpcode()) {
+    case Instruction::Malloc:
+    case Instruction::Free:
     case Instruction::Store:
     case Instruction::Call:
     case Instruction::Invoke: