Skip to content

Fix Solaris buildbot #145737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/test/CodeGen/X86/ms-secure-hotpatch-bad-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This verifies that we correctly handle a -fms-secure-hotpatch-functions-file argument that points
// to a missing file.
//
// RUN: not %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-file=%S/this-file-is-intentionally-missing-do-not-create-it.txt /Fo%t.obj %s 2>&1 | FileCheck %s
// RUN: not %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-file=%S/this-file-is-intentionally-missing-do-not-create-it.txt /Fo%t.obj -- %s 2>&1 | FileCheck %s
// CHECK: failed to open hotpatch functions file

void this_might_have_side_effects();
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGen/X86/ms-secure-hotpatch-cpp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This verifies that hotpatch function attributes are correctly propagated when compiling directly to OBJ,
// and that name mangling works as expected.
//
// RUN: %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-list=?this_gets_hotpatched@@YAHXZ /Fo%t.obj %s
// RUN: %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-list=?this_gets_hotpatched@@YAHXZ /Fo%t.obj -- %s
// RUN: llvm-readobj --codeview %t.obj | FileCheck %s

void this_might_have_side_effects();
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGen/X86/ms-secure-hotpatch-eh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Global constant data such as exception handler tables should not be redirected by Windows Secure Hot-Patching
//
// RUN: %clang_cl -c --target=x86_64-windows-msvc /EHsc -O2 -fms-secure-hotpatch-functions-list=this_gets_hotpatched /Fo%t.obj /clang:-S /clang:-o- %s 2>& 1 | FileCheck %s
// RUN: %clang_cl -c --target=x86_64-windows-msvc /EHsc -O2 -fms-secure-hotpatch-functions-list=this_gets_hotpatched /Fo%t.obj /clang:-S /clang:-o- -- %s 2>& 1 | FileCheck %s

class Foo {
public:
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGen/X86/ms-secure-hotpatch-globals.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// RUN: %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 \
// RUN: -fms-secure-hotpatch-functions-list=hp1,hp2,hp3,hp4,hp5_phi_ptr_mixed,hp_phi_ptr_both,hp_const_ptr_sub \
// RUN: /clang:-S /clang:-o- %s | FileCheck %s
// RUN: /clang:-S /clang:-o- -- %s | FileCheck %s

#ifdef __clang__
#define NO_TAIL __attribute__((disable_tail_calls))
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGen/X86/ms-secure-hotpatch-lto.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// This verifies that hotpatch function attributes are correctly propagated through LLVM IR when compiling with LTO.
//
// RUN: %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-list=this_gets_hotpatched -flto /Fo%t.bc %s
// RUN: %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-list=this_gets_hotpatched -flto /Fo%t.bc -- %s
// RUN: llvm-dis %t.bc -o - | FileCheck %s
//
// CHECK-LABEL: define dso_local noundef i32 @this_gets_hotpatched()
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGen/X86/ms-secure-hotpatch.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This verifies that hotpatch function attributes are correctly propagated when compiling directly to OBJ.
//
// RUN: echo this_gets_hotpatched > %t.patch-functions.txt
// RUN: %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-file=%t.patch-functions.txt /Fo%t.obj %s
// RUN: %clang_cl -c --target=x86_64-windows-msvc -O2 /Z7 -fms-secure-hotpatch-functions-file=%t.patch-functions.txt /Fo%t.obj -- %s
// RUN: llvm-readobj --codeview %t.obj | FileCheck %s

void this_might_have_side_effects();
Expand Down