llvm · klausler · May 12, 2025 · May 6, 2025 · jeanPerier · May 7, 2025
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
@@ -1537,6 +1537,7 @@ Scope *ModFileReader::Read(SourceName name, std::optional<bool> isIntrinsic,
  // created under -fhermetic-module-files?  If so, process them first in
  // their own nested scope that will be visible only to USE statements
  // within the module file.
+  Scope *previousHermetic{context_.currentHermeticModuleFileScope()};
  if (parseTree.v.size() > 1) {
    parser::Program hermeticModules{std::move(parseTree.v)};
    parseTree.v.emplace_back(std::move(hermeticModules.v.front()));
@@ -1552,7 +1553,7 @@ Scope *ModFileReader::Read(SourceName name, std::optional<bool> isIntrinsic,
  GetModuleDependences(context_.moduleDependences(), sourceFile->content());
  ResolveNames(context_, parseTree, topScope);
  context_.foldingContext().set_moduleFileName(wasModuleFileName);
-  context_.set_currentHermeticModuleFileScope(nullptr);
+  context_.set_currentHermeticModuleFileScope(previousHermetic);
  if (!moduleSymbol) {
    // Submodule symbols' storage are owned by their parents' scopes,
    // but their names are not in their parents' dictionaries -- we

diff --git a/flang/test/Semantics/modfile75.F90 b/flang/test/Semantics/modfile75.F90
@@ -0,0 +1,17 @@
+!RUN: %flang -c -fhermetic-module-files -DWHICH=1 %s && %flang -c -fhermetic-module-files -DWHICH=2 %s && %flang_fc1 -fdebug-unparse %s | FileCheck %s
+
+#if WHICH == 1
+module modfile75a
+  use iso_c_binding
+end
+#elif WHICH == 2
+module modfile75b
+  use modfile75a
+end
+#else
+program test
+  use modfile75b
+!CHECK: INTEGER(KIND=4_4) n
+  integer(c_int) n
+end
+#endif
-Original file line number
+Diff line change
@@ -0,0 +1,17 @@
+    !RUN: %flang -c -fhermetic-module-files -DWHICH=1 %s && %flang -c -fhermetic-module-files -DWHICH=2 %s && %flang_fc1 -fdebug-unparse %s | FileCheck %s
+    #if WHICH == 1
+    module modfile75a
+      use iso_c_binding
+    end
+    #elif WHICH == 2
+    module modfile75b
+      use modfile75a
+    end
+    #else
+    program test
+      use modfile75b
+    !CHECK: INTEGER(KIND=4_4) n
+      integer(c_int) n
             Copy link

  
      
    
  

  
      

  
    Contributor


      

  

  
    
      

      
            jeanPerier
  

      

      

      


        May 7, 2025


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Something is broken here. See buildbots "flang/test/Semantics/modfile75.F90:15:11: error: Must be a constant value".
I am thinking this could be a lit "race" with module file (I am not sure, but I think all the tests are ran in the same directory in parallel, which would cause the issue since m1 are common names and could be overridden before the final part of the test).
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+    end
+    #endif