r177609 - Debug info - generalize namespace test to not depend on a DW_TAG_file_type entry

[Aaron Ballman]

This seems to have broken the build on Windows with MSVC 11.

42>  Command 1 Stderr:
42>  F:\llvm\llvm\tools\clang\test\CodeGenCXX\debug-info-namespace.cpp:13:11:
error: expected string not found in input
42>  // CHECK: [[CTXT]] = {{.*}}, metadata [[FILE]], null, {{.*}} ; [
DW_TAG_namespace ] [A] [line 3]
42>            ^
42>  <stdin>:15:1: note: scanning from here
42>  !6 = metadata !{metadata !"foo.cpp", metadata
!"F:\5Cllvm\5Cbuild\5Ctools\5Cclang\5Ctest\5CCodeGenCXX"}
42>  ^
42>  <stdin>:15:1: note: with variable "CTXT" equal to "!7"
42>  !6 = metadata !{metadata !"foo.cpp", metadata
!"F:\5Cllvm\5Cbuild\5Ctools\5Cclang\5Ctest\5CCodeGenCXX"}
42>  ^
42>  <stdin>:15:1: note: with variable "FILE" equal to "!1"
42>  !6 = metadata !{metadata !"foo.cpp", metadata
!"F:\5Cllvm\5Cbuild\5Ctools\5Cclang\5Ctest\5CCodeGenCXX"}
42>  ^
42>  <stdin>:16:39: note: possible intended match here
42>  !7 = metadata !{i32 786489, metadata !8, null, metadata !"A", i32
3} ; [ DW_TAG_namespace ] [A] [line 3]
42>                                        ^

Any chance you can look into this?

Thanks!

~Aaron

On Wed, Mar 20, 2013 at 7:57 PM, David Blaikie <dblaikie at gmail.com> wrote:
> Author: dblaikie
> Date: Wed Mar 20 18:57:15 2013
> New Revision: 177609
>
> URL: http://llvm.org/viewvc/llvm-project?rev=177609&view=rev
> Log:
> Debug info - generalize namespace test to not depend on a DW_TAG_file_type entry
>
> This isn't necessary & with the next change to LLVM the DW_TAG_file_type entry
> won't be emitted at all - only the raw filename/directory pair, so match on
> that directly instead.
>
> Modified:
>     cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp?rev=177609&r1=177608&r2=177609&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp Wed Mar 20 18:57:15 2013
> @@ -7,8 +7,8 @@ int i;
>  }
>  }
>
> -// CHECK: [[FILE:![0-9]*]]} ; [ DW_TAG_file_type ] [{{.*}}/test/CodeGenCXX/debug-info-namespace.cpp]
> +// CHECK: [[FILE:![0-9]*]] {{.*}}debug-info-namespace.cpp"
>  // CHECK: [[VAR:![0-9]*]] = {{.*}}, metadata [[NS:![0-9]*]], metadata !"i", {{.*}} ; [ DW_TAG_variable ] [i]
>  // CHECK: [[NS]] = {{.*}}, metadata [[FILE2:![0-9]*]], metadata [[CTXT:![0-9]*]], {{.*}} ; [ DW_TAG_namespace ] [B] [line 1]
> -// CHECK: [[CTXT]] = {{.*}}, metadata [[FILE:![0-9]*]], null, {{.*}} ; [ DW_TAG_namespace ] [A] [line 3]
> +// CHECK: [[CTXT]] = {{.*}}, metadata [[FILE]], null, {{.*}} ; [ DW_TAG_namespace ] [A] [line 3]
>  // CHECK: [[FILE2]]} ; [ DW_TAG_file_type ] [{{.*}}foo.cpp]
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits