[llvm-branch-commits] [llvm-branch] r83574 - in /llvm/branches/Apple/Leela: lib/Analysis/DebugInfo.cpp test/DebugInfo/2009-10-08-DebugInfo-NullGlobalVariable.ll

[Bill Wendling]

Author: void
Date: Thu Oct  8 15:54:14 2009
New Revision: 83574

URL: http://llvm.org/viewvc/llvm-project?rev=83574&view=rev
Log:
$ svn merge -c 83573 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83573 into '.':
A    test/DebugInfo/2009-10-08-DebugInfo-NullGlobalVariable.ll
U    lib/Analysis/DebugInfo.cpp


Added:
    llvm/branches/Apple/Leela/test/DebugInfo/2009-10-08-DebugInfo-NullGlobalVariable.ll
      - copied unchanged from r83573, llvm/trunk/test/DebugInfo/2009-10-08-DebugInfo-NullGlobalVariable.ll
Modified:
    llvm/branches/Apple/Leela/lib/Analysis/DebugInfo.cpp

Modified: llvm/branches/Apple/Leela/lib/Analysis/DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Analysis/DebugInfo.cpp?rev=83574&r1=83573&r2=83574&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Analysis/DebugInfo.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Analysis/DebugInfo.cpp Thu Oct  8 15:54:14 2009
@@ -116,7 +116,7 @@
     return 0;
 
   if (Elt < DbgNode->getNumElements())
-      return dyn_cast<GlobalVariable>(DbgNode->getElement(Elt));
+      return dyn_cast_or_null<GlobalVariable>(DbgNode->getElement(Elt));
   return 0;
 }