forked from microsoft/DirectXShaderCompiler
-
Notifications
You must be signed in to change notification settings - Fork 0
Devsh fixes clang 19 1 1 #7
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
Open
AnastaZIuk
wants to merge
5
commits into
devshFixes
Choose a base branch
from
devshFixes_clang_19_1_1
base: devshFixes
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… target with ETW disabled
…rectXShaderCompiler into devshFixes_clang_19_1_1
PR description is empty, please add some valid description |
You can test this locally with the following command:git-clang-format --diff 5ab4d368b666d365217c751f5610b496b828ff96 2661dd0db39ceddd2c4c0289f0387e8806fa3d0b -- include/dxc/WinEtwAdapter.h include/dxc/Support/dxcapi.use.h include/dxc/WinAdapter.h include/llvm/CodeGen/SchedulerRegistry.h lib/IR/Core.cpp lib/MSSupport/MSFileSystemImpl.cpp projects/dxilconv/tools/dxilconv/dxilconv.cpp tools/clang/tools/dxcompiler/DXCompiler.cpp tools/clang/tools/dxcompiler/dxcapi.cpp tools/clang/tools/dxcompiler/dxcompilerobj.cpp tools/clang/tools/dxcvalidator/dxcvalidator.cpp tools/clang/tools/dxildll/dxildll.cpp tools/clang/tools/dxrfallbackcompiler/DXCompiler.cpp tools/clang/tools/dxrfallbackcompiler/dxcapi.cpp View the diff from clang-format here.diff --git a/include/dxc/Support/dxcapi.use.h b/include/dxc/Support/dxcapi.use.h
index 747a7ca2d..dee105030 100644
--- a/include/dxc/Support/dxcapi.use.h
+++ b/include/dxc/Support/dxcapi.use.h
@@ -34,7 +34,8 @@ protected:
m_dll = LoadLibraryA(dllName);
if (m_dll == nullptr)
return HRESULT_FROM_WIN32(GetLastError());
- m_createFn = reinterpret_cast<DxcCreateInstanceProc>(reinterpret_cast<void *>(GetProcAddress(m_dll, fnName)));
+ m_createFn = reinterpret_cast<DxcCreateInstanceProc>(
+ reinterpret_cast<void *>(GetProcAddress(m_dll, fnName)));
if (m_createFn == nullptr) {
HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
@@ -64,7 +65,8 @@ protected:
fnName2[s] = '2';
fnName2[s + 1] = '\0';
#ifdef _WIN32
- m_createFn2 = reinterpret_cast<DxcCreateInstance2Proc>(reinterpret_cast<void *>(GetProcAddress(m_dll, fnName2)));
+ m_createFn2 = reinterpret_cast<DxcCreateInstance2Proc>(
+ reinterpret_cast<void *>(GetProcAddress(m_dll, fnName2)));
#else
m_createFn2 = (DxcCreateInstance2Proc)::dlsym(m_dll, fnName2);
#endif
diff --git a/include/dxc/WinAdapter.h b/include/dxc/WinAdapter.h
index b034681c2..826790a48 100644
--- a/include/dxc/WinAdapter.h
+++ b/include/dxc/WinAdapter.h
@@ -198,7 +198,8 @@
#define OutputDebugStringA(msg) fputs(msg, stderr)
#define OutputDebugFormatA(...) fprintf(stderr, __VA_ARGS__)
-// I have no idea if I don't break something like INSTALL targets, requires CI tests
+// I have no idea if I don't break something like INSTALL targets, requires CI
+// tests
#include "WinEtwAdapter.h"
#define UInt32Add UIntAdd
diff --git a/include/llvm/CodeGen/SchedulerRegistry.h b/include/llvm/CodeGen/SchedulerRegistry.h
index 04d244125..5e26252d2 100644
--- a/include/llvm/CodeGen/SchedulerRegistry.h
+++ b/include/llvm/CodeGen/SchedulerRegistry.h
@@ -40,8 +40,11 @@ public:
static MachinePassRegistry Registry;
RegisterScheduler(const char *N, const char *D, FunctionPassCtor C)
- : MachinePassRegistryNode(N, D, reinterpret_cast<MachinePassCtor>(reinterpret_cast<void *>(C)))
- { Registry.Add(this); }
+ : MachinePassRegistryNode(
+ N, D,
+ reinterpret_cast<MachinePassCtor>(reinterpret_cast<void *>(C))) {
+ Registry.Add(this);
+ }
~RegisterScheduler() { Registry.Remove(this); }
@@ -54,10 +57,12 @@ public:
return (RegisterScheduler *)Registry.getList();
}
static FunctionPassCtor getDefault() {
- return reinterpret_cast<FunctionPassCtor>(reinterpret_cast<void *>(Registry.getDefault()));
+ return reinterpret_cast<FunctionPassCtor>(
+ reinterpret_cast<void *>(Registry.getDefault()));
}
static void setDefault(FunctionPassCtor C) {
- Registry.setDefault(reinterpret_cast<MachinePassCtor>(reinterpret_cast<void *>(C)));
+ Registry.setDefault(
+ reinterpret_cast<MachinePassCtor>(reinterpret_cast<void *>(C)));
}
static void setListener(MachinePassRegistryListener *L) {
Registry.setListener(L);
diff --git a/lib/MSSupport/MSFileSystemImpl.cpp b/lib/MSSupport/MSFileSystemImpl.cpp
index ca734f7b4..e75019bef 100644
--- a/lib/MSSupport/MSFileSystemImpl.cpp
+++ b/lib/MSSupport/MSFileSystemImpl.cpp
@@ -323,8 +323,7 @@ typedef BOOLEAN(WINAPI *PtrCreateSymbolicLinkW)(
PtrCreateSymbolicLinkW create_symbolic_link_api =
PtrCreateSymbolicLinkW(reinterpret_cast<void *>(::GetProcAddress(
- ::GetModuleHandleW(L"Kernel32.dll"),
- "CreateSymbolicLinkW")));
+ ::GetModuleHandleW(L"Kernel32.dll"), "CreateSymbolicLinkW")));
} // namespace
#endif
|
Make Event Tracing for Windows optional
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.