Merge pull request #2025 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

lib/SILOptimizer/Mandatory/DiagnoseInfiniteRecursion.cpp

@@ -52,11 +52,15 @@ static bool hasRecursiveCallInPath(SILBasicBlock &Block,
 
     if (FullApplySite FAI = FullApplySite::isa(&I)) {
       // Don't touch dynamic dispatch.
-      if (isa<ObjCMethodInst>(FAI.getCallee()))
+      const auto callee = FAI.getCallee();
+      if (isa<SuperMethodInst>(callee) ||
+          isa<ObjCSuperMethodInst>(callee) ||
+          isa<ObjCMethodInst>(callee)) {
         continue;
+      }
 
       auto &M = FAI.getModule();
-      if (auto *CMI = dyn_cast<ClassMethodInst>(FAI.getCallee())) {
+      if (auto *CMI = dyn_cast<ClassMethodInst>(callee)) {
         auto ClassType = CMI->getOperand()->getType().getASTType();
 
         // FIXME: If we're not inside the module context of the method,
@@ -71,14 +75,26 @@ static bool hasRecursiveCallInPath(SILBasicBlock &Block,
           continue;
         }
 
+        if (!calleesAreStaticallyKnowable(FAI.getModule(), CMI->getMember())) {
+          continue;
+        }
+
+        // The "statically knowable" check just means that we have all the
+        // callee candidates available for analysis. We still need to check
+        // if the current function has a known override point.
+        auto *method = CMI->getMember().getAbstractFunctionDecl();
+        if (method->isOverridden()) {
+          continue;
+        }
+
         auto *F = getTargetClassMethod(M, CD, CMI);
         if (F == Target)
           return true;
 
         continue;
       }
 
-      if (auto *WMI = dyn_cast<WitnessMethodInst>(FAI.getCallee())) {
+      if (auto *WMI = dyn_cast<WitnessMethodInst>(callee)) {
         SILFunction *F;
         SILWitnessTable *WT;
 

stdlib/public/Platform/winsdk.modulemap

@@ -282,6 +282,11 @@ module WinSDK [system] {
       header "winioctl.h"
       export *
     }
+
+    module MCX {
+      header "mcx.h"
+      export *
+    }
   }
 
   module OLE32 {

test/SILOptimizer/infinite_recursion.swift

@@ -1,5 +1,5 @@
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
+// RUN: %target-swift-frontend -emit-sil %s -o /dev/null -verify
+// RUN: %target-swift-frontend -emit-sil %s -o /dev/null -verify
 
 func a() {  // expected-warning {{all paths through this function will call itself}}
   a()
@@ -123,7 +123,7 @@ class S {
     return a()
   }
 
-  func b() { // expected-warning {{all paths through this function will call itself}}
+  func b() { // No warning - has a known override.
     var i = 0
     repeat {
       i += 1
@@ -171,3 +171,14 @@ func factorial(_ n : UInt) -> UInt { // expected-warning {{all paths through thi
 func tr(_ key: String) -> String { // expected-warning {{all paths through this function will call itself}}
   return tr(key) ?? key // expected-warning {{left side of nil coalescing operator '??' has non-optional type}}
 }
+
+class Node {
+  var parent: Node?
+  var rootNode: RootNode {
+    return parent!.rootNode // No warning - has an override.
+  }
+}
+
+class RootNode: Node {
+  override var rootNode: RootNode { return self }
+}