[PGO] Stop using invalid char in instr variable names.

(This is part-2 of the patch -- fixing test cases)

Before the patch, -fprofile-instr-generate compile will fail
if no integrated-as is specified when the file contains
any static functions (the -S output is also invalid).

This patch fixed the issue. With the change, the index format
version will be bumped up by 1. Backward compatibility is 
preserved with this change.

Differential Revision: http://reviews.llvm.org/D15243

llvm-svn: 255366
This commit is contained in:
Xinliang David Li 2015-12-11 19:53:35 +00:00
parent c79283ef29
commit 871daea550
10 changed files with 14 additions and 14 deletions

View File

@ -6,7 +6,7 @@
// CHECK-DAG: @__llvm_profile_name_bar = {{.*}} [3 x i8] c"bar", section "{{.*}}__llvm_prf_names"
// CHECK-DAG: @__llvm_profile_name_baz = {{.*}} [3 x i8] c"baz", section "{{.*}}__llvm_prf_names"
// CHECK-DAG: @"__llvm_profile_name_unused_names.c:qux" = {{.*}} [18 x i8] c"unused_names.c:qux", section "{{.*}}__llvm_prf_names"
// CHECK-DAG: @__llvm_profile_name_unused_names.c__qux = {{.*}} [19 x i8] c"unused_names.c__qux", section "{{.*}}__llvm_prf_names"
// SYSHEADER-NOT: @__llvm_profile_name_foo =

View File

@ -1,10 +1,10 @@
c-captured.c:__captured_stmt
c-captured.c____captured_stmt
10
2
1
1
c-captured.c:__captured_stmt.1
c-captured.c____captured_stmt.1
266
3
1

View File

@ -149,7 +149,7 @@ main
1
1
c-general.c:static_func
c-general.c__static_func
4
2
1

View File

@ -1,4 +1,4 @@
cxx-lambda.cpp:_ZZ7lambdasvENK3$_0clEi
cxx-lambda.cpp___ZZ7lambdasvENK3$_0clEi
654
3
10

View File

@ -1,10 +1,10 @@
objc-general.m:__13+[A foreach:]_block_invoke
objc-general.m____13+[A foreach:]_block_invoke
10
2
2
1
objc-general.m:+[A foreach:]
objc-general.m__+[A foreach:]
6
2
1

View File

@ -4,8 +4,8 @@
// 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
// PGOGEN: @[[DCC:__llvm_profile_counters_debug_captured]] = private global [3 x i64] zeroinitializer
// PGOGEN: @[[CSC:"__llvm_profile_counters_c-captured.c:__captured_stmt"]] = private global [2 x i64] zeroinitializer
// PGOGEN: @[[C1C:"__llvm_profile_counters_c-captured.c:__captured_stmt.1"]] = private global [3 x i64] zeroinitializer
// PGOGEN: @[[CSC:__llvm_profile_counters_c-captured.c____captured_stmt]] = private global [2 x i64] zeroinitializer
// PGOGEN: @[[C1C:__llvm_profile_counters_c-captured.c____captured_stmt.1]] = private global [3 x i64] zeroinitializer
// PGOALL-LABEL: define void @debug_captured()
// PGOGEN: store {{.*}} @[[DCC]], i64 0, i64 0

View File

@ -19,7 +19,7 @@
// PGOGEN: @[[COC:__llvm_profile_counters_conditional_operator]] = private global [3 x i64] zeroinitializer
// PGOGEN: @[[DFC:__llvm_profile_counters_do_fallthrough]] = private global [4 x i64] zeroinitializer
// PGOGEN: @[[MAC:__llvm_profile_counters_main]] = private global [1 x i64] zeroinitializer
// PGOGEN: @[[STC:"__llvm_profile_counters_c-general.c:static_func"]] = private global [2 x i64] zeroinitializer
// PGOGEN: @[[STC:__llvm_profile_counters_c-general.c__static_func]] = private global [2 x i64] zeroinitializer
// PGOGEN-LABEL: @simple_loops()
// PGOUSE-LABEL: @simple_loops()

View File

@ -4,7 +4,7 @@
// CHECK: @__llvm_profile_name_foo = private constant [3 x i8] c"foo"
// CHECK: @__llvm_profile_name_foo_weak = weak hidden constant [8 x i8] c"foo_weak"
// CHECK: @__llvm_profile_name_main = private constant [4 x i8] c"main"
// CHECK: @"__llvm_profile_name_c-linkage.c:foo_internal" = private constant [24 x i8] c"c-linkage.c:foo_internal"
// CHECK: @__llvm_profile_name_c-linkage.c__foo_internal = private constant [25 x i8] c"c-linkage.c__foo_internal"
void foo(void) { }

View File

@ -11,7 +11,7 @@
// PGOGEN: @[[LWC:__llvm_profile_counters__Z7lambdasv]] = private global [4 x i64] zeroinitializer
// PGOGEN: @[[MAC:__llvm_profile_counters_main]] = private global [1 x i64] zeroinitializer
// LMBGEN: @[[LFC:"__llvm_profile_counters_cxx-lambda.cpp:_ZZ7lambdasvENK3\$_0clEi"]] = private global [3 x i64] zeroinitializer
// LMBGEN: @[[LFC:"__llvm_profile_counters_cxx-lambda.cpp___ZZ7lambdasvENK3\$_0clEi"]] = private global [3 x i64] zeroinitializer
// PGOGEN-LABEL: define {{.*}}void @_Z7lambdasv()
// PGOUSE-LABEL: define {{.*}}void @_Z7lambdasv()

View File

@ -31,8 +31,8 @@ struct NSFastEnumerationState;
@end;
#endif
// PGOGEN: @[[FRC:"__llvm_profile_counters_objc-general.m:\+\[A foreach:\]"]] = private global [2 x i64] zeroinitializer
// PGOGEN: @[[BLC:"__llvm_profile_counters_objc-general.m:__13\+\[A foreach:\]_block_invoke"]] = private global [2 x i64] zeroinitializer
// PGOGEN: @[[FRC:"__llvm_profile_counters_objc-general.m__\+\[A foreach:\]"]] = private global [2 x i64] zeroinitializer
// PGOGEN: @[[BLC:"__llvm_profile_counters_objc-general.m____13\+\[A foreach:\]_block_invoke"]] = private global [2 x i64] zeroinitializer
// PGOGEN: @[[MAC:__llvm_profile_counters_main]] = private global [1 x i64] zeroinitializer
@interface A : NSObject