r199758 - revert 199757 for buildbot breakage.

[Adrian Prantl]

I was just about to do that :)

thanks!
On Jan 21, 2014, at 10:32, Eric Christopher <echristo at gmail.com> wrote:

> You should be able to use preprocessing directives to put the file name in a single file, e.g. #file etc.
> 
> -eric
> 
> On Tue Jan 21 2014 at 10:30:36 AM, Adrian Prantl <aprantl at apple.com> wrote:
> Author: adrian
> Date: Tue Jan 21 12:23:43 2014
> New Revision: 199758
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=199758&view=rev
> Log:
> revert 199757 for buildbot breakage.
> 
> Removed:
>     cfe/trunk/test/CodeGen/debug-info-typedef.c
>     cfe/trunk/test/CodeGen/debug-info-typedef.h
> Modified:
>     cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
> 
> Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=199758&r1=199757&r2=199758&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Tue Jan 21 12:23:43 2014
> @@ -739,16 +739,14 @@ llvm::DIType CGDebugInfo::CreateType(con
>      return llvm::DIType();
>    // We don't set size information, but do specify where the typedef was
>    // declared.
> -  SourceLocation Loc = Ty->getDecl()->getLocation();
> -  llvm::DIFile File = getOrCreateFile(Loc);
> -  unsigned Line = getLineNumber(Loc);
> +  unsigned Line = getLineNumber(Ty->getDecl()->getLocation());
>    const TypedefNameDecl *TyDecl = Ty->getDecl();
> 
>    llvm::DIDescriptor TypedefContext =
>      getContextDescriptor(cast<Decl>(Ty->getDecl()->getDeclContext()));
> 
>    return
> -    DBuilder.createTypedef(Src, TyDecl->getName(), File, Line, TypedefContext);
> +    DBuilder.createTypedef(Src, TyDecl->getName(), Unit, Line, TypedefContext);
>  }
> 
>  llvm::DIType CGDebugInfo::CreateType(const FunctionType *Ty,
> 
> Removed: cfe/trunk/test/CodeGen/debug-info-typedef.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-typedef.c?rev=199757&view=auto
> ==============================================================================
> --- cfe/trunk/test/CodeGen/debug-info-typedef.c (original)
> +++ cfe/trunk/test/CodeGen/debug-info-typedef.c (removed)
> @@ -1,8 +0,0 @@
> -// RUN: %clang_cc1 -emit-llvm -g -I%p %s -o - | FileCheck %s
> -// Test that the location of the typedef points to the header file.
> -#include "typedef.h"
> -
> -MyType a;
> -
> -// CHECK: metadata ![[HEADER:[0-9]+]]} ; [ DW_TAG_typedef ] [MyType] [line 1, size 0, align 0, offset 0] [from int]
> -// CHECK: ![[HEADER]] = {{.*}}debug-info-typedef.h",
> 
> Removed: cfe/trunk/test/CodeGen/debug-info-typedef.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-typedef.h?rev=199757&view=auto
> ==============================================================================
> --- cfe/trunk/test/CodeGen/debug-info-typedef.h (original)
> +++ cfe/trunk/test/CodeGen/debug-info-typedef.h (removed)
> @@ -1,2 +0,0 @@
> -typedef int MyType;
> -
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits