[flang] Clip circular dependence between implementation modules #85309
Conversation
This file contains 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
flang/module/__fortran_type_info.mod uses __fortran_builtins.mod, but it is also implicitly used when compiling __fortran_builtins.f90 (or anything else). If __fortran_type_info.mod finds an old __fortran_builtins.mod file, compilation can fail while building the new one. Break the dependence by *not* generating runtime derived type information for __fortran_builtins.f90.
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-semantics Author: Peter Klausler (klausler) Changesflang/module/__fortran_type_info.mod uses __fortran_builtins.mod, but it is also implicitly used when compiling __fortran_builtins.f90 (or anything else). If __fortran_type_info.mod finds an old __fortran_builtins.mod file, compilation can fail while building the new one. Break the dependence by not generating runtime derived type information for __fortran_builtins.f90. Full diff: https://github.com/llvm/llvm-project/pull/85309.diff 1 Files Affected:
diff --git a/flang/lib/Semantics/runtime-type-info.cpp b/flang/lib/Semantics/runtime-type-info.cpp
index 9845a190bc756c..15ea34c66dba52 100644
--- a/flang/lib/Semantics/runtime-type-info.cpp
+++ b/flang/lib/Semantics/runtime-type-info.cpp
@@ -1239,6 +1239,16 @@ void RuntimeTableBuilder::IncorporateDefinedIoGenericInterfaces(
RuntimeDerivedTypeTables BuildRuntimeDerivedTypeTables(
SemanticsContext &context) {
RuntimeDerivedTypeTables result;
+ // Do not attempt to read __fortran_type_info.mod when compiling
+ // the module on which it depends.
+ const auto &allSources{context.allCookedSources().allSources()};
+ if (auto firstProv{allSources.GetFirstFileProvenance()}) {
+ if (const auto *srcFile{allSources.GetSourceFile(firstProv->start())}) {
+ if (srcFile->path().find("__fortran_builtins.f90") != std::string::npos) {
+ return result;
+ }
+ }
+ }
result.schemata = context.GetBuiltinModule(typeInfoBuiltinModule);
if (result.schemata) {
RuntimeTableBuilder builder{context, result};
|
clementval
added a commit
that referenced
this pull request
Mar 14, 2024
Comparing c_ptr type for equality or inequality is raising an error. ``` not yet implemented: intrinsic module procedure: c_ptr_eq ``` or this one for inequality ``` not yet implemented: intrinsic module procedure: c_ptr_ne ``` This patch adds a lowering for them and fix the `__fortran_builtins.f90` module for inequality. Reland after fix has landed for circular modules #85309
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.
flang/module/__fortran_type_info.mod uses __fortran_builtins.mod, but it is also implicitly used when compiling __fortran_builtins.f90 (or anything else). If __fortran_type_info.mod finds an old __fortran_builtins.mod file, compilation can fail while building the new one.
Break the dependence by not generating runtime derived type information for __fortran_builtins.f90.