r204633 - Use CHECK-DAG in a test so that it isn't sensitive to metadata order.

[Eric Christopher]

On Mon, Mar 24, 2014 at 11:25 AM, Bob Wilson <bob.wilson at apple.com> wrote:
> The BLOCK metadata came out after the DBG metadata. I have no idea why, but this failing test has been blocking all of our buildbots since Friday. I will leave it to Adrian to follow up, since he last touched this test.
>

I'd almost rather XFAIL it than check-dag. Different ordering screams
something unstable unless you have patches applied internally that
could do this. In that case you should change the test internally.

I wish we had an xpass mechanism so that you could xfail it internally
and have it start xpassing when whatever the problem is becomes
apparent.

-eric


> On Mar 24, 2014, at 11:23 AM, Eric Christopher <echristo at gmail.com> wrote:
>
>> Uh... some reason?
>>
>> Could you track it down? It really shouldn't be.
>>
>> -eric
>>
>> On Mon, Mar 24, 2014 at 11:14 AM, Bob Wilson <bob.wilson at apple.com> wrote:
>>> Author: bwilson
>>> Date: Mon Mar 24 13:14:15 2014
>>> New Revision: 204633
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=204633&view=rev
>>> Log:
>>> Use CHECK-DAG in a test so that it isn't sensitive to metadata order.
>>>
>>> This was failing on an internal branch where the order was different for
>>> some reason. <rdar://problem/16407581>
>>>
>>> Modified:
>>>    cfe/trunk/test/CodeGenCXX/linetable-fnbegin.cpp
>>>
>>> Modified: cfe/trunk/test/CodeGenCXX/linetable-fnbegin.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/linetable-fnbegin.cpp?rev=204633&r1=204632&r2=204633&view=diff
>>> ==============================================================================
>>> --- cfe/trunk/test/CodeGenCXX/linetable-fnbegin.cpp (original)
>>> +++ cfe/trunk/test/CodeGenCXX/linetable-fnbegin.cpp Mon Mar 24 13:14:15 2014
>>> @@ -4,9 +4,9 @@
>>> // CHECK: define{{.*}}bar
>>> // CHECK-NOT: define
>>> // CHECK: ret {{.*}}, !dbg ![[DBG:.*]]
>>> -// CHECK: ![[HPP:.*]] = metadata !{metadata !"./template.hpp",
>>> -// CHECK:![[BLOCK:.*]] = metadata !{{{.*}}, metadata ![[HPP]], {{.*}}} ; [ DW_TAG_lexical_block ]
>>> -// CHECK: [[DBG]] = metadata !{i32 23, i32 0, metadata ![[BLOCK]], null}
>>> +// CHECK-DAG: ![[HPP:.*]] = metadata !{metadata !"./template.hpp",
>>> +// CHECK-DAG: ![[BLOCK:.*]] = metadata !{{{.*}}, metadata ![[HPP]], {{.*}}} ; [ DW_TAG_lexical_block ]
>>> +// CHECK-DAG: ![[DBG]] = metadata !{i32 23, i32 0, metadata ![[BLOCK]], null}
>>> # 1 "./template.h" 1
>>> template <typename T>
>>> class Foo {
>>>
>>>
>>> _______________________________________________
>>> cfe-commits mailing list
>>> cfe-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>