commit 786cd049fc467bfaf85021b4fcfb19bbf134329b
author Duncan P. N. Exon Smith <dexonsmith@apple.com> Thu Oct 02 22:15:31 2014 +0000
committer Duncan P. N. Exon Smith <dexonsmith@apple.com> Thu Oct 02 22:15:31 2014 +0000
tree 55f7a8b314704fe5d4b3a947b22b6009c1a23ded
parent 834c265e85e4ee433cd9089e907bf6bccdb25313

Revert "DI: Fold constant arguments into a single MDString"

This reverts commit r218914 while I investigate some bots.

llvm-svn: 218918

llvm/lib/IR/DebugLoc.cpp

diff --git a/llvm/lib/IR/DebugLoc.cpp b/llvm/lib/IR/DebugLoc.cpp
index 718da85..e8bdcce 100644
--- a/llvm/lib/IR/DebugLoc.cpp
+++ b/llvm/lib/IR/DebugLoc.cpp
@@ -79,8 +79,14 @@
 DebugLoc DebugLoc::getFnDebugLoc(const LLVMContext &Ctx) const {
   const MDNode *Scope = getScopeNode(Ctx);
   DISubprogram SP = getDISubprogram(Scope);
-  if (SP.isSubprogram())
-    return DebugLoc::get(SP.getScopeLineNumber(), 0, SP);
+  if (SP.isSubprogram()) {
+    // Check for number of operands since the compatibility is
+    // cheap here.  FIXME: Name the magic constant.
+    if (SP->getNumOperands() > 19)
+      return DebugLoc::get(SP.getScopeLineNumber(), 0, SP);
+    else
+      return DebugLoc::get(SP.getLineNumber(), 0, SP);
+  }
 
   return DebugLoc();
 }