Add test for D21736 + D21737.

[vsk]

LGTM, with one nit.

test/Profile/cxx-indirect-call.cpp

3

I don't really understand the significance of makeItaniumABITriple. Could you explain why this change is necessary? If it's not, please drop it.

[• koriakin]

test/Profile/cxx-indirect-call.cpp

3

%itanium_abi_tuple may give any target triple that's not win32 - which includes s390x and other platforms that need zeroext. Since this test assumes __llvm_profile_instrument_target has last parameter without zeroext, it'd break when run on s390x. Hardwiring the target to x86_64 ensures we'll never emit zeroext here.

[vsk]

Is the plan to commit this along with D21737?

test/Profile/cxx-indirect-call.cpp

3

Ok! Thanks for explaining.

[• koriakin]

In D21741#467969, @vsk wrote:

Is the plan to commit this along with D21737?

Yes, and with D21736+D21739.

test/Profile/c-indirect-call.c

 // Check the value profiling instrinsics emitted by instrumentation.
 
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling | FileCheck --check-prefix=NOEXT %s
+// RUN: %clang_cc1 -triple s390x-ibm-linux -main-file-name c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling | FileCheck --check-prefix=EXT %s
 
 void (*foo)(void);
 
 int main(void) {
-// CHECK:  [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 8
-// CHECK-NEXT:  [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64
-// CHECK-NEXT:  call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0)
-// CHECK-NEXT:  call void [[REG1]]()
+// NOEXT:  [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 8
+// NOEXT-NEXT:  [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64
+// NOEXT-NEXT:  call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0)
+// NOEXT-NEXT:  call void [[REG1]]()
+// EXT:  [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 8
+// EXT-NEXT:  [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64
+// EXT-NEXT:  call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 zeroext 0)
+// EXT-NEXT:  call void [[REG1]]()
   foo();
   return 0;
 }
 
-// CHECK: declare void @__llvm_profile_instrument_target(i64, i8*, i32)
+// NOEXT: declare void @__llvm_profile_instrument_target(i64, i8*, i32)
+// EXT: declare void @__llvm_profile_instrument_target(i64, i8*, i32 zeroext)

test/Profile/cxx-indirect-call.cpp

 // Check the value profiling instrinsics emitted by instrumentation.
 
-// RUN: %clang_cc1 %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling -fexceptions -fcxx-exceptions -triple %itanium_abi_triple | FileCheck %s
+// RUN: %clang_cc1 %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling -fexceptions -fcxx-exceptions -triple x86_64-apple-macosx10.9 | FileCheck %s
 
 void (*foo) (void);
 
 int main(int argc, const char *argv[]) {
 // CHECK:  [[REG1:%[0-9]+]] = load void ()*, void ()** @foo
 // CHECK-NEXT:  [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64
 // CHECK-NEXT:  call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0)
 // CHECK-NEXT:  invoke void [[REG1]]()