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

2025-12-21 12:14:44 +01:00 · 2020-07-31 16:07:19 -07:00
parent 90ddb8b1bf 8983facde5
commit a0a181159c
57 changed files with 221 additions and 184 deletions
--- a/lib/SILOptimizer/Transforms/StringOptimization.cpp
+++ b/lib/SILOptimizer/Transforms/StringOptimization.cpp
@@ -108,7 +108,7 @@ bool StringOptimization::run(SILFunction *F) {
  if (!stringDecl)
    return false;
  stringType = SILType::getPrimitiveObjectType(
-                 CanType(stringDecl->getDeclaredType()));
+                 stringDecl->getDeclaredInterfaceType()->getCanonicalType());

  bool changed = false;