Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

lib/Demangling/DemanglerAssert.h

@@ -22,30 +22,25 @@
 #include "swift/Demangling/Demangle.h"
 #include "swift/Demangling/NamespaceMacros.h"
 
-#if SWIFT_RUNTIME
+#if SWIFT_RUNTIME || defined(NDEBUG)
 
-// In the runtime, DEMANGLER_ASSERT() returns an error
+// In the runtime and non-asserts builds, DEMANGLER_ASSERT() returns an error
 #define DEMANGLER_ASSERT(expr, node)                                           \
   do {                                                                         \
     if (!(expr))                                                               \
       return ManglingError(ManglingError::AssertionFailed, (node), __LINE__);  \
   } while (0)
 
-#elif !defined(NDEBUG)
+#else
 
-// If NDEBUG is not defined, DEMANGLER_ASSERT() works like assert()
+// Except in the runtime, assert builds cause DEMANGLER_ASSERT() to assert()
 #define DEMANGLER_ASSERT(expr, node)                                           \
   do {                                                                         \
     if (!(expr))                                                               \
       swift::Demangle::failAssert(__FILE__, __LINE__, node, #expr);            \
   } while (0)
 
-#else
-
-// Otherwise, DEMANGLER_ASSERT() does nothing
-#define DEMANGLER_ASSERT(expr, node)
-
-#endif // SWIFT_RUNTIME
+#endif // SWIFT_RUNTIME || defined(NDEBUG)
 
 namespace swift {
 namespace Demangle {

validation-test/Sema/type_checker_perf/slow/operator_chain_with_hetergeneous_arguments.swift

@@ -0,0 +1,9 @@
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
+// REQUIRES: tools-release,no_asan
+
+// TODO(performance): This should be converted in a scale test once performance issue is fixed
+func test(bytes: Int, length: UInt32) {
+  // left-hand side of `>=` is `Int` and right-hand side is a chain of `UInt32` inferred from `length`
+  _ = bytes >= 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + length
+  // expected-error@-1 {{reasonable time}}
+}