commit 4b52a88e90b341ff2a3d1dbad6eb5ea731228156
author David Blaikie <dblaikie@gmail.com> Fri Mar 22 17:33:20 2013 +0000
committer David Blaikie <dblaikie@gmail.com> Fri Mar 22 17:33:20 2013 +0000
tree 91feee1ed09f514e3a7f6583ca72f2f28086f250
parent be67aa52a8fca4ea33dd59512d8bea9e2a45be2e

Refactor out the DIFile parameter to DILexicalBlock to refer to the raw file/directory pair

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

lib/IR/DIBuilder.cpp

diff --git a/lib/IR/DIBuilder.cpp b/lib/IR/DIBuilder.cpp
index a97b740..fe2176c 100644
--- a/lib/IR/DIBuilder.cpp
+++ b/lib/IR/DIBuilder.cpp
@@ -1023,7 +1023,7 @@
   static unsigned int unique_id = 0;
   Value *Elts[] = {
     GetTagConstant(VMContext, dwarf::DW_TAG_lexical_block),
-    File,
+    File.getFileNode(),
     getNonCompileUnitScope(Scope),
     ConstantInt::get(Type::getInt32Ty(VMContext), Line),
     ConstantInt::get(Type::getInt32Ty(VMContext), Col),

lib/IR/DebugInfo.cpp

diff --git a/lib/IR/DebugInfo.cpp b/lib/IR/DebugInfo.cpp
index 91968d8..9902334 100644
--- a/lib/IR/DebugInfo.cpp
+++ b/lib/IR/DebugInfo.cpp
@@ -666,8 +666,6 @@
     return StringRef();
   if (isLexicalBlockFile())
     return DILexicalBlockFile(DbgNode).getFilename();
-  if (isLexicalBlock())
-    return DILexicalBlock(DbgNode).getFilename();
   return ::getStringField(getNodeField(DbgNode, 1), 0);
 }
 
@@ -676,8 +674,6 @@
     return StringRef();
   if (isLexicalBlockFile())
     return DILexicalBlockFile(DbgNode).getDirectory();
-  if (isLexicalBlock())
-    return DILexicalBlock(DbgNode).getDirectory();
   return ::getStringField(getNodeField(DbgNode, 1), 1);
 }