Skip to content
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

[Flang] fix initializer with empty string to fix aarch64 build #126918

Merged
merged 1 commit into from
Feb 12, 2025

Conversation

rscottmanley
Copy link
Contributor

@rscottmanley rscottmanley commented Feb 12, 2025

After tuneCPU was changed to std::string in c8376a9 the flang builds broke, due to a missing initializer.

If we want to add tuneCPU to the MLIRToLLVMPassPipelineConfig, we might want to tackle that separately after the build is restored. This should be no different than the previous behaviour.

@llvmbot llvmbot added flang Flang issues not falling into any other category flang:fir-hlfir labels Feb 12, 2025
@llvmbot
Copy link
Member

llvmbot commented Feb 12, 2025

@llvm/pr-subscribers-flang-fir-hlfir

Author: Scott Manley (rscottmanley)

Changes

After tuneCPU was changed to std::string in c8376a9 the aarch64 flang build broke, due to a missing initializer.

If we want to add tuneCPU to the MLIRToLLVMPassPipelineConfig, we might want to tackle that separately after the build is restored and I believe no different than the previous behaviour.


Full diff: https://github.com/llvm/llvm-project/pull/126918.diff

1 Files Affected:

  • (modified) flang/lib/Optimizer/Passes/Pipelines.cpp (+1-1)
diff --git a/flang/lib/Optimizer/Passes/Pipelines.cpp b/flang/lib/Optimizer/Passes/Pipelines.cpp
index d55ad9e603ffa..a94c0f2117beb 100644
--- a/flang/lib/Optimizer/Passes/Pipelines.cpp
+++ b/flang/lib/Optimizer/Passes/Pipelines.cpp
@@ -326,7 +326,7 @@ void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
   pm.addPass(fir::createFunctionAttr(
       {framePointerKind, config.NoInfsFPMath, config.NoNaNsFPMath,
        config.ApproxFuncFPMath, config.NoSignedZerosFPMath,
-       config.UnsafeFPMath}));
+       config.UnsafeFPMath, ""}));
 
   fir::addFIRToLLVMPass(pm, config);
 }

After tuneCPU was changed to std::string in c8376a9
the aarch64 flang build broke, due to a missing initializer.
@rscottmanley rscottmanley force-pushed the rscottmanley/fix-initializer branch from e37d3ed to 6d70fe1 Compare February 12, 2025 14:37
@rscottmanley rscottmanley merged commit 830a291 into llvm:main Feb 12, 2025
5 of 7 checks passed
flovent pushed a commit to flovent/llvm-project that referenced this pull request Feb 13, 2025
…126918)

After tuneCPU was changed to std::string in
c8376a9 the flang builds broke, due to
a missing initializer.

If we want to add tuneCPU to the MLIRToLLVMPassPipelineConfig, we might
want to tackle that separately after the build is restored. This should
be no different than the previous behaviour.
joaosaffran pushed a commit to joaosaffran/llvm-project that referenced this pull request Feb 14, 2025
…126918)

After tuneCPU was changed to std::string in
c8376a9 the flang builds broke, due to
a missing initializer.

If we want to add tuneCPU to the MLIRToLLVMPassPipelineConfig, we might
want to tackle that separately after the build is restored. This should
be no different than the previous behaviour.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flang:fir-hlfir flang Flang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants