<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 19, 2015 at 11:53 AM, Dehao Chen via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dehao<br>
Date: Thu Nov 19 13:53:16 2015<br>
New Revision: 253595<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=253595&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=253595&view=rev</a><br>
Log:<br>
Update clang tests to accomendate discriminator changes.<br>
<br>
Summary: The discriminator change in <a href="http://reviews.llvm.org/D14738" rel="noreferrer" target="_blank">http://reviews.llvm.org/D14738</a> will fail these clang tests. Update the test to accomendate the discriminator change.<br></blockquote><div><br></div><div>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?)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Reviewers: dblaikie, davidxl, dnovillo<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D14836" rel="noreferrer" target="_blank">http://reviews.llvm.org/D14836</a><br>
<br>
Modified:<br>
    cfe/trunk/test/CodeGen/debug-info-scope.c<br>
    cfe/trunk/test/CodeGenObjC/arc-linetable.m<br>
<br>
Modified: cfe/trunk/test/CodeGen/debug-info-scope.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-scope.c?rev=253595&r1=253594&r2=253595&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-scope.c?rev=253595&r1=253594&r2=253595&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/debug-info-scope.c (original)<br>
+++ cfe/trunk/test/CodeGen/debug-info-scope.c Thu Nov 19 13:53:16 2015<br>
@@ -10,6 +10,7 @@ int main() {<br>
<br>
 // GMLT-NOT: !DILexicalBlock<br>
 // GMLT: !DILexicalBlockFile({{.*}}, discriminator: 1)<br>
+// GMLT: !DILexicalBlockFile({{.*}}, discriminator: 2)<br>
 // Make sure we don't have any more lexical blocks because we don't need them in<br>
 // -gmlt.<br>
 // GMLT-NOT: !DILexicalBlock<br>
<br>
Modified: cfe/trunk/test/CodeGenObjC/arc-linetable.m<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/arc-linetable.m?rev=253595&r1=253594&r2=253595&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/arc-linetable.m?rev=253595&r1=253594&r2=253595&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenObjC/arc-linetable.m (original)<br>
+++ cfe/trunk/test/CodeGenObjC/arc-linetable.m Thu Nov 19 13:53:16 2015<br>
@@ -34,9 +34,9 @@<br>
<br>
 // CHECK: define {{.*}}testCleanupVoid<br>
 // CHECK: icmp ne {{.*}}!dbg ![[SKIP1:[0-9]+]]<br>
-// CHECK: store i32 0, i32* {{.*}}, !dbg ![[RET8:[0-9]+]]<br>
+// CHECK: store i32 0, i32* {{.*}}, !dbg ![[STORE8:[0-9]+]]<br>
 // CHECK: @objc_storeStrong{{.*}}, !dbg ![[ARC8:[0-9]+]]<br>
-// CHECK: ret {{.*}} !dbg ![[RET8]]<br>
+// CHECK: ret {{.*}} !dbg ![[RET8:[0-9]+]]<br>
<br>
 typedef signed char BOOL;<br>
<br>
@@ -112,8 +112,9 @@ typedef signed char BOOL;<br>
       [delegate testVoid :s];<br>
     }<br>
   }<br>
-  // CHECK: ![[RET8]] = !DILocation(line: [[@LINE+2]], scope:<br>
-  // CHECK: ![[ARC8]] = !DILocation(line: [[@LINE+1]], scope:<br>
+  // CHECK: ![[STORE8]] = !DILocation(line: [[@LINE+3]], scope:<br>
+  // CHECK: ![[ARC8]] = !DILocation(line: [[@LINE+2]], scope:<br>
+  // CHECK: ![[RET8]] = !DILocation(line: [[@LINE+1]], scope:<br>
 }<br>
<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>