<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Dec 11, 2015 at 11:53 AM, Xinliang David Li 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: davidxl<br>
Date: Fri Dec 11 13:53:35 2015<br>
New Revision: 255366<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=255366&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=255366&view=rev</a><br>
Log:<br>
[PGO] Stop using invalid char in instr variable names.<br>
<br>
(This is part-2 of the patch -- fixing test cases)<br>
<br>
Before the patch, -fprofile-instr-generate compile will fail<br>
if no integrated-as is specified when the file contains<br>
any static functions (the -S output is also invalid).<br>
<br>
This patch fixed the issue. With the change, the index format<br>
version will be bumped up by 1. Backward compatibility is<br>
preserved with this change.<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D15243" rel="noreferrer" target="_blank">http://reviews.llvm.org/D15243</a></blockquote><div><br></div><div>FYI, this was a bit premature. There had been no review of the testing that v3 format continued to be accepted (which you snuck in with clang-side patches that had not been discussed; also, testing an llvm feature inside clang is generally not allowed (i.e. a piece of code in LLVM that is only exercised by clang)).</div><div><br></div><div>In general, for compatibility-related issues extra careful review is required. I recommend you reopen the review and continue the discussion, including the clang-side patches and the strange testing arrangement for testing that v3 continues to be accepted and correctly interpreted.</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
<br>
<br>
Modified:<br>
    cfe/trunk/test/CoverageMapping/unused_names.c<br>
    cfe/trunk/test/Profile/Inputs/c-captured.proftext<br>
    cfe/trunk/test/Profile/Inputs/c-general.proftext<br>
    cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext<br>
    cfe/trunk/test/Profile/Inputs/objc-general.proftext<br>
    cfe/trunk/test/Profile/c-captured.c<br>
    cfe/trunk/test/Profile/c-general.c<br>
    cfe/trunk/test/Profile/c-linkage.c<br>
    cfe/trunk/test/Profile/cxx-lambda.cpp<br>
    cfe/trunk/test/Profile/objc-general.m<br>
<br>
Modified: cfe/trunk/test/CoverageMapping/unused_names.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/unused_names.c?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/unused_names.c?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CoverageMapping/unused_names.c (original)<br>
+++ cfe/trunk/test/CoverageMapping/unused_names.c Fri Dec 11 13:53:35 2015<br>
@@ -6,7 +6,7 @@<br>
<br>
 // CHECK-DAG: @__llvm_profile_name_bar = {{.*}} [3 x i8] c"bar", section "{{.*}}__llvm_prf_names"<br>
 // CHECK-DAG: @__llvm_profile_name_baz = {{.*}} [3 x i8] c"baz", section "{{.*}}__llvm_prf_names"<br>
-// CHECK-DAG: @"__llvm_profile_name_unused_names.c:qux" = {{.*}} [18 x i8] c"unused_names.c:qux", section "{{.*}}__llvm_prf_names"<br>
+// CHECK-DAG: @__llvm_profile_name_unused_names.c__qux = {{.*}} [19 x i8] c"unused_names.c__qux", section "{{.*}}__llvm_prf_names"<br>
<br>
 // SYSHEADER-NOT: @__llvm_profile_name_foo =<br>
<br>
<br>
Modified: cfe/trunk/test/Profile/Inputs/c-captured.proftext<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-captured.proftext?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-captured.proftext?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/Inputs/c-captured.proftext (original)<br>
+++ cfe/trunk/test/Profile/Inputs/c-captured.proftext Fri Dec 11 13:53:35 2015<br>
@@ -1,10 +1,10 @@<br>
-c-captured.c:__captured_stmt<br>
+c-captured.c____captured_stmt<br>
 10<br>
 2<br>
 1<br>
 1<br>
<br>
-c-captured.c:__captured_stmt.1<br>
+c-captured.c____captured_stmt.1<br>
 266<br>
 3<br>
 1<br>
<br>
Modified: cfe/trunk/test/Profile/Inputs/c-general.proftext<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-general.proftext?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-general.proftext?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/Inputs/c-general.proftext (original)<br>
+++ cfe/trunk/test/Profile/Inputs/c-general.proftext Fri Dec 11 13:53:35 2015<br>
@@ -149,7 +149,7 @@ main<br>
 1<br>
 1<br>
<br>
-c-general.c:static_func<br>
+c-general.c__static_func<br>
 4<br>
 2<br>
 1<br>
<br>
Modified: cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext (original)<br>
+++ cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext Fri Dec 11 13:53:35 2015<br>
@@ -1,4 +1,4 @@<br>
-cxx-lambda.cpp:_ZZ7lambdasvENK3$_0clEi<br>
+cxx-lambda.cpp___ZZ7lambdasvENK3$_0clEi<br>
 654<br>
 3<br>
 10<br>
<br>
Modified: cfe/trunk/test/Profile/Inputs/objc-general.proftext<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/objc-general.proftext?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/objc-general.proftext?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/Inputs/objc-general.proftext (original)<br>
+++ cfe/trunk/test/Profile/Inputs/objc-general.proftext Fri Dec 11 13:53:35 2015<br>
@@ -1,10 +1,10 @@<br>
-objc-general.m:__13+[A foreach:]_block_invoke<br>
+objc-general.m____13+[A foreach:]_block_invoke<br>
 10<br>
 2<br>
 2<br>
 1<br>
<br>
-objc-general.m:+[A foreach:]<br>
+objc-general.m__+[A foreach:]<br>
 6<br>
 2<br>
 1<br>
<br>
Modified: cfe/trunk/test/Profile/c-captured.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-captured.c?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-captured.c?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/c-captured.c (original)<br>
+++ cfe/trunk/test/Profile/c-captured.c Fri Dec 11 13:53:35 2015<br>
@@ -4,8 +4,8 @@<br>
 // RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-captured.c %s -o - -emit-llvm -fprofile-instr-use=%t.profdata | FileCheck -check-prefix=PGOUSE -check-prefix=PGOALL %s<br>
<br>
 // PGOGEN: @[[DCC:__llvm_profile_counters_debug_captured]] = private global [3 x i64] zeroinitializer<br>
-// PGOGEN: @[[CSC:"__llvm_profile_counters_c-captured.c:__captured_stmt"]] = private global [2 x i64] zeroinitializer<br>
-// PGOGEN: @[[C1C:"__llvm_profile_counters_c-captured.c:__captured_stmt.1"]] = private global [3 x i64] zeroinitializer<br>
+// PGOGEN: @[[CSC:__llvm_profile_counters_c-captured.c____captured_stmt]] = private global [2 x i64] zeroinitializer<br>
+// PGOGEN: @[[C1C:__llvm_profile_counters_c-captured.c____captured_stmt.1]] = private global [3 x i64] zeroinitializer<br>
<br>
 // PGOALL-LABEL: define void @debug_captured()<br>
 // PGOGEN: store {{.*}} @[[DCC]], i64 0, i64 0<br>
<br>
Modified: cfe/trunk/test/Profile/c-general.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-general.c?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-general.c?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/c-general.c (original)<br>
+++ cfe/trunk/test/Profile/c-general.c Fri Dec 11 13:53:35 2015<br>
@@ -19,7 +19,7 @@<br>
 // PGOGEN: @[[COC:__llvm_profile_counters_conditional_operator]] = private global [3 x i64] zeroinitializer<br>
 // PGOGEN: @[[DFC:__llvm_profile_counters_do_fallthrough]] = private global [4 x i64] zeroinitializer<br>
 // PGOGEN: @[[MAC:__llvm_profile_counters_main]] = private global [1 x i64] zeroinitializer<br>
-// PGOGEN: @[[STC:"__llvm_profile_counters_c-general.c:static_func"]] = private global [2 x i64] zeroinitializer<br>
+// PGOGEN: @[[STC:__llvm_profile_counters_c-general.c__static_func]] = private global [2 x i64] zeroinitializer<br>
<br>
 // PGOGEN-LABEL: @simple_loops()<br>
 // PGOUSE-LABEL: @simple_loops()<br>
<br>
Modified: cfe/trunk/test/Profile/c-linkage.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-linkage.c?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-linkage.c?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/c-linkage.c (original)<br>
+++ cfe/trunk/test/Profile/c-linkage.c Fri Dec 11 13:53:35 2015<br>
@@ -4,7 +4,7 @@<br>
 // CHECK: @__llvm_profile_name_foo = private constant [3 x i8] c"foo"<br>
 // CHECK: @__llvm_profile_name_foo_weak = weak hidden constant [8 x i8] c"foo_weak"<br>
 // CHECK: @__llvm_profile_name_main = private constant [4 x i8] c"main"<br>
-// CHECK: @"__llvm_profile_name_c-linkage.c:foo_internal" = private constant [24 x i8] c"c-linkage.c:foo_internal"<br>
+// CHECK: @__llvm_profile_name_c-linkage.c__foo_internal = private constant [25 x i8] c"c-linkage.c__foo_internal"<br>
<br>
 void foo(void) { }<br>
<br>
<br>
Modified: cfe/trunk/test/Profile/cxx-lambda.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-lambda.cpp?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-lambda.cpp?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/cxx-lambda.cpp (original)<br>
+++ cfe/trunk/test/Profile/cxx-lambda.cpp Fri Dec 11 13:53:35 2015<br>
@@ -11,7 +11,7 @@<br>
<br>
 // PGOGEN: @[[LWC:__llvm_profile_counters__Z7lambdasv]] = private global [4 x i64] zeroinitializer<br>
 // PGOGEN: @[[MAC:__llvm_profile_counters_main]] = private global [1 x i64] zeroinitializer<br>
-// LMBGEN: @[[LFC:"__llvm_profile_counters_cxx-lambda.cpp:_ZZ7lambdasvENK3\$_0clEi"]] = private global [3 x i64] zeroinitializer<br>
+// LMBGEN: @[[LFC:"__llvm_profile_counters_cxx-lambda.cpp___ZZ7lambdasvENK3\$_0clEi"]] = private global [3 x i64] zeroinitializer<br>
<br>
 // PGOGEN-LABEL: define {{.*}}void @_Z7lambdasv()<br>
 // PGOUSE-LABEL: define {{.*}}void @_Z7lambdasv()<br>
<br>
Modified: cfe/trunk/test/Profile/objc-general.m<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/objc-general.m?rev=255366&r1=255365&r2=255366&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/objc-general.m?rev=255366&r1=255365&r2=255366&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Profile/objc-general.m (original)<br>
+++ cfe/trunk/test/Profile/objc-general.m Fri Dec 11 13:53:35 2015<br>
@@ -31,8 +31,8 @@ struct NSFastEnumerationState;<br>
 @end;<br>
 #endif<br>
<br>
-// PGOGEN: @[[FRC:"__llvm_profile_counters_objc-general.m:\+\[A foreach:\]"]] = private global [2 x i64] zeroinitializer<br>
-// PGOGEN: @[[BLC:"__llvm_profile_counters_objc-general.m:__13\+\[A foreach:\]_block_invoke"]] = private global [2 x i64] zeroinitializer<br>
+// PGOGEN: @[[FRC:"__llvm_profile_counters_objc-general.m__\+\[A foreach:\]"]] = private global [2 x i64] zeroinitializer<br>
+// PGOGEN: @[[BLC:"__llvm_profile_counters_objc-general.m____13\+\[A foreach:\]_block_invoke"]] = private global [2 x i64] zeroinitializer<br>
 // PGOGEN: @[[MAC:__llvm_profile_counters_main]] = private global [1 x i64] zeroinitializer<br>
<br>
 @interface A : NSObject<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>