[llvm-commits] [llvm] r56989 - /llvm/trunk/lib/Target/X86/X86FastISel.cpp

[Dan Gohman]

Author: djg
Date: Thu Oct  2 20:27:49 2008
New Revision: 56989

URL: http://llvm.org/viewvc/llvm-project?rev=56989&view=rev
Log:
Fix X86FastISel to handle dynamic allocas that have avoided
getting inserted into the ValueMap. This avoids infinite
recursion in some rare cases.

Modified:
    llvm/trunk/lib/Target/X86/X86FastISel.cpp

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=56989&r1=56988&r2=56989&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Thu Oct  2 20:27:49 2008
@@ -1365,6 +1365,16 @@
 }
 
 unsigned X86FastISel::TargetMaterializeAlloca(AllocaInst *C) {
+  // Fail on dynamic allocas. At this point, getRegForValue has already
+  // checked its CSE maps, so if we're here trying to handle a dynamic
+  // alloca, we're not going to succeed. X86SelectAddress has a
+  // check for dynamic allocas, because it's called directly from
+  // various places, but TargetMaterializeAlloca also needs a check
+  // in order to avoid recursion between getRegForValue,
+  // X86SelectAddrss, and TargetMaterializeAlloca.
+  if (!StaticAllocaMap.count(C))
+    return 0;
+
   X86AddressMode AM;
   if (!X86SelectAddress(C, AM, false))
     return 0;