forked from pool/nodejs-electron
Bruno Pitrus
64170b0340
- New upstream release 22.3.6 * Fixed an issue with Content-Security-Policy not being correctly enforced when sandbox: false and contextIsolation: false. (CVE-2023-23623) * Fixed a memory leak in v8.serialize() when running Node.js within Electron. * Viz: Add CHECKs in HostFrameSinkManager (CVE-2023-1810) * Blink: Move the edit commands to an on stack variable (CVE-2023-1811) - Fix download tarball script wrongly setting GPU_LISTS_VERSION to zero - Change 647d3d2.patch to fix FTBFS on aarch64 Fedora - Fix unresolvable build on Fedora 37 OBS-URL: https://build.opensuse.org/request/show/1079610 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=71
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 647d3d24c935c2adb4e7bc5f1ecfe14ab12725d2 Mon Sep 17 00:00:00 2001
|
|
From: Alexis Hetu <sugoi@google.com>
|
|
Date: Mon, 12 Dec 2022 18:15:10 -0500
|
|
Subject: [PATCH] Fix LLVM update from google3
|
|
|
|
This CL imports a google3 fix for LLVM:
|
|
https://critique.corp.google.com/cl/494101670/depot/google3/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
|
|
|
|
Bug: b/191050320
|
|
Change-Id: I1250459354dd8e783352f9acfaf59821be2a84f0
|
|
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/70328
|
|
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
|
|
Kokoro-Result: kokoro <noreply+kokoro@google.com>
|
|
Commit-Queue: Alexis Hétu <sugoi@google.com>
|
|
Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
|
|
Tested-by: Alexis Hétu <sugoi@google.com>
|
|
---
|
|
|
|
diff --git src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
|
|
index d3dbdb9..fad747a 100644
|
|
--- src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
|
|
+++ src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
|
|
@@ -922,7 +922,11 @@
|
|
|
|
if(optimizationLevel > 0)
|
|
{
|
|
+#if LLVM_VERSION_MAJOR >= 16
|
|
+ fpm.addPass(llvm::SROAPass(llvm::SROAOptions::PreserveCFG));
|
|
+#else
|
|
fpm.addPass(llvm::SROAPass());
|
|
+#endif
|
|
fpm.addPass(llvm::InstCombinePass());
|
|
}
|
|
|