Revert "[profiling] Update test cases to deal with name variable change (NFC)"
This reverts commit 6d174f96529ed86bc3463053e0b495796a2e4449. It breaks
IRGen/coverage.swift in swift-ci.
diff --git a/test/CoverageMapping/unused_names.c b/test/CoverageMapping/unused_names.c
index 49fa119..a03d18b 100644
--- a/test/CoverageMapping/unused_names.c
+++ b/test/CoverageMapping/unused_names.c
@@ -2,15 +2,14 @@
// RUN: FileCheck -input-file %t %s
// RUN: FileCheck -check-prefix=SYSHEADER -input-file %t %s
-// CHECK-DAG: @__profc_bar
+// Since foo is never emitted, there should not be a profile name for it.
+
+// CHECK-DAG: @__profn_bar = {{.*}} [3 x i8] c"bar"
+// CHECK-DAG: @__profn_baz = {{.*}} [3 x i8] c"baz"
+// CHECK-DAG: @__profn_unused_names.c_qux = {{.*}} [18 x i8] c"unused_names.c:qux"
// CHECK-DAG: @__llvm_prf_nm = private constant {{.*}}, section "{{.*}}__llvm_prf_names"
-// These are never instantiated, so we shouldn't get counters for them.
-//
-// CHECK-NOT: @__profc_baz
-// CHECK-NOT: @__profc_unused_names.c_qux
-
-// SYSHEADER-NOT: @__profc_foo =
+// SYSHEADER-NOT: @__profn_foo =
#ifdef IS_SYSHEADER
diff --git a/test/Profile/cxx-virtual-destructor-calls.cpp b/test/Profile/cxx-virtual-destructor-calls.cpp
index c60fc92..cc3df68 100644
--- a/test/Profile/cxx-virtual-destructor-calls.cpp
+++ b/test/Profile/cxx-virtual-destructor-calls.cpp
@@ -13,6 +13,15 @@
virtual ~B();
};
+// Base dtor
+// CHECK: @__profn__ZN1BD2Ev = private constant [9 x i8] c"_ZN1BD2Ev"
+
+// Complete dtor must not be instrumented
+// CHECK-NOT: @__profn__ZN1BD1Ev = private constant [9 x i8] c"_ZN1BD1Ev"
+
+// Deleting dtor must not be instrumented
+// CHECK-NOT: @__profn__ZN1BD0Ev = private constant [9 x i8] c"_ZN1BD0Ev"
+
// Base dtor counters and profile data
// CHECK: @__profc__ZN1BD2Ev = private global [1 x i64] zeroinitializer
// CHECK: @__profd__ZN1BD2Ev =
