mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-09-08 10:41:26 +00:00
Code Activity

Merge pull request #5322 from YosysHQ/krys/macos_cpp20

Browse source 
CI Fixes
This commit is contained in:
Miodrag Milanović 2025-09-03 18:10:38 +02:00 • committed by GitHub
commit 6fa1435dc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/extra-builds.yml vendored
View file

@ -51,7 +51,7 @@ jobs:
uses: microsoft/setup-msbuild@v2 uses: microsoft/setup-msbuild@v2
- name: MSBuild - name: MSBuild
working-directory: yosys-win32-vcxsrc-latest working-directory: yosys-win32-vcxsrc-latest
run: msbuild YosysVS.sln /p:PlatformToolset=v142 /p:Configuration=Release /p:WindowsTargetPlatformVersion=10.0.17763.0 run: msbuild YosysVS.sln /p:PlatformToolset=v142 /p:Configuration=Release /p:WindowsTargetPlatformVersion=10.0.26100.0
wasi-build: wasi-build:
name: WASI build name: WASI build

4
.github/workflows/test-compile.yml vendored
View file

@ -38,10 +38,10 @@ jobs:
include: include:
# macOS x86 # macOS x86
- os: macos-13 - os: macos-13
compiler: 'clang' compiler: 'clang-19'
# macOS arm # macOS arm
- os: macos-latest - os: macos-latest
compiler: 'clang' compiler: 'clang-19'
fail-fast: false fail-fast: false
steps: steps:
- name: Checkout Yosys - name: Checkout Yosys

6
passes/cmds/wrapcell.cc
View file

@ -47,7 +47,7 @@ struct ContextData {
std::string unused_outputs; std::string unused_outputs;
}; };
std::optional<std::string> format(std::string fmt, const dict<IdString, Const> &parameters, std::optional<std::string> format_with_params(std::string fmt, const dict<IdString, Const> &parameters,
const ContextData &context) const ContextData &context)
{ {
std::stringstream result; std::stringstream result;
@ -230,7 +230,7 @@ struct WrapcellPass : Pass {
context.unused_outputs += "_" + RTLIL::unescape_id(chunk.format(cell)); context.unused_outputs += "_" + RTLIL::unescape_id(chunk.format(cell));
} }
std::optional<std::string> unescaped_name = format(name_fmt, cell->parameters, context); std::optional<std::string> unescaped_name = format_with_params(name_fmt, cell->parameters, context);
if (!unescaped_name) if (!unescaped_name)
log_error("Formatting error when processing cell '%s' in module '%s'\n", log_error("Formatting error when processing cell '%s' in module '%s'\n",
log_id(cell), log_id(module)); log_id(cell), log_id(module));
@ -270,7 +270,7 @@ struct WrapcellPass : Pass {
if (rule.value_fmt.empty()) { if (rule.value_fmt.empty()) {
subm->set_bool_attribute(rule.name); subm->set_bool_attribute(rule.name);
} else { } else {
std::optional<std::string> value = format(rule.value_fmt, cell->parameters, context); std::optional<std::string> value = format_with_params(rule.value_fmt, cell->parameters, context);
if (!value) if (!value)
log_error("Formatting error when processing cell '%s' in module '%s'\n", log_error("Formatting error when processing cell '%s' in module '%s'\n",