r253595 - Update clang tests to accomendate discriminator changes.

[David Blaikie via llvm-commits]

On Thu, Nov 19, 2015 at 1:09 PM, Dehao Chen <dehao at google.com> wrote:

> disable-llvm-optzns does not help:
>
> /ssd/llvm_trunk/build.gccopt/./bin/clang -cc1 -internal-isystem
> /ssd/llvm_trunk/build.gccopt/bin/../lib/clang/3.8.0/include
> -nostdsysteminc -dwarf-version=4 -debug-info-kind=line-tables-only
> -disable-llvm-optzns  -emit-llvm <
> /ssd/llvm_trunk/tools/clang/test/CodeGen/debug-info-scope.c
>
> This still emits discriminators.
>

Do you know where the discriminators are coming from in this case? Does the
frontend add some of them (in which case the test case shouldn't need
updating for your recent backend change still, hopefully)? Is there some
other codepath that is running the AddDiscriminator transformation?


>
> On Thu, Nov 19, 2015 at 12:46 PM, David Blaikie <dblaikie at gmail.com>
> wrote:
> >
> >
> > On Thu, Nov 19, 2015 at 12:42 PM, Dehao Chen <dehao at google.com> wrote:
> >>
> >> Yes, as discriminator is a backend pass, it should *not* affect frontend
> >> tests.
> >
> >
> > Could you update these tests to not involve discriminators by passing
> > -disable-llvm-optzns instead?
> >
> >>
> >>
> >> On Thu, Nov 19, 2015 at 12:36 PM, David Blaikie <dblaikie at gmail.com>
> >> wrote:
> >> >
> >> >
> >> > On Thu, Nov 19, 2015 at 11:53 AM, Dehao Chen via cfe-commits
> >> > <cfe-commits at lists.llvm.org> wrote:
> >> >>
> >> >> Author: dehao
> >> >> Date: Thu Nov 19 13:53:16 2015
> >> >> New Revision: 253595
> >> >>
> >> >> URL: http://llvm.org/viewvc/llvm-project?rev=253595&view=rev
> >> >> Log:
> >> >> Update clang tests to accomendate discriminator changes.
> >> >>
> >> >> Summary: The discriminator change in http://reviews.llvm.org/D14738
> >> >> will
> >> >> fail these clang tests. Update the test to accomendate the
> >> >> discriminator
> >> >> change.
> >> >
> >> >
> >> > Do these tests need to be testing discriminators in the frontend?
> Could
> >> > we
> >> > just -mllvm -disable-llvm-optzns on these tests? (can the
> functionality
> >> > be
> >> > wholely tested in LLVM, I assume so if it's phrased as an LLVM
> >> > transformation pass?)
> >> >
> >> >>
> >> >>
> >> >> Reviewers: dblaikie, davidxl, dnovillo
> >> >>
> >> >> Differential Revision: http://reviews.llvm.org/D14836
> >> >>
> >> >> Modified:
> >> >>     cfe/trunk/test/CodeGen/debug-info-scope.c
> >> >>     cfe/trunk/test/CodeGenObjC/arc-linetable.m
> >> >>
> >> >> Modified: cfe/trunk/test/CodeGen/debug-info-scope.c
> >> >> URL:
> >> >>
> >> >>
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-scope.c?rev=253595&r1=253594&r2=253595&view=diff
> >> >>
> >> >>
> >> >>
> ==============================================================================
> >> >> --- cfe/trunk/test/CodeGen/debug-info-scope.c (original)
> >> >> +++ cfe/trunk/test/CodeGen/debug-info-scope.c Thu Nov 19 13:53:16
> 2015
> >> >> @@ -10,6 +10,7 @@ int main() {
> >> >>
> >> >>  // GMLT-NOT: !DILexicalBlock
> >> >>  // GMLT: !DILexicalBlockFile({{.*}}, discriminator: 1)
> >> >> +// GMLT: !DILexicalBlockFile({{.*}}, discriminator: 2)
> >> >>  // Make sure we don't have any more lexical blocks because we don't
> >> >> need
> >> >> them in
> >> >>  // -gmlt.
> >> >>  // GMLT-NOT: !DILexicalBlock
> >> >>
> >> >> Modified: cfe/trunk/test/CodeGenObjC/arc-linetable.m
> >> >> URL:
> >> >>
> >> >>
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/arc-linetable.m?rev=253595&r1=253594&r2=253595&view=diff
> >> >>
> >> >>
> >> >>
> ==============================================================================
> >> >> --- cfe/trunk/test/CodeGenObjC/arc-linetable.m (original)
> >> >> +++ cfe/trunk/test/CodeGenObjC/arc-linetable.m Thu Nov 19 13:53:16
> 2015
> >> >> @@ -34,9 +34,9 @@
> >> >>
> >> >>  // CHECK: define {{.*}}testCleanupVoid
> >> >>  // CHECK: icmp ne {{.*}}!dbg ![[SKIP1:[0-9]+]]
> >> >> -// CHECK: store i32 0, i32* {{.*}}, !dbg ![[RET8:[0-9]+]]
> >> >> +// CHECK: store i32 0, i32* {{.*}}, !dbg ![[STORE8:[0-9]+]]
> >> >>  // CHECK: @objc_storeStrong{{.*}}, !dbg ![[ARC8:[0-9]+]]
> >> >> -// CHECK: ret {{.*}} !dbg ![[RET8]]
> >> >> +// CHECK: ret {{.*}} !dbg ![[RET8:[0-9]+]]
> >> >>
> >> >>  typedef signed char BOOL;
> >> >>
> >> >> @@ -112,8 +112,9 @@ typedef signed char BOOL;
> >> >>        [delegate testVoid :s];
> >> >>      }
> >> >>    }
> >> >> -  // CHECK: ![[RET8]] = !DILocation(line: [[@LINE+2]], scope:
> >> >> -  // CHECK: ![[ARC8]] = !DILocation(line: [[@LINE+1]], scope:
> >> >> +  // CHECK: ![[STORE8]] = !DILocation(line: [[@LINE+3]], scope:
> >> >> +  // CHECK: ![[ARC8]] = !DILocation(line: [[@LINE+2]], scope:
> >> >> +  // CHECK: ![[RET8]] = !DILocation(line: [[@LINE+1]], scope:
> >> >>  }
> >> >>
> >> >>
> >> >>
> >> >>
> >> >> _______________________________________________
> >> >> cfe-commits mailing list
> >> >> cfe-commits at lists.llvm.org
> >> >> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
> >> >
> >> >
> >
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151119/1373a0c6/attachment.html>